diff --git a/examples/providers/user-storage-simple/pom.xml b/examples/providers/user-storage-simple/pom.xml
index 8e1220872d..87d2a50259 100755
--- a/examples/providers/user-storage-simple/pom.xml
+++ b/examples/providers/user-storage-simple/pom.xml
@@ -68,4 +68,28 @@
+
+
+
+ product
+
+
+ product
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+
+ false
+
+
+
+
+
+
diff --git a/testsuite/integration-arquillian/servers/migration/pom.xml b/testsuite/integration-arquillian/servers/migration/pom.xml
index e6e46f2666..4743047974 100644
--- a/testsuite/integration-arquillian/servers/migration/pom.xml
+++ b/testsuite/integration-arquillian/servers/migration/pom.xml
@@ -36,13 +36,6 @@
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
- true
-
-
org.apache.maven.plugins
maven-enforcer-plugin
@@ -218,6 +211,25 @@
+
+ community
+
+
+ !product
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+
+ true
+
+
+
+
+
productized-server
diff --git a/testsuite/integration-arquillian/servers/wildfly-balancer/pom.xml b/testsuite/integration-arquillian/servers/wildfly-balancer/pom.xml
index f342ecfd26..ce97febb74 100644
--- a/testsuite/integration-arquillian/servers/wildfly-balancer/pom.xml
+++ b/testsuite/integration-arquillian/servers/wildfly-balancer/pom.xml
@@ -37,13 +37,6 @@
-
- maven-deploy-plugin
-
- true
-
-
-
maven-dependency-plugin
@@ -144,4 +137,25 @@
+
+
+ community
+
+
+ !product
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+
+ true
+
+
+
+
+
+
diff --git a/testsuite/integration-deprecated/pom.xml b/testsuite/integration-deprecated/pom.xml
index 8f624f38dd..6a37b6a296 100755
--- a/testsuite/integration-deprecated/pom.xml
+++ b/testsuite/integration-deprecated/pom.xml
@@ -295,13 +295,6 @@
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
- true
-
-
org.apache.maven.plugins
maven-compiler-plugin
@@ -334,6 +327,25 @@
+
+ community
+
+
+ !product
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+
+ true
+
+
+
+
+
ldap
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index c5608eef17..4e844fa29a 100755
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -33,13 +33,6 @@
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
- true
-
-
org.apache.maven.plugins
maven-javadoc-plugin
@@ -64,6 +57,17 @@
!product
+
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+
+ true
+
+
+
+
jetty
proxy
diff --git a/testsuite/tomcat8/pom.xml b/testsuite/tomcat8/pom.xml
index 767298109b..ccdf9e2be2 100755
--- a/testsuite/tomcat8/pom.xml
+++ b/testsuite/tomcat8/pom.xml
@@ -254,13 +254,6 @@
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
- true
-
-
org.apache.maven.plugins
maven-compiler-plugin
@@ -280,6 +273,25 @@
+
+ community
+
+
+ !product
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+
+ true
+
+
+
+
+
keycloak-server