Skip to content

Commit 9ff0f56

Browse files
jamezpjamezp
committed
Add BOM's to the project.
Signed-off-by: James R. Perkins <jperkins@ibm.com>
1 parent 1492123 commit 9ff0f56

File tree

6 files changed

+159
-73
lines changed

6 files changed

+159
-73
lines changed

‎api/pom.xml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,17 @@
1717
<artifactId>wildfly-junit-api</artifactId>
1818
<name>WildFly JUnit API</name>
1919

20-
<properties>
21-
</properties>
20+
<dependencyManagement>
21+
<dependencies>
22+
<dependency>
23+
<groupId>org.wildfly.testing</groupId>
24+
<artifactId>wildfly-testing-tools-project-bom</artifactId>
25+
<version>${project.version}</version>
26+
<type>pom</type>
27+
<scope>import</scope>
28+
</dependency>
29+
</dependencies>
30+
</dependencyManagement>
2231

2332
<dependencies>
2433
<dependency>

‎boms/bom/pom.xml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright The WildFly Authors
4+
~ SPDX-License-Identifier: Apache-2.0
5+
-->
6+
7+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
8+
<modelVersion>4.0.0</modelVersion>
9+
<parent>
10+
<groupId>org.wildfly.testing</groupId>
11+
<artifactId>wildfly-testing-tools-parent</artifactId>
12+
<version>1.0.0.Beta1-SNAPSHOT</version>
13+
<relativePath>../../pom.xml</relativePath>
14+
</parent>
15+
16+
<artifactId>wildfly-testing-tools-bom</artifactId>
17+
<packaging>pom</packaging>
18+
19+
<name>WildFly Testing Tools: BOM</name>
20+
<description>WildFly Testing Tools Bill of Materials</description>
21+
<dependencyManagement>
22+
<dependencies>
23+
<dependency>
24+
<groupId>org.wildfly.testing</groupId>
25+
<artifactId>wildfly-junit-api</artifactId>
26+
<version>1.0.0.Beta1-SNAPSHOT</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.wildfly.testing</groupId>
30+
<artifactId>wildfly-junit-extension</artifactId>
31+
<version>1.0.0.Beta1-SNAPSHOT</version>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.wildfly.testing</groupId>
35+
<artifactId>wildfly-testing-tools</artifactId>
36+
<version>1.0.0.Beta1-SNAPSHOT</version>
37+
</dependency>
38+
</dependencies>
39+
</dependencyManagement>
40+
</project>

‎boms/project-bom/pom.xml‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright The WildFly Authors
4+
~ SPDX-License-Identifier: Apache-2.0
5+
-->
6+
7+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
8+
<modelVersion>4.0.0</modelVersion>
9+
<parent>
10+
<groupId>org.wildfly.testing</groupId>
11+
<artifactId>wildfly-testing-tools-parent</artifactId>
12+
<version>1.0.0.Beta1-SNAPSHOT</version>
13+
<relativePath>../../pom.xml</relativePath>
14+
</parent>
15+
16+
<artifactId>wildfly-testing-tools-project-bom</artifactId>
17+
<packaging>pom</packaging>
18+
19+
<properties>
20+
<!-- Project dependencies -->
21+
<version.org.jboss.logging.jboss-logging>3.6.1.Final</version.org.jboss.logging.jboss-logging>
22+
<version.org.jboss.shrinkwrap.shrinkwrap>1.2.6</version.org.jboss.shrinkwrap.shrinkwrap>
23+
<version.org.jsoup>1.21.2</version.org.jsoup>
24+
<version.org.junit>6.0.1</version.org.junit>
25+
<version.org.wildfly.launcher>1.0.2.Final</version.org.wildfly.launcher>
26+
<version.org.wildfly.plugin.tools>2.0.0.Alpha2</version.org.wildfly.plugin.tools>
27+
</properties>
28+
29+
<name>WildFly Testing Tools: Project BOM</name>
30+
<description>WildFly Testing Tools Project Bill of Materials</description>
31+
<dependencyManagement>
32+
<dependencies>
33+
<dependency>
34+
<groupId>org.junit</groupId>
35+
<artifactId>junit-bom</artifactId>
36+
<version>${version.org.junit}</version>
37+
<type>pom</type>
38+
<scope>import</scope>
39+
</dependency>
40+
<dependency>
41+
<groupId>jakarta.platform</groupId>
42+
<artifactId>jakarta.jakartaee-bom</artifactId>
43+
<version>10.0.0</version>
44+
<scope>import</scope>
45+
<type>pom</type>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.jboss.logging</groupId>
49+
<artifactId>jboss-logging</artifactId>
50+
<version>${version.org.jboss.logging.jboss-logging}</version>
51+
</dependency>
52+
<dependency>
53+
<groupId>org.jboss.resteasy</groupId>
54+
<artifactId>resteasy-bom</artifactId>
55+
<version>6.2.14.Final</version>
56+
<scope>import</scope>
57+
<type>pom</type>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.jsoup</groupId>
61+
<artifactId>jsoup</artifactId>
62+
<version>${version.org.jsoup}</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>org.wildfly.plugins</groupId>
66+
<artifactId>wildfly-plugin-tools</artifactId>
67+
<version>${version.org.wildfly.plugin.tools}</version>
68+
</dependency>
69+
<!-- We want this last to hopefully not have it override other dependencies -->
70+
<dependency>
71+
<groupId>org.jboss.shrinkwrap</groupId>
72+
<artifactId>shrinkwrap-depchain</artifactId>
73+
<version>1.2.6</version>
74+
<type>pom</type>
75+
</dependency>
76+
</dependencies>
77+
</dependencyManagement>
78+
</project>

‎extension/pom.xml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,17 @@
1717
<artifactId>wildfly-junit-extension</artifactId>
1818
<name>WildFly JUnit Extension</name>
1919

20-
<properties>
21-
</properties>
20+
<dependencyManagement>
21+
<dependencies>
22+
<dependency>
23+
<groupId>org.wildfly.testing</groupId>
24+
<artifactId>wildfly-testing-tools-project-bom</artifactId>
25+
<version>${project.version}</version>
26+
<type>pom</type>
27+
<scope>import</scope>
28+
</dependency>
29+
</dependencies>
30+
</dependencyManagement>
2231

2332
<dependencies>
2433
<dependency>

‎pom.xml‎

Lines changed: 7 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,20 @@
2525
</description>
2626

2727
<modules>
28+
<module>boms/project-bom</module>
2829
<module>tools</module>
2930
<module>api</module>
3031
<module>extension</module>
32+
<module>boms/bom</module>
3133
</modules>
3234

3335
<properties>
3436
<!-- Override the release version -->
3537
<maven.compiler.release>17</maven.compiler.release>
36-
37-
<!-- Project dependencies -->
38-
<version.org.jboss.logging.jboss-logging>3.6.1.Final</version.org.jboss.logging.jboss-logging>
39-
<version.org.jsoup>1.21.2</version.org.jsoup>
4038
<version.org.kohsuke.metainf-services>1.11</version.org.kohsuke.metainf-services>
41-
<version.org.wildfly.launcher>1.0.2.Final</version.org.wildfly.launcher>
42-
<version.org.wildfly.plugin.tools>2.0.0.Alpha2</version.org.wildfly.plugin.tools>
4339
<!-- Used to override the provisioned version of WildFly. Defaults to empty which is the latest from the channel. -->
4440
<version.org.wildfly/>
4541

46-
<!-- Test dependencies -->
47-
<version.org.junit>6.0.1</version.org.junit>
48-
<version.org.jboss.shrinkwrap.shrinkwrap>1.2.6</version.org.jboss.shrinkwrap.shrinkwrap>
49-
5042
<!-- Plugin versions -->
5143
<version.formatter.maven.plugin>2.29.0</version.formatter.maven.plugin>
5244
<version.impsort.maven.plugin>1.12.0</version.impsort.maven.plugin>
@@ -65,10 +57,10 @@
6557
<!-- checkstyle configuration -->
6658
<linkXRef>false</linkXRef>
6759

68-
<wildfly.scm.connection>scm:git://github.com/wildfly/wildfly-testing-tools.git</wildfly.scm.connection>
69-
<wildfly.scm.developer.connection>scm:git:git@github.com:wildfly/wildfly-testing-toolsn.git
60+
<wildfly.scm.connection>scm:git://github.com/wildfly-extras/wildfly-testing-tools.git</wildfly.scm.connection>
61+
<wildfly.scm.developer.connection>scm:git:git@github.com:wildfly-extras/wildfly-testing-tools.git
7062
</wildfly.scm.developer.connection>
71-
<wildfly.scm.url>https://github.com/wildfly/wildfly-testing-tools</wildfly.scm.url>
63+
<wildfly.scm.url>https://github.com/wildfly-extras/wildfly-testing-tools</wildfly.scm.url>
7264

7365
<!-- Other properties -->
7466
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
@@ -97,7 +89,7 @@
9789

9890
<issueManagement>
9991
<system>GitHub</system>
100-
<url>https://github.com/wildfly/wildfly-testing-tools/issues</url>
92+
<url>https://github.com/wildfly-extras/wildfly-testing-tools/issues</url>
10193
</issueManagement>
10294

10395
<scm>
@@ -115,65 +107,11 @@
115107
</license>
116108
</licenses>
117109

118-
<dependencyManagement>
119-
<dependencies>
120-
<dependency>
121-
<groupId>org.junit</groupId>
122-
<artifactId>junit-bom</artifactId>
123-
<version>${version.org.junit}</version>
124-
<type>pom</type>
125-
<scope>import</scope>
126-
</dependency>
127-
<dependency>
128-
<groupId>jakarta.platform</groupId>
129-
<artifactId>jakarta.jakartaee-bom</artifactId>
130-
<version>10.0.0</version>
131-
<scope>import</scope>
132-
<type>pom</type>
133-
</dependency>
134-
<dependency>
135-
<groupId>org.jboss.logging</groupId>
136-
<artifactId>jboss-logging</artifactId>
137-
<version>${version.org.jboss.logging.jboss-logging}</version>
138-
</dependency>
139-
<dependency>
140-
<groupId>org.jboss.resteasy</groupId>
141-
<artifactId>resteasy-bom</artifactId>
142-
<version>6.2.14.Final</version>
143-
<scope>import</scope>
144-
<type>pom</type>
145-
</dependency>
146-
<dependency>
147-
<groupId>org.jsoup</groupId>
148-
<artifactId>jsoup</artifactId>
149-
<version>${version.org.jsoup}</version>
150-
</dependency>
151-
<dependency>
152-
<groupId>org.kohsuke.metainf-services</groupId>
153-
<artifactId>metainf-services</artifactId>
154-
<version>${version.org.kohsuke.metainf-services}</version>
155-
<scope>provided</scope>
156-
<optional>true</optional>
157-
</dependency>
158-
<dependency>
159-
<groupId>org.wildfly.plugins</groupId>
160-
<artifactId>wildfly-plugin-tools</artifactId>
161-
<version>${version.org.wildfly.plugin.tools}</version>
162-
</dependency>
163-
<!-- We want this last to hopefully not have it override other dependencies -->
164-
<dependency>
165-
<groupId>org.jboss.shrinkwrap</groupId>
166-
<artifactId>shrinkwrap-depchain</artifactId>
167-
<version>1.2.6</version>
168-
<type>pom</type>
169-
</dependency>
170-
</dependencies>
171-
</dependencyManagement>
172-
173110
<dependencies>
174111
<dependency>
175112
<groupId>org.kohsuke.metainf-services</groupId>
176113
<artifactId>metainf-services</artifactId>
114+
<version>${version.org.kohsuke.metainf-services}</version>
177115
<scope>provided</scope>
178116
<optional>true</optional>
179117
</dependency>

‎tools/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,18 @@
1818
<name>WildFly Testing Tools</name>
1919
<description>Testing utilities WildFly. These includes adding deployment descriptors and modules to WildFly for testing.</description>
2020

21+
<dependencyManagement>
22+
<dependencies>
23+
<dependency>
24+
<groupId>org.wildfly.testing</groupId>
25+
<artifactId>wildfly-testing-tools-project-bom</artifactId>
26+
<version>${project.version}</version>
27+
<type>pom</type>
28+
<scope>import</scope>
29+
</dependency>
30+
</dependencies>
31+
</dependencyManagement>
32+
2133
<dependencies>
2234
<dependency>
2335
<groupId>org.jboss.logging</groupId>

0 commit comments

Comments
 (0)