Skip to content

Commit 21092de

Browse files
committed
Merge remote-tracking branch 'upstream/2.x' into 2.x
2 parents c9de33e + facce39 commit 21092de

30 files changed

Lines changed: 10 additions & 11 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ out
3434
node
3535
node_modules
3636
build
37+
.gradle

modules/jooby-bom/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<compile-testing.version>0.18</compile-testing.version>
3030
<config.version>1.4.0</config.version>
3131
<cron-utils.version>9.0.2</cron-utils.version>
32-
<ebean.version>12.1.12</ebean.version>
32+
<ebean.version>12.2.1</ebean.version>
3333
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
3434
<flyway.version>6.3.0</flyway.version>
3535
<freemarker.version>2.3.29</freemarker.version>
@@ -42,14 +42,14 @@
4242
<h2.version>1.4.200</h2.version>
4343
<handlebars.version>4.1.2</handlebars.version>
4444
<hibernate.version>5.4.10.Final</hibernate.version>
45-
<jackson.version>2.10.2</jackson.version>
45+
<jackson.version>2.10.3</jackson.version>
4646
<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
4747
<jacoco.version>0.8.5</jacoco.version>
4848
<jakarta.ws.rs-api.version>2.1.6</jakarta.ws.rs-api.version>
4949
<javax.inject.version>1</javax.inject.version>
5050
<jboss-modules.version>1.9.2.Final</jboss-modules.version>
5151
<jdbi.version>3.12.2</jdbi.version>
52-
<jetty.version>9.4.26.v20200117</jetty.version>
52+
<jetty.version>9.4.27.v20200227</jetty.version>
5353
<jfiglet.version>0.0.8</jfiglet.version>
5454
<jmespath-java.version>1.11.714</jmespath-java.version>
5555
<jooby-maven-plugin.version>2.6.1</jooby-maven-plugin.version>
@@ -87,7 +87,7 @@
8787
<mockito.version>3.2.4</mockito.version>
8888
<mojo-executor.version>2.3.1</mojo-executor.version>
8989
<mysql-connector-java.version>8.0.19</mysql-connector-java.version>
90-
<netty.version>4.1.45.Final</netty.version>
90+
<netty.version>4.1.47.Final</netty.version>
9191
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
9292
<okhttp.version>4.4.1</okhttp.version>
9393
<pac4j.version>4.0.0-RC2</pac4j.version>
Binary file not shown.
Binary file not shown.
-1 Bytes
Binary file not shown.
Binary file not shown.
-19.6 KB
Binary file not shown.
-17 Bytes
Binary file not shown.

modules/jooby-gradle-plugin/.gradle/5.6/gc.properties

Whitespace-only changes.
Binary file not shown.

0 commit comments

Comments
 (0)