diff --git a/adapters/oidc/jetty/pom.xml b/adapters/oidc/jetty/pom.xml
index 2922021aec..01c07da2d2 100755
--- a/adapters/oidc/jetty/pom.xml
+++ b/adapters/oidc/jetty/pom.xml
@@ -33,9 +33,22 @@
     <modules>
         <module>jetty-core</module>
         <module>jetty8.1</module>
-        <module>jetty9.1</module>
         <module>jetty9.2</module>
-        <module>jetty9.3</module>
-        <module>jetty9.4</module>
     </modules>
+
+    <profiles>
+        <profile>
+            <id>community</id>
+            <activation>
+                <property>
+                    <name>!product</name>
+                </property>
+            </activation>
+            <modules>
+                <module>jetty9.1</module>
+                <module>jetty9.3</module>
+                <module>jetty9.4</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>
diff --git a/adapters/oidc/tomcat/pom.xml b/adapters/oidc/tomcat/pom.xml
index 0c5bb7952f..e2413e4d07 100755
--- a/adapters/oidc/tomcat/pom.xml
+++ b/adapters/oidc/tomcat/pom.xml
@@ -32,8 +32,21 @@
 
     <modules>
         <module>tomcat-core</module>
-        <module>tomcat6</module>
-        <module>tomcat7</module>
         <module>tomcat8</module>
     </modules>
+
+    <profiles>
+        <profile>
+            <id>community</id>
+            <activation>
+                <property>
+                    <name>!product</name>
+                </property>
+            </activation>
+            <modules>
+                <module>tomcat6</module>
+                <module>tomcat7</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>
diff --git a/adapters/oidc/wildfly/pom.xml b/adapters/oidc/wildfly/pom.xml
index 982ec22537..6b9cd8f879 100755
--- a/adapters/oidc/wildfly/pom.xml
+++ b/adapters/oidc/wildfly/pom.xml
@@ -32,7 +32,20 @@
 
     <modules>
         <module>wildfly-adapter</module>
-        <module>wf8-subsystem</module>
         <module>wildfly-subsystem</module>
     </modules>
+
+    <profiles>
+        <profile>
+            <id>community</id>
+            <activation>
+                <property>
+                    <name>!product</name>
+                </property>
+            </activation>
+            <modules>
+                <module>wf8-subsystem</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>
\ No newline at end of file
diff --git a/adapters/saml/pom.xml b/adapters/saml/pom.xml
index 7ca4c17a05..0f6305bdf1 100755
--- a/adapters/saml/pom.xml
+++ b/adapters/saml/pom.xml
@@ -35,10 +35,23 @@
         <module>core</module>
         <module>undertow</module>
         <module>tomcat</module>
-        <module>jetty</module>
         <module>wildfly</module>
         <module>as7-eap6</module>
         <module>servlet-filter</module>
         <module>wildfly-elytron</module>
     </modules>
+
+    <profiles>
+        <profile>
+            <id>community</id>
+            <activation>
+                <property>
+                    <name>!product</name>
+                </property>
+            </activation>
+            <modules>
+                <module>jetty</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>
diff --git a/adapters/saml/tomcat/pom.xml b/adapters/saml/tomcat/pom.xml
index 85a5978c27..078515692e 100755
--- a/adapters/saml/tomcat/pom.xml
+++ b/adapters/saml/tomcat/pom.xml
@@ -32,8 +32,21 @@
 
     <modules>
         <module>tomcat-core</module>
-        <module>tomcat6</module>
-        <module>tomcat7</module>
         <module>tomcat8</module>
     </modules>
+
+    <profiles>
+        <profile>
+            <id>community</id>
+            <activation>
+                <property>
+                    <name>!product</name>
+                </property>
+            </activation>
+            <modules>
+                <module>tomcat6</module>
+                <module>tomcat7</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>
diff --git a/distribution/adapters/as7-eap6-adapter/pom.xml b/distribution/adapters/as7-eap6-adapter/pom.xml
index 4d4830f244..5d407d8793 100644
--- a/distribution/adapters/as7-eap6-adapter/pom.xml
+++ b/distribution/adapters/as7-eap6-adapter/pom.xml
@@ -32,7 +32,20 @@
 
     <modules>
         <module>as7-modules</module>
-        <module>as7-adapter-zip</module>
         <module>eap6-adapter-zip</module>
     </modules>
+
+    <profiles>
+        <profile>
+            <id>community</id>
+            <activation>
+                <property>
+                    <name>!product</name>
+                </property>
+            </activation>
+            <modules>
+                <module>as7-adapter-zip</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>
diff --git a/distribution/adapters/pom.xml b/distribution/adapters/pom.xml
index 02b84f1729..e4569ac83e 100755
--- a/distribution/adapters/pom.xml
+++ b/distribution/adapters/pom.xml
@@ -33,17 +33,31 @@
     <modules>
         <module>as7-eap6-adapter</module>
         <module>fuse-adapter-zip</module>
-        <module>jetty81-adapter-zip</module>
-        <module>jetty91-adapter-zip</module>
-        <module>jetty92-adapter-zip</module>
-        <module>jetty93-adapter-zip</module>
-        <module>jetty94-adapter-zip</module>
         <module>js-adapter-zip</module>
         <module>osgi</module>
-        <module>tomcat6-adapter-zip</module>
-        <module>tomcat7-adapter-zip</module>
-        <module>tomcat8-adapter-zip</module>
-        <module>wf8-adapter</module>
+
         <module>wildfly-adapter</module>
     </modules>
+
+    <profiles>
+        <profile>
+            <id>community</id>
+            <activation>
+                <property>
+                    <name>!product</name>
+                </property>
+            </activation>
+            <modules>
+                <module>tomcat6-adapter-zip</module>
+                <module>tomcat7-adapter-zip</module>
+                <module>tomcat8-adapter-zip</module>
+                <module>jetty81-adapter-zip</module>
+                <module>jetty91-adapter-zip</module>
+                <module>jetty92-adapter-zip</module>
+                <module>jetty93-adapter-zip</module>
+                <module>jetty94-adapter-zip</module>
+                <module>wf8-adapter</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>
diff --git a/distribution/downloads/pom.xml b/distribution/downloads/pom.xml
index b8ee00775f..5886b021fe 100755
--- a/distribution/downloads/pom.xml
+++ b/distribution/downloads/pom.xml
@@ -34,44 +34,54 @@
         <maven.compiler.source>1.8</maven.compiler.source>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>server-downloads</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
+    <profiles>
+        <profile>
+            <id>community</id>
+            <activation>
+                <property>
+                    <name>!product</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
                         <configuration>
-                            <mainClass>CopyDependencies</mainClass>
-                            <arguments>
-                                <argument>${settings.localRepository}</argument>
-                                <argument>${project.build.directory}</argument>
-                                <argument>${project.version}</argument>
-                            </arguments>
+                            <source>${maven.compiler.source}</source>
+                            <target>${maven.compiler.target}</target>
                         </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>server-downloads</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>java</goal>
+                                </goals>
+                                <configuration>
+                                    <mainClass>CopyDependencies</mainClass>
+                                    <arguments>
+                                        <argument>${settings.localRepository}</argument>
+                                        <argument>${project.build.directory}</argument>
+                                        <argument>${project.version}</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 9cdf5ae983..9da333835d 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -34,16 +34,27 @@
     <modules>
         <module>adapters</module>
         <module>saml-adapters</module>
-        <module>demo-dist</module>
-        <module>api-docs-dist</module>
-        <module>examples-dist</module>
-        <module>proxy-dist</module>
         <module>server-dist</module>
         <module>server-overlay</module>
         <module>feature-packs</module>
     </modules>
 
     <profiles>
+        <profile>
+            <id>community</id>
+            <activation>
+                <property>
+                    <name>!product</name>
+                </property>
+            </activation>
+            <modules>
+                <module>api-docs-dist</module>
+                <module>demo-dist</module>
+                <module>examples-dist</module>
+                <module>proxy-dist</module>
+            </modules>
+        </profile>
+
         <profile>
             <id>jboss-release</id>
             <modules>
diff --git a/distribution/saml-adapters/as7-eap6-adapter/pom.xml b/distribution/saml-adapters/as7-eap6-adapter/pom.xml
index ed0792b61d..428d97498a 100755
--- a/distribution/saml-adapters/as7-eap6-adapter/pom.xml
+++ b/distribution/saml-adapters/as7-eap6-adapter/pom.xml
@@ -32,7 +32,20 @@
 
     <modules>
         <module>as7-modules</module>
-        <module>as7-adapter-zip</module>
         <module>eap6-adapter-zip</module>
     </modules>
+
+    <profiles>
+        <profile>
+            <id>community</id>
+            <activation>
+                <property>
+                    <name>!product</name>
+                </property>
+            </activation>
+            <modules>
+                <module>as7-adapter-zip</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>
diff --git a/distribution/saml-adapters/pom.xml b/distribution/saml-adapters/pom.xml
index 09177682cd..e2706413f1 100755
--- a/distribution/saml-adapters/pom.xml
+++ b/distribution/saml-adapters/pom.xml
@@ -32,15 +32,29 @@
 
     <modules>
         <module>wildfly-adapter</module>
-        <module>tomcat6-adapter-zip</module>
-        <module>tomcat7-adapter-zip</module>
-        <module>tomcat8-adapter-zip</module>
-        <module>jetty81-adapter-zip</module>
-        <!-- jetty 9.1 doesn't work right now
-        <module>jetty91-adapter-zip</module> -->
-        <module>jetty92-adapter-zip</module>
-        <module>jetty93-adapter-zip</module>
-        <module>jetty94-adapter-zip</module>
         <module>as7-eap6-adapter</module>
     </modules>
+
+    <profiles>
+        <profile>
+            <id>community</id>
+            <activation>
+                <property>
+                    <name>!product</name>
+                </property>
+            </activation>
+            <modules>
+                <module>jetty81-adapter-zip</module>
+                <!-- jetty 9.1 doesn't work right now
+                <module>jetty91-adapter-zip</module> -->
+                <module>jetty92-adapter-zip</module>
+                <module>jetty93-adapter-zip</module>
+                <module>jetty94-adapter-zip</module>
+                <module>tomcat6-adapter-zip</module>
+                <module>tomcat7-adapter-zip</module>
+                <module>tomcat8-adapter-zip</module>
+            </modules>
+        </profile>
+    </profiles>
+
 </project>
diff --git a/pom.xml b/pom.xml
index 0308b69423..246bcc1537 100755
--- a/pom.xml
+++ b/pom.xml
@@ -178,7 +178,6 @@
         <module>server-spi-private</module>
         <module>saml-core-api</module>
         <module>saml-core</module>
-        <module>proxy</module>
         <module>federation</module>
         <module>services</module>
         <module>themes</module>
@@ -1516,6 +1515,9 @@
                 <product.version>${project.version}</product.version>
                 <product.default-profile>community</product.default-profile>
             </properties>
+            <modules>
+                <module>proxy</module>
+            </modules>
         </profile>
 
         <profile>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index fa9cb53076..843f3cf848 100755
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -51,12 +51,25 @@
     </build>
     <modules>
         <module>integration</module>
-        <module>proxy</module>
-        <module>tomcat6</module>
-        <module>tomcat7</module>
         <module>tomcat8</module>
-        <module>jetty</module>
         <module>integration-arquillian</module>
     </modules>
+
+    <profiles>
+        <profile>
+            <id>community</id>
+            <activation>
+                <property>
+                    <name>!product</name>
+                </property>
+            </activation>
+            <modules>
+                <module>jetty</module>
+                <module>proxy</module>
+                <module>tomcat6</module>
+                <module>tomcat7</module>
+            </modules>
+        </profile>
+    </profiles>
         
 </project>