Skip to content

Commit

Permalink
Merge pull request wildfly#18316 from emmartins/WFLY-19871
Browse files Browse the repository at this point in the history 
[WFLY-19871] Adds Channel configuration to user BOMs
  • Loading branch information
@bstansberry
bstansberry authored Oct 29, 2024
2 parents e6cbeed + c0dfa13 commit c90ae2c
Show file tree
Hide file tree
Showing 8 changed files with 120 additions and 1 deletion.
14 changes: 14 additions & 0 deletions boms/user/client/ejb-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@
<version>${ee.maven.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.wildfly.channels</groupId>
<artifactId>wildfly-ee</artifactId>
<version>${ee.maven.version}</version>
<type>pom</type>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -74,6 +80,14 @@
<bomWithDependencies>true</bomWithDependencies>
<licenses>true</licenses>
<inheritExclusions>UNMANAGED</inheritExclusions>
<channels>
<channel>
<manifest>
<groupId>org.wildfly.channels</groupId>
<artifactId>wildfly-ee</artifactId>
</manifest>
</channel>
</channels>
<includeDependencies>
<!-- ejb client, the main artifact -->
<dependency>
Expand Down
14 changes: 14 additions & 0 deletions boms/user/client/jaxws-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@
<version>${ee.maven.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.wildfly.channels</groupId>
<artifactId>wildfly-ee</artifactId>
<version>${ee.maven.version}</version>
<type>pom</type>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -74,6 +80,14 @@
<bomWithDependencies>true</bomWithDependencies>
<licenses>true</licenses>
<inheritExclusions>UNMANAGED</inheritExclusions>
<channels>
<channel>
<manifest>
<groupId>org.wildfly.channels</groupId>
<artifactId>wildfly-ee</artifactId>
</manifest>
</channel>
</channels>
<excludeDependencies>
<dependency>
<groupId>log4j</groupId>
Expand Down
14 changes: 14 additions & 0 deletions boms/user/client/jms-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@
<version>${ee.maven.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.wildfly.channels</groupId>
<artifactId>wildfly-ee</artifactId>
<version>${ee.maven.version}</version>
<type>pom</type>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -74,6 +80,14 @@
<bomWithDependencies>true</bomWithDependencies>
<licenses>true</licenses>
<inheritExclusions>UNMANAGED</inheritExclusions>
<channels>
<channel>
<manifest>
<groupId>org.wildfly.channels</groupId>
<artifactId>wildfly-ee</artifactId>
</manifest>
</channel>
</channels>
<includeDependencies>
<!-- artemis jakarta jms client, the main artifact -->
<!-- replaces org.apache.activemq:artemis-jms-client -->
Expand Down
15 changes: 15 additions & 0 deletions boms/user/server/ee/preview/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-preview-feature-pack</artifactId>
<version>${ee.maven.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.wildfly.channels</groupId>
<artifactId>wildfly-preview</artifactId>
<version>${ee.maven.version}</version>
<type>pom</type>
</dependency>
</dependencies>
Expand Down Expand Up @@ -70,6 +77,14 @@
<bomVersion>${project.version}</bomVersion>
<bomName>${full.dist.product.release.name} Preview BOMs: EE</bomName>
<bomDescription>${full.dist.product.release.name} Preview: EE Dependency Management</bomDescription>
<channels>
<channel>
<manifest>
<groupId>org.wildfly.channels</groupId>
<artifactId>wildfly-preview</artifactId>
</manifest>
</channel>
</channels>
<includeDependencies combine.children="append">
<!-- include here any <dependency /> exclusive to this BOM -->
<dependency>
Expand Down
15 changes: 15 additions & 0 deletions boms/user/server/ee/standard/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-ee-galleon-pack</artifactId>
<version>${ee.maven.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.wildfly.channels</groupId>
<artifactId>wildfly-ee</artifactId>
<version>${ee.maven.version}</version>
<type>pom</type>
</dependency>
</dependencies>
Expand Down Expand Up @@ -70,6 +77,14 @@
<bomVersion>${project.version}</bomVersion>
<bomName>${full.dist.product.release.name} BOMs: EE</bomName>
<bomDescription>${full.dist.product.release.name}: EE Dependency Management</bomDescription>
<channels>
<channel>
<manifest>
<groupId>org.wildfly.channels</groupId>
<artifactId>wildfly-ee</artifactId>
</manifest>
</channel>
</channels>
<includeDependencies combine.children="append">
<!-- include here any <dependency /> exclusive to this BOM -->
<dependency>
Expand Down
17 changes: 16 additions & 1 deletion boms/user/server/expansion/preview/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,18 @@
</dependencies>
</dependencyManagement>

<!-- enforces all BOM artifacts are available -->
<!-- enforces all BOM artifacts and channels are available -->
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-preview-feature-pack</artifactId>
<version>${full.maven.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.wildfly.channels</groupId>
<artifactId>wildfly-preview</artifactId>
<version>${full.maven.version}</version>
<type>pom</type>
</dependency>
</dependencies>
Expand Down Expand Up @@ -70,6 +77,14 @@
<bomVersion>${project.version}</bomVersion>
<bomName>${full.dist.product.release.name} Preview BOMs: Expansion</bomName>
<bomDescription>${full.dist.product.release.name} Preview: Expansion Dependency Management</bomDescription>
<channels>
<channel>
<manifest>
<groupId>org.wildfly.channels</groupId>
<artifactId>wildfly-preview</artifactId>
</manifest>
</channel>
</channels>
<includeDependencies combine.children="append">
<!-- include here any <dependency /> exclusive to this BOM -->
</includeDependencies>
Expand Down
15 changes: 15 additions & 0 deletions boms/user/server/expansion/standard/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-galleon-pack</artifactId>
<version>${full.maven.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.wildfly.channels</groupId>
<artifactId>wildfly</artifactId>
<version>${full.maven.version}</version>
<type>pom</type>
</dependency>
</dependencies>
Expand Down Expand Up @@ -70,6 +77,14 @@
<bomVersion>${project.version}</bomVersion>
<bomName>${full.dist.product.release.name} BOMs: Expansion</bomName>
<bomDescription>${full.dist.product.release.name}: Expansion Dependency Management</bomDescription>
<channels>
<channel>
<manifest>
<groupId>org.wildfly.channels</groupId>
<artifactId>wildfly</artifactId>
</manifest>
</channel>
</channels>
<includeDependencies combine.children="append">
<!-- include here any <dependency /> exclusive to this BOM -->
</includeDependencies>
Expand Down
17 changes: 17 additions & 0 deletions boms/user/tools/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,15 @@
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.wildfly.channels</groupId>
<artifactId>wildfly-ee</artifactId>
<version>${ee.maven.version}</version>
<type>pom</type>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand All @@ -68,6 +77,14 @@
<bomName>${full.dist.product.release.name} BOMs: Tools</bomName>
<bomDescription>Dependency Management with Tools useful for ${full.dist.product.release.name}</bomDescription>
<inheritExclusions>NONE</inheritExclusions>
<channels>
<channel>
<manifest>
<groupId>org.wildfly.channels</groupId>
<artifactId>wildfly-ee</artifactId>
</manifest>
</channel>
</channels>
<includeTransitives>false</includeTransitives>
<includeDependencies>
<dependency>
Expand Down

0 comments on commit c90ae2c

Please sign in to comment.