Skip to content

Commit 43fd819

Browse files
jknackjknack
committed
Merge branch 'main' into 3820
2 parents 7ad2da4 + c219dc5 commit 43fd819

File tree

9 files changed

+32
-34
lines changed

9 files changed

+32
-34
lines changed

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ sponsors
6161

6262
| Logo | Sponsor |
6363
|----------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------|
64-
| <img src="https://github.com/user-attachments/assets/ac8c311c-1873-4024-9670-0e7599b1026b" alt="Mercedes Benz" width="32" height="32"> | [@mercedes-benz](https://github.com/mercedes-benz) |
6564
| <img src="https://github.com/user-attachments/assets/4a3f519e-0b2e-4bb4-b2eb-624b05720e31" alt="Premium Minds" width="32" height="32"> | [@premium-minds](https://github.com/premium-minds) |
6665
| <img src="https://avatars.githubusercontent.com/u/567706?v=4" alt="Adam Gent" width="32" height="32"> | [@agentgt](https://github.com/agentgt) |
6766
| <img src="https://github.com/user-attachments/assets/51073649-6cba-4e7b-8eee-8c05f4b9648e" alt="David" width="32" height="32"> | [@tipsy](https://github.com/tipsy) |

‎modules/jooby-awssdk-v2/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<name>jooby-awssdk-v2</name>
1313

1414
<properties>
15-
<aws.java.sdk.version>2.39.2</aws.java.sdk.version>
15+
<aws.java.sdk.version>2.40.8</aws.java.sdk.version>
1616
</properties>
1717

1818
<dependencyManagement>

‎modules/jooby-mutiny/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>io.smallrye.reactive</groupId>
2828
<artifactId>mutiny</artifactId>
29-
<version>3.0.1</version>
29+
<version>3.1.0</version>
3030
</dependency>
3131

3232
<!-- Test dependencies -->

‎modules/jooby-openapi/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<dependency>
4949
<groupId>com.puppycrawl.tools</groupId>
5050
<artifactId>checkstyle</artifactId>
51-
<version>12.1.2</version>
51+
<version>12.2.0</version>
5252
</dependency>
5353

5454
<dependency>
@@ -110,7 +110,7 @@
110110
<dependency>
111111
<groupId>io.avaje</groupId>
112112
<artifactId>avaje-inject</artifactId>
113-
<version>12.0</version>
113+
<version>12.1</version>
114114
<scope>test</scope>
115115
</dependency>
116116

@@ -156,7 +156,7 @@
156156
<dependency>
157157
<groupId>net.bytebuddy</groupId>
158158
<artifactId>byte-buddy</artifactId>
159-
<version>1.18.1</version>
159+
<version>1.18.2</version>
160160
<scope>test</scope>
161161
</dependency>
162162
<dependency>

‎modules/jooby-pebble/src/main/java/io/jooby/pebble/PebbleModule.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,9 @@ DelegatingLoader getDefaultLoader(String templatesPath, String extension) {
235235
cLoader.setSuffix(extension);
236236
loaders.add(cLoader);
237237

238-
FileLoader fLoader = new FileLoader();
239238
Path dir = Paths.get(System.getProperty("user.dir"), templatesPath);
240239
if (Files.exists(dir)) {
241-
fLoader.setPrefix(dir.normalize().toString());
240+
FileLoader fLoader = new FileLoader(dir.normalize().toString());
242241
fLoader.setSuffix(extension);
243242
loaders.add(fLoader);
244243
}

‎modules/jooby-reactor/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>io.projectreactor</groupId>
2828
<artifactId>reactor-core</artifactId>
29-
<version>3.8.0</version>
29+
<version>3.8.1</version>
3030
</dependency>
3131

3232
<!-- Test dependencies -->

‎modules/jooby-swagger-ui/package-lock.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎modules/jooby-swagger-ui/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"license": "ASF",
66
"dependencies": {
7-
"swagger-ui-dist": "^5.30.2"
7+
"swagger-ui-dist": "^5.30.3"
88
},
99
"scarfSettings": {
1010
"enabled": false

‎pom.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@
7474
<log4jdbc.version>1.2</log4jdbc.version>
7575
<hibernate.version>7.0.4.Final</hibernate.version>
7676
<ebean.version>17.2.0</ebean.version>
77-
<jdbi.version>3.50.0</jdbi.version>
77+
<jdbi.version>3.51.0</jdbi.version>
7878
<flyway.version>11.15.0</flyway.version>
7979
<graphql-java.version>25.0</graphql-java.version>
80-
<lettuce.version>7.1.0.RELEASE</lettuce.version>
81-
<commons-pool2.version>2.12.1</commons-pool2.version>
80+
<lettuce.version>7.2.0.RELEASE</lettuce.version>
81+
<commons-pool2.version>2.13.0</commons-pool2.version>
8282
<kafka.version>4.1.1</kafka.version>
8383
<caffeine.version>3.2.3</caffeine.version>
8484

@@ -88,7 +88,7 @@
8888
<guice.version>7.0.0</guice.version>
8989

9090
<!-- logging -->
91-
<logback-classic.version>1.5.21</logback-classic.version>
91+
<logback-classic.version>1.5.22</logback-classic.version>
9292
<log4j.version>2.25.2</log4j.version>
9393
<slf4j.version>2.0.17</slf4j.version>
9494

@@ -106,22 +106,22 @@
106106

107107
<!-- Server -->
108108
<undertow.version>2.3.20.Final</undertow.version>
109-
<jetty.version>12.1.4</jetty.version>
110-
<netty.version>4.2.7.Final</netty.version>
109+
<jetty.version>12.1.5</jetty.version>
110+
<netty.version>4.2.8.Final</netty.version>
111111
<vertx.version>5.0.5</vertx.version>
112112

113113
<!--OpenAPI-->
114-
<swagger.version>2.2.40</swagger.version>
115-
<swagger-parser.version>2.1.35</swagger-parser.version>
114+
<swagger.version>2.2.41</swagger.version>
115+
<swagger-parser.version>2.1.36</swagger-parser.version>
116116
<redoc.version>2.0.0-rc.20</redoc.version>
117117

118118
<!-- SSL -->
119119
<conscrypt.version>2.5.2</conscrypt.version>
120120

121121
<!-- avaje -->
122-
<avaje.inject.version>12.0</avaje.inject.version>
123-
<avaje.jsonb.version>3.8</avaje.jsonb.version>
124-
<avaje.validator.version>2.14</avaje.validator.version>
122+
<avaje.inject.version>12.1</avaje.inject.version>
123+
<avaje.jsonb.version>3.9</avaje.jsonb.version>
124+
<avaje.validator.version>2.15</avaje.validator.version>
125125

126126
<!-- jakarta -->
127127
<jakarta.inject.version>2.0.1.MR</jakarta.inject.version>
@@ -133,10 +133,10 @@
133133
<okhttp.version>5.3.2</okhttp.version>
134134
<jsonwebtoken.version>0.13.0</jsonwebtoken.version>
135135
<pac4j.version>6.2.2</pac4j.version>
136-
<quartz.version>2.5.1</quartz.version>
136+
<quartz.version>2.5.2</quartz.version>
137137
<cron-utils.version>9.2.1</cron-utils.version>
138138
<bucket4j-core.version>8.15.0</bucket4j-core.version>
139-
<aws-java-sdk.version>1.12.793</aws-java-sdk.version>
139+
<aws-java-sdk.version>1.12.795</aws-java-sdk.version>
140140
<camel.version>4.15.0</camel.version>
141141
<jasypt.version>1.9.3</jasypt.version>
142142

@@ -150,9 +150,9 @@
150150
<!-- Test dependencies -->
151151
<jacoco.version>0.8.14</jacoco.version>
152152
<junit.version>6.0.1</junit.version>
153-
<rest-assured.version>5.5.6</rest-assured.version>
153+
<rest-assured.version>6.0.0</rest-assured.version>
154154
<assertj-core.version>3.27.6</assertj-core.version>
155-
<mockito.version>5.20.0</mockito.version>
155+
<mockito.version>5.21.0</mockito.version>
156156
<maven.m2.repo>${user.home}${file.separator}.m2${file.separator}repository</maven.m2.repo>
157157
<mockito.agent>org${file.separator}mockito${file.separator}mockito-core${file.separator}${mockito.version}${file.separator}mockito-core-${mockito.version}.jar</mockito.agent>
158158
<argLine>-javaagent:${maven.m2.repo}${file.separator}${mockito.agent}</argLine>
@@ -170,7 +170,7 @@
170170
<jacoco-maven-plugin.version>${jacoco.version}</jacoco-maven-plugin.version>
171171
<maven-antrun-plugin.version>3.2.0</maven-antrun-plugin.version>
172172
<maven-archetype-plugin.version>3.2.0</maven-archetype-plugin.version>
173-
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
173+
<maven-assembly-plugin.version>3.8.0</maven-assembly-plugin.version>
174174
<maven-tiles-plugin.version>2.41</maven-tiles-plugin.version>
175175
<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
176176
<maven-core.version>3.9.11</maven-core.version>
@@ -183,15 +183,15 @@
183183
<maven-plugin-api.version>3.9.11</maven-plugin-api.version>
184184
<maven-plugin-plugin.version>3.15.2</maven-plugin-plugin.version>
185185
<maven-project.version>2.2.1</maven-project.version>
186-
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
186+
<maven-resources-plugin.version>3.4.0</maven-resources-plugin.version>
187187
<maven-shade-plugin.version>3.6.1</maven-shade-plugin.version>
188188
<maven-site-plugin.version>3.8.2</maven-site-plugin.version>
189-
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
189+
<maven-source-plugin.version>3.4.0</maven-source-plugin.version>
190190
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
191191
<mojo-executor.version>2.3.1</mojo-executor.version>
192192
<plexus-utils.version>4.0.2</plexus-utils.version>
193193
<stork-maven-plugin.version>3.2.0</stork-maven-plugin.version>
194-
<versions-maven-plugin.version>2.20.0</versions-maven-plugin.version>
194+
<versions-maven-plugin.version>2.20.1</versions-maven-plugin.version>
195195
<exec-maven-plugin.version>3.6.2</exec-maven-plugin.version>
196196
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
197197
<frontend-maven-plugin.version>1.15.4</frontend-maven-plugin.version>
@@ -1654,7 +1654,7 @@
16541654
<plugin>
16551655
<groupId>org.codehaus.mojo</groupId>
16561656
<artifactId>versions-maven-plugin</artifactId>
1657-
<version>2.20.0</version>
1657+
<version>2.20.1</version>
16581658
<executions>
16591659
<execution>
16601660
<goals>

0 commit comments

Comments
 (0)