Skip to content

Commit

Permalink
Merge pull request #13924 from jfdenise/separated-fp-build
Browse files Browse the repository at this point in the history
Remove servlet and core FP dependencies
  • Loading branch information
bstansberry committed Feb 24, 2021
2 parents d8025da + 6f6d236 commit 40275ac
Show file tree
Hide file tree
Showing 133 changed files with 3,292 additions and 694 deletions.
10 changes: 0 additions & 10 deletions dist/pom.xml
Expand Up @@ -215,16 +215,6 @@
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-galleon-pack</artifactId>
<version>${version.org.wildfly.core}</version>
<type>txt</type>
<classifier>artifact-list</classifier>
<scope>runtime</scope>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
10 changes: 0 additions & 10 deletions ee-9/dist/pom.xml
Expand Up @@ -205,16 +205,6 @@
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-galleon-pack</artifactId>
<version>${version.org.wildfly.core}</version>
<type>txt</type>
<classifier>artifact-list</classifier>
<scope>runtime</scope>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
81 changes: 63 additions & 18 deletions ee-9/feature-pack/pom.xml
Expand Up @@ -41,13 +41,10 @@
<properties>
<license.directory>${project.build.directory}/resources/content/docs/licenses</license.directory>
<mp.galleon.common.resources.directory>${basedir}/../../microprofile/galleon-common/src/main/resources</mp.galleon.common.resources.directory>
<mp.license.directory>${basedir}/../../microprofile/galleon-common/src/license</mp.license.directory>
<full.common.resources.directory>${basedir}/../../ee-feature-pack/common/src/main/resources</full.common.resources.directory>
<full.galleon-common.resources.directory>${basedir}/../../ee-feature-pack/galleon-common/src/main/resources</full.galleon-common.resources.directory>
<full.common.license.directory>${basedir}/../../ee-feature-pack/common/src/license</full.common.license.directory>
<servlet.common.resources.directory>${basedir}/../../servlet-feature-pack/common/src/main/resources</servlet.common.resources.directory>
<servlet.galleon-common.resources.directory>${basedir}/../../servlet-feature-pack/galleon-common/src/main/resources</servlet.galleon-common.resources.directory>
<servlet.common.license.directory>${basedir}/../../servlet-feature-pack/common/src/license</servlet.common.license.directory>
<full.ee-9-api.license.directory>${basedir}/src/license</full.ee-9-api.license.directory>


Expand Down Expand Up @@ -128,6 +125,34 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-core-common-feature-pack-resources</id>
<phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-feature-pack-common</artifactId>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-feature-pack-galleon-common</artifactId>
<type>zip</type>
</artifactItem>
</artifactItems>
<outputDirectory>${basedir}/target/resources</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
Expand Down Expand Up @@ -237,6 +262,11 @@
<groupId>org.wildfly.maven.plugins</groupId>
<artifactId>licenses-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<sortByGroupIdAndArtifactId>true</sortByGroupIdAndArtifactId>
<excludedGroups>org.wildfly.galleon-plugins</excludedGroups>
<excludedArtifacts>wildfly-ee-galleon-pack|wildfly-jar-boot|infinispan-hibernate-cache-v51|jboss-ejb-client-legacy|wildfly-core-feature-pack-common|wildfly-core-feature-pack-galleon-common|wildfly-servlet-galleon-pack|wildfly-ee-feature-pack-common|wildfly-ee-feature-pack-galleon-common|wildfly-ee-feature-pack-pruned|wildfly-elytron\z</excludedArtifacts>
</configuration>
<executions>
<execution>
<id>update-licenses-xml</id>
Expand All @@ -245,14 +275,13 @@
</goals>
<phase>process-resources</phase>
<configuration>
<sortByGroupIdAndArtifactId>true</sortByGroupIdAndArtifactId>
<licensesConfigFiles>
<licensesConfigFile>${servlet.common.license.directory}/feature-pack-licenses.xml</licensesConfigFile>
<licensesConfigFile>${full.common.license.directory}/feature-pack-licenses.xml</licensesConfigFile>
<licensesConfigFile>${full.ee-9-api.license.directory}/feature-pack-licenses.xml</licensesConfigFile>
<licensesConfigFile>${basedir}/target/resources/license/core-feature-pack-common-licenses.xml</licensesConfigFile>
<licensesConfigFile>${basedir}/target/resources/license/servlet-feature-pack-common-licenses.xml</licensesConfigFile>
<licensesConfigFile>${basedir}/target/resources/license/ee-feature-pack-common-licenses.xml</licensesConfigFile>
<licensesConfigFile>${basedir}/target/resources/license/preview-feature-pack-licenses.xml</licensesConfigFile>
</licensesConfigFiles>
<licensesOutputFile>${license.directory}/full-feature-pack-licenses.xml</licensesOutputFile>
<excludedArtifacts>infinispan-hibernate-cache-v51|jboss-ejb-client-legacy|wildfly-core-galleon-pack|wildfly-servlet-galleon-pack|wildfly-ee-feature-pack-common|wildfly-ee-feature-pack-ee-8-api|wildfly-ee-feature-pack-galleon-common|wildfly-ee-feature-pack-pruned</excludedArtifacts>
</configuration>
</execution>
<execution>
Expand All @@ -263,9 +292,8 @@
<phase>process-resources</phase>
<configuration>
<sortByGroupIdAndArtifactId>true</sortByGroupIdAndArtifactId>
<licensesConfigFile>${mp.license.directory}/microprofile-feature-pack-licenses.xml</licensesConfigFile>
<licensesConfigFile>${basedir}/target/resources/license/microprofile-feature-pack-licenses.xml</licensesConfigFile>
<licensesOutputFile>${license.directory}/microprofile-feature-pack-licenses.xml</licensesOutputFile>
<excludedArtifacts>wildfly-core-galleon-pack|wildfly-servlet-galleon-pack|wildfly-ee-galleon-pack</excludedArtifacts>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -303,26 +331,42 @@

<!-- feature pack dependencies -->

<dependency>
<groupId>org.wildfly.galleon-plugins</groupId>
<artifactId>wildfly-galleon-plugins</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.wildfly.galleon-plugins</groupId>
<artifactId>wildfly-config-gen</artifactId>
<scope>provided</scope>
</dependency>

<!-- module and copy artifact dependencies -->

<!-- WildFly Core feature pack content -->

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-galleon-pack</artifactId>
<type>zip</type>
<artifactId>wildfly-core-feature-pack-common</artifactId>
<type>pom</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.wildfly.galleon-plugins</groupId>
<artifactId>wildfly-galleon-plugins</artifactId>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-feature-pack-galleon-common</artifactId>
<type>pom</type>
<scope>provided</scope>
</dependency>

<!-- module and copy artifact dependencies -->

<dependency>
<groupId>${full.maven.groupId}</groupId>
<artifactId>wildfly-mp-feature-pack-galleon-common</artifactId>
Expand Down Expand Up @@ -1316,6 +1360,7 @@
<exclude>sun.jdk:jconsole</exclude>
<!-- Ignore the shared resource poms as those we want their
transitives. Those poms ban transitives at their level -->
<exclude>org.wildfly.core:wildfly-core-feature-pack-common</exclude>
<exclude>${full.maven.groupId}:wildfly-mp-feature-pack-galleon-common</exclude>
<exclude>${ee.maven.groupId}:wildfly-ee-feature-pack-common</exclude>
<exclude>${ee.maven.groupId}:wildfly-servlet-feature-pack-common</exclude>
Expand Down
17 changes: 17 additions & 0 deletions ee-9/feature-pack/src/main/resources/configs/domain/model.xml
@@ -1,9 +1,26 @@
<?xml version="1.0" ?>

<config xmlns="urn:jboss:galleon:config:1.0" model="domain">
<props>
<prop name="config.branch-is-batch" value="true"/>
<prop name="config.merge-independent-branches" value="true"/>
<prop name="--empty-domain-config" value=""/>
<prop name="--remove-existing-domain-config" value=""/>
<prop name="--empty-host-config" value=""/>
<prop name="--remove-existing-host-config" value=""/>
</props>
<packages>
<package name="product.conf" optional="true"/>
<package name="misc.domain"/>
<package name="org.jboss.as.domain-management"/>
<!-- is not required but useful even if elytron subsystem is not installed -->
<package name="org.wildfly.security.elytron"/>
<!-- cleanup runtime dirs -->
<package name="cleanup.domain.config.history.dir" optional="true"/>
<package name="cleanup.domain.servers.dir" optional="true"/>
<package name="cleanup.domain.log.dir" optional="true"/>
<package name="cleanup.domain.data.dir" optional="true"/>

<package name="org.wildfly.deployment.transformation"/>
</packages>
</config>
26 changes: 26 additions & 0 deletions ee-9/feature-pack/src/main/resources/configs/standalone/model.xml
@@ -1,9 +1,35 @@
<?xml version="1.0" ?>

<config xmlns="urn:jboss:galleon:config:1.0" model="standalone">
<props>
<prop name="config.branch-is-batch" value="true"/>
<prop name="config.merge-independent-branches" value="true"/>
<!-- <prop name="config.merge-same-deps-branches" value="true"/> -->
<prop name="--admin-only" value=""/>
<prop name="--internal-empty-config" value=""/>
<prop name="--internal-remove-config" value=""/>
</props>
<packages>
<package name="product.conf" optional="true"/>
<package name="misc.standalone"/>
<package name="org.jboss.as.standalone"/>
<package name="org.jboss.as.domain-management"/>
<!-- cleanup runtime dirs -->
<package name="cleanup.standalone.config.history.dir" optional="true"/>
<package name="cleanup.standalone.log.dir" optional="true"/>
<package name="cleanup.standalone.data.dir" optional="true"/>
<package name="cleanup.standalone.tmp.vfs" optional="true"/>

<package name="org.wildfly.bootable-jar" optional="true"/>
<package name="org.wildfly.embedded"/>
<!-- Is optional in server,standalone,host-controller module.xml because can be removed if not wanted but wanted by default -->
<package name="org.apache.xalan" optional="true"/>
<!-- Is optional in server module.xml because located in servlet -->
<!-- Servlet works properly without it (in nominal) making it optional in case
it needs to be excluded -->
<package name="org.jboss.common-beans" optional="true"/>

<package name="org.wildfly.deployment.transformation"/>

</packages>
</config>
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature-group-spec name="domain-host-excludes" xmlns="urn:jboss:galleon:feature-group:1.0">

<origin name="org.wildfly.core:wildfly-core-galleon-pack">
<feature-group name="domain-host-excludes"/>
</origin>
<feature-group name="core-domain-host-excludes"/>

<feature spec="domain.host-exclude">
<param name="host-exclude" value="WildFly10.0"/>
Expand Down
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature-group-spec name="management-interfaces" xmlns="urn:jboss:galleon:feature-group:1.0">
<feature-group name="management-unsecure-interfaces"/>
<feature-group name="management-legacy-security"/>
</feature-group-spec>
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- TODO Eliminate the use of this in wildfly-preview -->
<feature-group-spec name="management-legacy-security" xmlns="urn:jboss:galleon:feature-group:1.0">
<!-- attach legacy security to management -->
<feature spec="core-service.management.management-interface.http-interface">
<param name="socket-binding" value="management-http"/>
<param name="security-realm" value="ManagementRealm"/>
</feature>
</feature-group-spec>
Expand Up @@ -26,11 +26,9 @@
</include>
</feature-group>

<origin name="org.wildfly.core:wildfly-core-galleon-pack">
<feature-group name="management-interfaces">
<feature spec="core-service.management.management-interface.http-interface">
<param name="console-enabled" value="false"/>
</feature>
</feature-group>
</origin>
<feature-group name="management-interfaces">
<feature spec="core-service.management.management-interface.http-interface">
<param name="console-enabled" value="false"/>
</feature>
</feature-group>
</feature-group-spec>

0 comments on commit 40275ac

Please sign in to comment.