Skip to content

Commit 081edee

Browse files
feffijknack
authored andcommitted
POM version aggregation (jooby-project#1119)
* moved dependency and module versions to project POM properties * eliminated duplicate dependency import * moved dependency and module versions to project POM properties * moved dependency and module versions to project POM properties * moved dependency and module versions to project POM properties * moved dependency and module versions to project POM properties * moved dependency and module versions to project POM properties * moved dependency and module versions to project POM properties * moved dependency and module versions to project POM properties * moved dependency and module versions to project POM properties * moved dependency and module versions to project POM properties added java target version * moved dependency and module versions to project POM properties added java target version * moved dependency and module versions to project POM properties * eliminated duplicate dependency import * eliminated duplicate dependency import * moved dependency and module versions to project POM properties * sorted dependency list
1 parent ff0e38b commit 081edee

File tree

20 files changed

+171
-158
lines changed

20 files changed

+171
-158
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ jacoco.exec
2323
.*.md.html
2424
node
2525
dump
26+
TODO.md

modules/coverage-report/pom.xml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<plugin>
2727
<groupId>org.codehaus.mojo</groupId>
2828
<artifactId>build-helper-maven-plugin</artifactId>
29-
<version>1.9.1</version>
29+
<version>${build-helper-maven-plugin.version}</version>
3030
<executions>
3131
<execution>
3232
<id>source-coverage</id>
@@ -254,7 +254,7 @@
254254
<dependency>
255255
<groupId>org.mortbay.jetty.alpn</groupId>
256256
<artifactId>alpn-boot</artifactId>
257-
<version>${alpn-boot.version}</version>
257+
<version>s${alpn-boot.version}</version> <!-- TODO: update to 8.1.12.v20180117 -->
258258
</dependency>
259259
</dependencies>
260260
</plugin>
@@ -1055,19 +1055,19 @@
10551055
<dependency>
10561056
<groupId>org.webjars</groupId>
10571057
<artifactId>jquery</artifactId>
1058-
<version>2.1.3</version>
1058+
<version>${jquery.version}</version>
10591059
</dependency>
10601060

10611061
<dependency>
10621062
<groupId>org.webjars</groupId>
10631063
<artifactId>jquery-ui</artifactId>
1064-
<version>1.11.3</version>
1064+
<version>${jquery-ui.version}</version>
10651065
</dependency>
10661066

10671067
<dependency>
10681068
<groupId>org.webjars</groupId>
10691069
<artifactId>bootstrap</artifactId>
1070-
<version>3.3.4</version>
1070+
<version>${bootstrap.version}</version>
10711071
</dependency>
10721072

10731073
<!-- Servers -->
@@ -1103,12 +1103,6 @@
11031103
</dependency>
11041104

11051105
<!-- Test dependencies -->
1106-
<dependency>
1107-
<groupId>org.pac4j</groupId>
1108-
<artifactId>pac4j-oauth</artifactId>
1109-
<version>${pac4j2.version}</version>
1110-
</dependency>
1111-
11121106
<dependency>
11131107
<groupId>org.pac4j</groupId>
11141108
<artifactId>pac4j-cas</artifactId>
@@ -1148,7 +1142,7 @@
11481142
<dependency>
11491143
<groupId>org.webjars</groupId>
11501144
<artifactId>swagger-ui</artifactId>
1151-
<version>3.14.2</version>
1145+
<version>${swagger-ui.version}</version>
11521146
</dependency>
11531147

11541148
<!-- Test dependencies -->
@@ -1181,7 +1175,7 @@
11811175
<dependency>
11821176
<groupId>com.sun.jersey</groupId>
11831177
<artifactId>jersey-client</artifactId>
1184-
<version>1.19.1</version>
1178+
<version>${jersey-client.version}</version>
11851179
<scope>test</scope>
11861180
</dependency>
11871181

@@ -1240,7 +1234,7 @@
12401234
<dependency>
12411235
<groupId>org.jsoup</groupId>
12421236
<artifactId>jsoup</artifactId>
1243-
<version>1.8.2</version>
1237+
<version>1.8.2</version> <!-- TODO: update to jsoup.version == 1.8.3 -->
12441238
<scope>test</scope>
12451239
</dependency>
12461240

@@ -1259,13 +1253,13 @@
12591253
<dependency>
12601254
<groupId>io.reactivex.rxjava2</groupId>
12611255
<artifactId>rxjava</artifactId>
1262-
<version>2.0.7</version>
1256+
<version>${rxjava2.version}</version>
12631257
</dependency>
12641258

12651259
<dependency>
12661260
<groupId>com.datastax.cassandra</groupId>
12671261
<artifactId>dse-driver</artifactId>
1268-
<version>1.1.2</version>
1262+
<version>${dse-driver.version}</version>
12691263
<scope>test</scope>
12701264
</dependency>
12711265

@@ -1301,7 +1295,7 @@
13011295
<dependency>
13021296
<groupId>com.impossibl.pgjdbc-ng</groupId>
13031297
<artifactId>pgjdbc-ng</artifactId>
1304-
<version>0.7.1</version>
1298+
<version>${pgjdbc-ng.version}</version>
13051299
<optional>true</optional>
13061300
<exclusions>
13071301
<exclusion>

modules/jooby-apitool/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
<dependency>
176176
<groupId>org.antlr</groupId>
177177
<artifactId>antlr4-runtime</artifactId>
178-
<version>4.7</version>
178+
<version>${antlr4-runtime.version}</version>
179179
<optional>true</optional>
180180
<exclusions>
181181
<exclusion>
@@ -235,7 +235,7 @@
235235
<dependency>
236236
<groupId>io.swagger</groupId>
237237
<artifactId>swagger-parser</artifactId>
238-
<version>1.0.34</version>
238+
<version>${swagger-parser.version}</version>
239239
</dependency>
240240

241241
<dependency>

modules/jooby-archetype/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
<extension>
3434
<groupId>org.apache.maven.archetype</groupId>
3535
<artifactId>archetype-packaging</artifactId>
36-
<version>2.2</version>
36+
<version>${archetype-packaging.version}</version>
3737
</extension>
3838
</extensions>
3939

4040
<pluginManagement>
4141
<plugins>
4242
<plugin>
4343
<artifactId>maven-archetype-plugin</artifactId>
44-
<version>2.2</version>
44+
<version>${maven-archetype-plugin.version}</version>
4545
</plugin>
4646
</plugins>
4747
</pluginManagement>

modules/jooby-assets-nodejs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<dependency>
8282
<groupId>org.webjars.npm</groupId>
8383
<artifactId>jquery</artifactId>
84-
<version>3.1.1</version>
84+
<version>3.1.1</version><!-- TODO: inject jquery.version -->
8585
<scope>test</scope>
8686
</dependency>
8787

modules/jooby-assets-sass/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>io.bit3</groupId>
4444
<artifactId>jsass</artifactId>
45-
<version>5.2.0</version>
45+
<version>${jsass.version}</version>
4646
</dependency>
4747

4848
<!-- Test dependencies -->

modules/jooby-assets-svg-sprites/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>org.apache.xmlgraphics</groupId>
5454
<artifactId>xmlgraphics-commons</artifactId>
55-
<version>2.1</version>
55+
<version>${xmlgraphics-commons.version}</version>
5656
</dependency>
5757

5858
<!-- Test dependencies -->

modules/jooby-assets/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>me.tongfei</groupId>
4343
<artifactId>progressbar</artifactId>
44-
<version>0.6.0</version>
44+
<version>${progressbar.version}</version>
4545
</dependency>
4646

4747
<!-- Test dependencies -->

modules/jooby-cassandra/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<dependency>
123123
<groupId>com.datastax.cassandra</groupId>
124124
<artifactId>dse-driver</artifactId>
125-
<version>1.1.2</version>
125+
<version>${dse-driver.version}</version>
126126
<scope>test</scope>
127127
</dependency>
128128

modules/jooby-crash/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<plugin>
3232
<groupId>org.basepom.maven</groupId>
3333
<artifactId>duplicate-finder-maven-plugin</artifactId>
34-
<version>1.2.1</version>
34+
<version>${duplicate-finder-maven-plugin.version}</version>
3535
<executions>
3636
<execution>
3737
<id>duplicate-dependencies</id>

0 commit comments

Comments
 (0)