Merge pull request #3985 from stianst/KEYCLOAK-3250-PROD-PROFILE

KEYCLOAK-4668 Exclude modules in product profile
This commit is contained in:
Stian Thorgersen 2017-03-29 09:57:35 +02:00 committed by GitHub
commit e8e1cce14a
13 changed files with 231 additions and 76 deletions

View file

@ -33,9 +33,22 @@
<modules> <modules>
<module>jetty-core</module> <module>jetty-core</module>
<module>jetty8.1</module> <module>jetty8.1</module>
<module>jetty9.1</module>
<module>jetty9.2</module> <module>jetty9.2</module>
<module>jetty9.3</module>
<module>jetty9.4</module>
</modules> </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> </project>

View file

@ -32,8 +32,21 @@
<modules> <modules>
<module>tomcat-core</module> <module>tomcat-core</module>
<module>tomcat6</module>
<module>tomcat7</module>
<module>tomcat8</module> <module>tomcat8</module>
</modules> </modules>
<profiles>
<profile>
<id>community</id>
<activation>
<property>
<name>!product</name>
</property>
</activation>
<modules>
<module>tomcat6</module>
<module>tomcat7</module>
</modules>
</profile>
</profiles>
</project> </project>

View file

@ -32,7 +32,20 @@
<modules> <modules>
<module>wildfly-adapter</module> <module>wildfly-adapter</module>
<module>wf8-subsystem</module>
<module>wildfly-subsystem</module> <module>wildfly-subsystem</module>
</modules> </modules>
<profiles>
<profile>
<id>community</id>
<activation>
<property>
<name>!product</name>
</property>
</activation>
<modules>
<module>wf8-subsystem</module>
</modules>
</profile>
</profiles>
</project> </project>

View file

@ -35,10 +35,23 @@
<module>core</module> <module>core</module>
<module>undertow</module> <module>undertow</module>
<module>tomcat</module> <module>tomcat</module>
<module>jetty</module>
<module>wildfly</module> <module>wildfly</module>
<module>as7-eap6</module> <module>as7-eap6</module>
<module>servlet-filter</module> <module>servlet-filter</module>
<module>wildfly-elytron</module> <module>wildfly-elytron</module>
</modules> </modules>
<profiles>
<profile>
<id>community</id>
<activation>
<property>
<name>!product</name>
</property>
</activation>
<modules>
<module>jetty</module>
</modules>
</profile>
</profiles>
</project> </project>

View file

@ -32,8 +32,21 @@
<modules> <modules>
<module>tomcat-core</module> <module>tomcat-core</module>
<module>tomcat6</module>
<module>tomcat7</module>
<module>tomcat8</module> <module>tomcat8</module>
</modules> </modules>
<profiles>
<profile>
<id>community</id>
<activation>
<property>
<name>!product</name>
</property>
</activation>
<modules>
<module>tomcat6</module>
<module>tomcat7</module>
</modules>
</profile>
</profiles>
</project> </project>

View file

@ -32,7 +32,20 @@
<modules> <modules>
<module>as7-modules</module> <module>as7-modules</module>
<module>as7-adapter-zip</module>
<module>eap6-adapter-zip</module> <module>eap6-adapter-zip</module>
</modules> </modules>
<profiles>
<profile>
<id>community</id>
<activation>
<property>
<name>!product</name>
</property>
</activation>
<modules>
<module>as7-adapter-zip</module>
</modules>
</profile>
</profiles>
</project> </project>

View file

@ -33,17 +33,31 @@
<modules> <modules>
<module>as7-eap6-adapter</module> <module>as7-eap6-adapter</module>
<module>fuse-adapter-zip</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>js-adapter-zip</module>
<module>osgi</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> <module>wildfly-adapter</module>
</modules> </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> </project>

View file

@ -34,44 +34,54 @@
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
</properties> </properties>
<build> <profiles>
<plugins> <profile>
<plugin> <id>community</id>
<groupId>org.apache.maven.plugins</groupId> <activation>
<artifactId>maven-compiler-plugin</artifactId> <property>
<configuration> <name>!product</name>
<source>${maven.compiler.source}</source> </property>
<target>${maven.compiler.target}</target> </activation>
</configuration> <build>
</plugin> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-compiler-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> <configuration>
<mainClass>CopyDependencies</mainClass> <source>${maven.compiler.source}</source>
<arguments> <target>${maven.compiler.target}</target>
<argument>${settings.localRepository}</argument>
<argument>${project.build.directory}</argument>
<argument>${project.version}</argument>
</arguments>
</configuration> </configuration>
</execution> </plugin>
</executions> <plugin>
</plugin> <groupId>org.apache.maven.plugins</groupId>
</plugins> <artifactId>maven-deploy-plugin</artifactId>
</build> <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> </project>

View file

@ -34,16 +34,27 @@
<modules> <modules>
<module>adapters</module> <module>adapters</module>
<module>saml-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-dist</module>
<module>server-overlay</module> <module>server-overlay</module>
<module>feature-packs</module> <module>feature-packs</module>
</modules> </modules>
<profiles> <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> <profile>
<id>jboss-release</id> <id>jboss-release</id>
<modules> <modules>

View file

@ -32,7 +32,20 @@
<modules> <modules>
<module>as7-modules</module> <module>as7-modules</module>
<module>as7-adapter-zip</module>
<module>eap6-adapter-zip</module> <module>eap6-adapter-zip</module>
</modules> </modules>
<profiles>
<profile>
<id>community</id>
<activation>
<property>
<name>!product</name>
</property>
</activation>
<modules>
<module>as7-adapter-zip</module>
</modules>
</profile>
</profiles>
</project> </project>

View file

@ -32,15 +32,29 @@
<modules> <modules>
<module>wildfly-adapter</module> <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> <module>as7-eap6-adapter</module>
</modules> </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> </project>

View file

@ -178,7 +178,6 @@
<module>server-spi-private</module> <module>server-spi-private</module>
<module>saml-core-api</module> <module>saml-core-api</module>
<module>saml-core</module> <module>saml-core</module>
<module>proxy</module>
<module>federation</module> <module>federation</module>
<module>services</module> <module>services</module>
<module>themes</module> <module>themes</module>
@ -1516,6 +1515,9 @@
<product.version>${project.version}</product.version> <product.version>${project.version}</product.version>
<product.default-profile>community</product.default-profile> <product.default-profile>community</product.default-profile>
</properties> </properties>
<modules>
<module>proxy</module>
</modules>
</profile> </profile>
<profile> <profile>

View file

@ -51,12 +51,25 @@
</build> </build>
<modules> <modules>
<module>integration</module> <module>integration</module>
<module>proxy</module>
<module>tomcat6</module>
<module>tomcat7</module>
<module>tomcat8</module> <module>tomcat8</module>
<module>jetty</module>
<module>integration-arquillian</module> <module>integration-arquillian</module>
</modules> </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> </project>