Skip to content

Commit 9bece42

Browse files
authored
Build: Move dependencies to child modules (#84)
* Define Jetty version in child Module * Move XML-related dependencies * Vavr * JGit
1 parent 6da3eb4 commit 9bece42

File tree

6 files changed

+32
-40
lines changed

6 files changed

+32
-40
lines changed

jetty/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,21 @@
1212
<artifactId>java-examples-jetty</artifactId>
1313
<name>Java Examples - Jetty</name>
1414

15+
<properties>
16+
<jetty.version>9.4.30.v20200611</jetty.version>
17+
</properties>
18+
1519
<dependencies>
1620
<dependency>
1721
<groupId>org.eclipse.jetty</groupId>
1822
<artifactId>jetty-server</artifactId>
23+
<version>${jetty.version}</version>
1924
<scope>test</scope>
2025
</dependency>
2126
<dependency>
2227
<groupId>org.eclipse.jetty</groupId>
2328
<artifactId>jetty-servlet</artifactId>
29+
<version>${jetty.version}</version>
2430
<scope>test</scope>
2531
</dependency>
2632

jgit-http/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,21 @@
1313
<artifactId>java-examples-jgit-http</artifactId>
1414
<name>Java Examples - JGit HTTP</name>
1515

16+
<properties>
17+
<jetty.version>9.4.30.v20200611</jetty.version>
18+
<jgit.version>5.8.0.202006091008-r</jgit.version>
19+
</properties>
20+
1621
<dependencies>
1722
<dependency>
1823
<groupId>org.eclipse.jgit</groupId>
1924
<artifactId>org.eclipse.jgit</artifactId>
25+
<version>${jgit.version}</version>
2026
</dependency>
2127
<dependency>
2228
<groupId>org.eclipse.jgit</groupId>
2329
<artifactId>org.eclipse.jgit.http.server</artifactId>
30+
<version>${jgit.version}</version>
2431
</dependency>
2532
<dependency>
2633
<groupId>junit</groupId>
@@ -35,10 +42,12 @@
3542
<dependency>
3643
<groupId>org.eclipse.jetty</groupId>
3744
<artifactId>jetty-server</artifactId>
45+
<version>${jetty.version}</version>
3846
</dependency>
3947
<dependency>
4048
<groupId>org.eclipse.jetty</groupId>
4149
<artifactId>jetty-servlet</artifactId>
50+
<version>${jetty.version}</version>
4251
</dependency>
4352
<dependency>
4453
<groupId>org.slf4j</groupId>

jgit/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,15 @@
1313
<artifactId>java-examples-jgit</artifactId>
1414
<name>Java Examples - JGit</name>
1515

16+
<properties>
17+
<jgit.version>5.8.0.202006091008-r</jgit.version>
18+
</properties>
19+
1620
<dependencies>
1721
<dependency>
1822
<groupId>org.eclipse.jgit</groupId>
1923
<artifactId>org.eclipse.jgit</artifactId>
24+
<version>${jgit.version}</version>
2025
</dependency>
2126
<dependency>
2227
<groupId>junit</groupId>

pom.xml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
<jaxbVersion>2.2.11</jaxbVersion>
3434
<jaxrsVersion>2.1</jaxrsVersion>
3535
<jerseyVersion>2.31</jerseyVersion>
36-
<jettyVersion>9.4.30.v20200611</jettyVersion>
37-
<jgitVersion>5.8.0.202006091008-r</jgitVersion>
3836
<jsonVersion>20160810</jsonVersion>
3937
<jsonUnitVersion>2.18.1</jsonUnitVersion>
4038
<junitVersion>4.13</junitVersion>
@@ -43,9 +41,6 @@
4341
<mockitoVersion>1.10.19</mockitoVersion>
4442
<myFacesVersion>2.2.11</myFacesVersion>
4543
<slf4jVersion>1.7.30</slf4jVersion>
46-
<vavrVersion>1.0.0-alpha-3</vavrVersion>
47-
<xercesVersion>2.12.0</xercesVersion>
48-
<xstreamVersion>1.4.12</xstreamVersion>
4944
</properties>
5045

5146
<modules>
@@ -125,21 +120,6 @@
125120
<artifactId>commons-io</artifactId>
126121
<version>${commonsIoVersion}</version>
127122
</dependency>
128-
<dependency>
129-
<groupId>org.eclipse.jgit</groupId>
130-
<artifactId>org.eclipse.jgit</artifactId>
131-
<version>${jgitVersion}</version>
132-
</dependency>
133-
<dependency>
134-
<groupId>org.eclipse.jgit</groupId>
135-
<artifactId>org.eclipse.jgit.http.server</artifactId>
136-
<version>${jgitVersion}</version>
137-
</dependency>
138-
<dependency>
139-
<groupId>com.thoughtworks.xstream</groupId>
140-
<artifactId>xstream</artifactId>
141-
<version>${xstreamVersion}</version>
142-
</dependency>
143123
<dependency>
144124
<groupId>javax.ws.rs</groupId>
145125
<artifactId>javax.ws.rs-api</artifactId>
@@ -268,26 +248,6 @@
268248
<artifactId>validation-api</artifactId>
269249
<version>${javaxValidationVersion}</version>
270250
</dependency>
271-
<dependency>
272-
<groupId>org.eclipse.jetty</groupId>
273-
<artifactId>jetty-server</artifactId>
274-
<version>${jettyVersion}</version>
275-
</dependency>
276-
<dependency>
277-
<groupId>org.eclipse.jetty</groupId>
278-
<artifactId>jetty-servlet</artifactId>
279-
<version>${jettyVersion}</version>
280-
</dependency>
281-
<dependency>
282-
<groupId>io.vavr</groupId>
283-
<artifactId>vavr</artifactId>
284-
<version>${vavrVersion}</version>
285-
</dependency>
286-
<dependency>
287-
<groupId>xerces</groupId>
288-
<artifactId>xercesImpl</artifactId>
289-
<version>${xercesVersion}</version>
290-
</dependency>
291251
</dependencies>
292252
</dependencyManagement>
293253

vavr/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,15 @@
1313
<artifactId>java-examples-vavr</artifactId>
1414
<name>Java Examples - VAVR</name>
1515

16+
<properties>
17+
<vavr.version>1.0.0-alpha-3</vavr.version>
18+
</properties>
19+
1620
<dependencies>
1721
<dependency>
1822
<groupId>io.vavr</groupId>
1923
<artifactId>vavr</artifactId>
24+
<version>${vavr.version}</version>
2025
</dependency>
2126
<dependency>
2227
<groupId>org.junit.jupiter</groupId>

xml/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
<artifactId>java-examples-xml</artifactId>
1414
<name>Java Examples - XML</name>
1515

16+
<properties>
17+
<xerces.version>2.12.0</xerces.version>
18+
<xstream.version>1.4.12</xstream.version>
19+
</properties>
20+
1621
<dependencies>
1722
<dependency>
1823
<groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -21,10 +26,12 @@
2126
<dependency>
2227
<groupId>com.thoughtworks.xstream</groupId>
2328
<artifactId>xstream</artifactId>
29+
<version>${xstream.version}</version>
2430
</dependency>
2531
<dependency>
2632
<groupId>xerces</groupId>
2733
<artifactId>xercesImpl</artifactId>
34+
<version>${xerces.version}</version>
2835
</dependency>
2936
<dependency>
3037
<groupId>org.junit.jupiter</groupId>

0 commit comments

Comments
 (0)