Skip to content

Commit c8e9c29

Browse files
jknackjknack
committed
version bump (upgrade of major dependencies)
1 parent 09e7940 commit c8e9c29

4 files changed

Lines changed: 66 additions & 36 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,6 @@ TODO
2828
tmp
2929
checkstyle
3030
javadoc
31-
examples.mv.db
31+
*.mv.db
32+
versions
33+
out

‎etc/versions.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
mvn -N versions:display-dependency-updates

‎pom.xml‎

Lines changed: 45 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,28 @@
1919
<!-- Parser and Renderer -->
2020
<freemarker.version>2.3.28</freemarker.version>
2121
<handlebars.version>4.1.2</handlebars.version>
22-
<jackson.version>2.9.8</jackson.version>
22+
<jackson.version>2.9.9</jackson.version>
2323
<rocker.version>1.2.1</rocker.version>
2424

2525
<!-- data -->
2626
<HikariCP.version>3.3.1</HikariCP.version>
27-
<mysql-connector-java.version>8.0.15</mysql-connector-java.version>
27+
<mysql-connector-java.version>8.0.16</mysql-connector-java.version>
2828
<log4jdbc.version>1.2</log4jdbc.version>
29-
<h2.version>1.4.197</h2.version>
29+
<h2.version>1.4.199</h2.version>
3030
<hibernate.version>5.4.3.Final</hibernate.version>
31-
<jdbi.version>3.3.0</jdbi.version>
31+
<jdbi.version>3.8.2</jdbi.version>
3232
<flyway.version>5.2.4</flyway.version>
3333

3434
<config.version>1.3.4</config.version>
3535

3636
<!-- dependency injection -->
37-
<weld.version>3.1.0.Final</weld.version>
38-
<spring.version>5.1.6.RELEASE</spring.version>
37+
<weld.version>3.1.1.Final</weld.version>
38+
<spring.version>5.1.8.RELEASE</spring.version>
3939
<guice.version>4.2.2</guice.version>
4040

4141
<!-- logging -->
4242
<logback-classic.version>1.2.3</logback-classic.version>
43-
<log4j.version>2.11.2</log4j.version>
43+
<log4j.version>2.12.0</log4j.version>
4444
<slf4j.version>1.7.26</slf4j.version>
4545

4646
<!-- jboss modules -->
@@ -50,36 +50,36 @@
5050
<asm.version>7.1</asm.version>
5151

5252
<!-- Server -->
53-
<undertow.version>2.0.20.Final</undertow.version>
54-
<jetty.version>9.4.17.v20190418</jetty.version>
55-
<netty.version>4.1.35.Final</netty.version>
53+
<undertow.version>2.0.22.Final</undertow.version>
54+
<jetty.version>9.4.19.v20190610</jetty.version>
55+
<netty.version>4.1.37.Final</netty.version>
5656

5757
<!-- Reactive -->
58-
<rxjava.version>2.2.8</rxjava.version>
59-
<reactor.version>3.2.8.RELEASE</reactor.version>
58+
<rxjava.version>2.2.10</rxjava.version>
59+
<reactor.version>3.2.10.RELEASE</reactor.version>
6060

6161
<!-- javax -->
6262
<javax.inject.version>1</javax.inject.version>
6363
<jsr305.version>3.0.2</jsr305.version>
6464
<jakarta.ws.rs-api.version>2.1.5</jakarta.ws.rs-api.version>
6565

6666
<!-- Misc -->
67-
<okhttp.version>3.14.1</okhttp.version>
67+
<okhttp.version>4.0.0</okhttp.version>
6868

6969
<commons-io.version>2.6</commons-io.version>
7070
<javassist.version>3.25.0-GA</javassist.version>
7171

7272
<!-- Kotlin -->
73-
<kotlin.version>1.3.30</kotlin.version>
74-
<kotlinx-coroutines-core.version>1.2.0</kotlinx-coroutines-core.version>
73+
<kotlin.version>1.3.40</kotlin.version>
74+
<kotlinx-coroutines-core.version>1.2.2</kotlinx-coroutines-core.version>
7575

7676
<!-- Test dependencies -->
77-
<jacoco.version>0.8.3</jacoco.version>
78-
<junit.version>5.4.2</junit.version>
79-
<rest-assured.version>3.3.0</rest-assured.version>
77+
<jacoco.version>0.8.4</jacoco.version>
78+
<junit.version>5.5.0</junit.version>
79+
<rest-assured.version>4.0.0</rest-assured.version>
8080
<checkstyle.version>8.19</checkstyle.version>
81-
<mockito.version>2.27.0</mockito.version>
82-
<guava.version>27.1-jre</guava.version>
81+
<mockito.version>2.28.2</mockito.version>
82+
<guava.version>28.0-jre</guava.version>
8383

8484
<!-- Gradle plugins -->
8585
<gradle-core.version>2.6</gradle-core.version>
@@ -1106,6 +1106,31 @@
11061106
</dependencies>
11071107
</profile>
11081108

1109+
<!-- VERSIONS -->
1110+
<profile>
1111+
<id>version</id>
1112+
<build>
1113+
<plugins>
1114+
<plugin>
1115+
<groupId>org.codehaus.mojo</groupId>
1116+
<artifactId>versions-maven-plugin</artifactId>
1117+
<version>2.7</version>
1118+
<executions>
1119+
<execution>
1120+
<goals>
1121+
<goal>display-dependency-updates</goal>
1122+
</goals>
1123+
<phase>process-resources</phase>
1124+
<configuration>
1125+
<outputFile>target/versions</outputFile>
1126+
</configuration>
1127+
</execution>
1128+
</executions>
1129+
</plugin>
1130+
</plugins>
1131+
</build>
1132+
</profile>
1133+
11091134
<profile>
11101135
<id>source</id>
11111136
<build>

‎tests/src/test/kotlin/io/jooby/FeaturedKotlinTest.kt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class FeaturedKotlinTest {
1717
}
1818
}.ready { client ->
1919
client.get("/") { rsp ->
20-
assertEquals("Hello World!", rsp.body()!!.string())
20+
assertEquals("Hello World!", rsp.body!!.string())
2121
}
2222
}
2323
}
@@ -32,7 +32,7 @@ class FeaturedKotlinTest {
3232
}
3333
}.ready { client ->
3434
client.get("/") { rsp ->
35-
assertEquals("Hello World!", rsp.body()!!.string())
35+
assertEquals("Hello World!", rsp.body!!.string())
3636
}
3737
}
3838
}
@@ -49,7 +49,7 @@ class FeaturedKotlinTest {
4949
}
5050
}.ready { client ->
5151
client.get("/") { rsp ->
52-
assertEquals("/coroutine", rsp.body()!!.string())
52+
assertEquals("/coroutine", rsp.body!!.string())
5353
}
5454
}
5555
}
@@ -67,7 +67,7 @@ class FeaturedKotlinTest {
6767
}
6868
}.ready { client ->
6969
client.get("/") { rsp ->
70-
assertEquals("/coroutine", rsp.body()!!.string())
70+
assertEquals("/coroutine", rsp.body!!.string())
7171
}
7272
}
7373
}
@@ -86,7 +86,7 @@ class FeaturedKotlinTest {
8686
}
8787
}.ready { client ->
8888
client.get("/") { rsp ->
89-
assertEquals("1,2,3,4,5,6,7,8,9,10,", rsp.body()!!.string())
89+
assertEquals("1,2,3,4,5,6,7,8,9,10,", rsp.body!!.string())
9090
}
9191
}
9292
}
@@ -97,27 +97,27 @@ class FeaturedKotlinTest {
9797
app.mvc(KotlinMvc())
9898
}.ready { client ->
9999
client.get("/kotlin") { rsp ->
100-
assertEquals("Got it!", rsp.body()!!.string())
100+
assertEquals("Got it!", rsp.body!!.string())
101101
}
102102

103103
client.get("/kotlin/78") { rsp ->
104-
assertEquals("78", rsp.body()!!.string())
104+
assertEquals("78", rsp.body!!.string())
105105
}
106106

107107
client.get("/kotlin/point?x=8&y=1") { rsp ->
108-
assertEquals("QueryPoint(x=8, y=1) : 8", rsp.body()!!.string())
108+
assertEquals("QueryPoint(x=8, y=1) : 8", rsp.body!!.string())
109109
}
110110

111111
client.get("/kotlin/point") { rsp ->
112-
assertEquals("QueryPoint(x=null, y=null) : null", rsp.body()!!.string())
112+
assertEquals("QueryPoint(x=null, y=null) : null", rsp.body!!.string())
113113
}
114114

115115
client.get("/kotlin/point?x=9") { rsp ->
116-
assertEquals("QueryPoint(x=9, y=null) : 9", rsp.body()!!.string())
116+
assertEquals("QueryPoint(x=9, y=null) : 9", rsp.body!!.string())
117117
}
118118

119119
client.get("/kotlin/point?x=9&y=8") { rsp ->
120-
assertEquals("QueryPoint(x=9, y=8) : 9", rsp.body()!!.string())
120+
assertEquals("QueryPoint(x=9, y=8) : 9", rsp.body!!.string())
121121
}
122122
}
123123
}
@@ -138,19 +138,19 @@ class FeaturedKotlinTest {
138138
}
139139
}.ready { client ->
140140
client.get("/") { rsp ->
141-
assertEquals("Got it!", rsp.body()!!.string())
141+
assertEquals("Got it!", rsp.body!!.string())
142142
}
143143

144144
client.get("/delay") { rsp ->
145-
assertEquals("/delay", rsp.body()!!.string())
145+
assertEquals("/delay", rsp.body!!.string())
146146
}
147147

148148
client.get("/456") { rsp ->
149-
assertEquals("456", rsp.body()!!.string())
149+
assertEquals("456", rsp.body!!.string())
150150
}
151151

152152
client.get("/456x") { rsp ->
153-
assertEquals("Unable to provision parameter: 'id: int'", rsp.body()!!.string())
153+
assertEquals("Unable to provision parameter: 'id: int'", rsp.body!!.string())
154154
}
155155
}
156156
}

0 commit comments

Comments
 (0)