Skip to content

Commit 254c777

Browse files
solomaxsolomax
committed
Dependencies are updated
1 parent e60b370 commit 254c777

8 files changed

Lines changed: 70 additions & 73 deletions

File tree

‎datastores-parent/datastore-hazelcast/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<description>An implementation of Apache Wicket's IDataStore that uses Hazelcast as a backend</description>
1414

1515
<properties>
16-
<hazelcast.version>5.2.3</hazelcast.version>
16+
<hazelcast.version>5.3.7</hazelcast.version>
1717
</properties>
1818
<dependencies>
1919

‎datastores-parent/datastore-ignite/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<description>An implementation of Apache Wicket's IDataStore that uses Apache Ignite as a backend</description>
1414

1515
<properties>
16-
<ignite-core.version>2.10.0</ignite-core.version>
16+
<ignite-core.version>2.16.0</ignite-core.version>
1717
</properties>
1818
<dependencies>
1919

‎jasperreports-parent/jasperreports/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</dependency>
4141
<dependency>
4242
<groupId>org.bouncycastle</groupId>
43-
<artifactId>bcprov-jdk15on</artifactId>
43+
<artifactId>bcprov-jdk18on</artifactId>
4444
<version>${bcprov.version}</version> <!-- required to override bundled version -->
4545
</dependency>
4646

‎pom.xml‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
<!-- mocleiri: for distribution in to central repository sections in the main pom are not allowed -->
212212

213213
<properties>
214-
<wicket.version>8.15.0</wicket.version>
214+
<wicket.version>8.16.0</wicket.version>
215215

216216
<maven.compiler.source>1.8</maven.compiler.source>
217217
<maven.compiler.target>1.8</maven.compiler.target>
@@ -223,77 +223,77 @@
223223
<deployment.disabled>false</deployment.disabled>
224224
<sources.disabled>false</sources.disabled>
225225

226-
<hibernate.version>5.6.5.Final</hibernate.version>
227-
<javassist.version>3.29.2-GA</javassist.version>
228-
<jetty.version>9.4.51.v20230217</jetty.version>
226+
<hibernate.version>5.6.15.Final</hibernate.version>
227+
<javassist.version>3.30.2-GA</javassist.version>
228+
<jetty.version>9.4.54.v20240208</jetty.version>
229229
<sf-jung.version>2.1.1</sf-jung.version>
230230
<shiro.version>1.7.1</shiro.version>
231-
<slf4j.version>1.7.32</slf4j.version>
232-
<logback.version>1.2.12</logback.version>
233-
<log4j.version>2.20.0</log4j.version>
231+
<slf4j.version>2.0.13</slf4j.version>
232+
<logback.version>1.3.14</logback.version>
233+
<log4j.version>2.23.1</log4j.version>
234234
<spring.version>4.3.30.RELEASE</spring.version>
235235
<cglib.version>3.3.0</cglib.version>
236-
<objenesis.version>3.3</objenesis.version>
237-
<scala.version>2.13.8</scala.version>
238-
<jackson.version>2.15.0</jackson.version>
239-
<poi.version>5.2.3</poi.version>
236+
<objenesis.version>3.4</objenesis.version>
237+
<scala.version>2.13.14</scala.version>
238+
<jackson.version>2.15.4</jackson.version>
239+
<poi.version>5.2.5</poi.version>
240240
<guava.version>29.0-jre</guava.version>
241-
<wicket-webjars.version>2.0.13</wicket-webjars.version>
241+
<wicket-webjars.version>2.0.20</wicket-webjars.version>
242242
<commons-io.version>2.6</commons-io.version>
243-
<xstream.version>1.4.17</xstream.version>
243+
<xstream.version>1.4.20</xstream.version>
244244
<hamcrest.version>2.2</hamcrest.version>
245-
<commons-logging.version>1.2</commons-logging.version>
245+
<commons-logging.version>1.3.2</commons-logging.version>
246246
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
247247
<junit.version>4.13.2</junit.version>
248-
<easymock.version>5.1.0</easymock.version>
248+
<easymock.version>5.3.0</easymock.version>
249249
<mockito.version>4.11.0</mockito.version>
250250
<testng.version>7.5.1</testng.version>
251251
<commons-beanutils.version>1.9.4</commons-beanutils.version>
252252
<commons-collections4.version>4.4</commons-collections4.version>
253253
<commons-digester3.version>3.2</commons-digester3.version>
254-
<commons-lang3.version>3.12.0</commons-lang3.version>
254+
<commons-lang3.version>3.14.0</commons-lang3.version>
255255
<validation-api.version>2.0.1.Final</validation-api.version>
256256
<jta.version>1.1</jta.version>
257-
<hibernate-validator.version>7.0.2.Final</hibernate-validator.version>
257+
<hibernate-validator.version>7.0.5.Final</hibernate-validator.version>
258258
<htmlcompressor.version>1.5.2</htmlcompressor.version>
259-
<closure-compiler.version>v20220202</closure-compiler.version>
259+
<closure-compiler.version>v20220502</closure-compiler.version>
260260
<ibatis2-sqlmap.version>2.1.7.597</ibatis2-sqlmap.version>
261261
<jts.version>1.13</jts.version>
262-
<gson.version>2.10.1</gson.version>
262+
<gson.version>2.11.0</gson.version>
263263
<wicket-bootstrap-core.version>2.0.15</wicket-bootstrap-core.version>
264-
<jasperreports.version>6.20.4</jasperreports.version>
265-
<bcprov.version>1.67</bcprov.version>
266-
<joda-time.version>2.12.5</joda-time.version>
264+
<jasperreports.version>6.21.3</jasperreports.version>
265+
<bcprov.version>1.78.1</bcprov.version>
266+
<joda-time.version>2.12.7</joda-time.version>
267267
<ehcache.version>3.10.8</ehcache.version>
268-
<commons-dbcp2.version>2.9.0</commons-dbcp2.version>
268+
<commons-dbcp2.version>2.12.0</commons-dbcp2.version>
269269
<javaee-api.version>6.0</javaee-api.version>
270-
<clojure.version>1.11.1</clojure.version>
271-
<groovy.version>3.0.17</groovy.version>
272-
<asm-util.version>9.2</asm-util.version>
273-
<hsqldb.version>2.7.1</hsqldb.version>
270+
<clojure.version>1.11.3</clojure.version>
271+
<groovy.version>3.0.21</groovy.version>
272+
<asm-util.version>9.7</asm-util.version>
273+
<hsqldb.version>2.7.3</hsqldb.version>
274274
<jython-standalone.version>2.7.3</jython-standalone.version>
275275
<!-- plugins -->
276-
<maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
277-
<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
278-
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
279-
<maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
280-
<maven-assembly-plugin.version>3.5.0</maven-assembly-plugin.version>
281-
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
276+
<maven-surefire-plugin.version>3.3.0</maven-surefire-plugin.version>
277+
<maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
278+
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
279+
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
280+
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
281+
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
282282
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
283-
<maven-help-plugin.version>3.4.0</maven-help-plugin.version>
284-
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
283+
<maven-help-plugin.version>3.4.1</maven-help-plugin.version>
284+
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
285285
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
286286
<animal-sniffer-maven-plugin.version>1.23</animal-sniffer-maven-plugin.version>
287287
<maven-pax-plugin.version>1.6.0</maven-pax-plugin.version>
288-
<scala-maven-plugin.version>4.4.1</scala-maven-plugin.version>
289-
<maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
290-
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
291-
<maven-install-plugin.version>3.1.1</maven-install-plugin.version>
292-
<maven-site-plugin.version>3.9.1</maven-site-plugin.version>
293-
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
294-
<maven-release-plugin.version>3.0.0</maven-release-plugin.version>
288+
<scala-maven-plugin.version>4.9.1</scala-maven-plugin.version>
289+
<maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
290+
<maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
291+
<maven-install-plugin.version>3.1.2</maven-install-plugin.version>
292+
<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
293+
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
294+
<maven-release-plugin.version>3.1.0</maven-release-plugin.version>
295295
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
296-
<maven-pmd-plugin.version>3.20.0</maven-pmd-plugin.version>
296+
<maven-pmd-plugin.version>3.23.0</maven-pmd-plugin.version>
297297
</properties>
298298

299299
<prerequisites>

‎portlet-parent/wicketstuff-portlet/pom.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,6 @@
5757
</resource>
5858
</resources>
5959
<plugins>
60-
<plugin>
61-
<groupId>org.apache.maven.plugins</groupId>
62-
<artifactId>maven-source-plugin</artifactId>
63-
<executions>
64-
<execution>
65-
<id>attach-sources</id>
66-
<goals>
67-
<goal>jar</goal>
68-
</goals>
69-
</execution>
70-
</executions>
71-
</plugin>
72-
7360
<plugin>
7461
<groupId>org.apache.maven.plugins</groupId>
7562
<artifactId>maven-eclipse-plugin</artifactId>

‎wicketstuff-datetime-yui-parent/wicketstuff-datetime-yui-examples/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
</license>
3737
</licenses>
3838
<properties>
39-
<junit.version>4.12</junit.version>
4039
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4140
<!-- allowed values: R7, 1.0, 1.5, 2.0 or none -->
4241
<wtp.version>none</wtp.version>

‎wicketstuff-logback-parent/wicketstuff-logback/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
</description>
2121

2222
<dependencies>
23+
<dependency>
24+
<groupId>org.slf4j</groupId>
25+
<artifactId>slf4j-api</artifactId>
26+
<!-- need to override core defined runtime scope -->
27+
</dependency>
2328
<dependency>
2429
<groupId>ch.qos.logback</groupId>
2530
<artifactId>logback-classic</artifactId>

‎wicketstuff-logback-parent/wicketstuff-logback/src/main/java/org/wicketstuff/logback/LogbackConfigListener.java‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,20 @@
2727
import ch.qos.logback.classic.LoggerContext;
2828
import ch.qos.logback.classic.joran.JoranConfigurator;
2929
import ch.qos.logback.core.joran.spi.JoranException;
30+
import ch.qos.logback.core.spi.ScanException;
3031
import ch.qos.logback.core.util.OptionHelper;
3132
import ch.qos.logback.core.util.StatusPrinter;
3233

3334
/**
3435
* <p>
3536
* {@link ServletContextListener} that can be used in web applications to define the location of the
3637
* logback configuration and optionally to inject the context path into the properties of logback
37-
*
38+
*
3839
* <p>
3940
* Should be the first listener to configure logback before using it. Location is defined in the
4041
* <code>logbackConfigLocation</code> context param. Snippet from web.xml:
4142
* </p>
42-
*
43+
*
4344
* <pre>
4445
* <code>
4546
* {@literal
@@ -48,13 +49,13 @@
4849
* <param-name>logbackConfigLocation</param-name>
4950
* <param-value>/WEB-INF/log-sc.xml</param-value>
5051
* </context-param>
51-
*
52+
*
5253
* <!-- optional, needed if config wants to use the context path -->
5354
* <context-param>
5455
* <param-name>logbackConfigContextPathKey</param-name>
5556
* <param-value>contextPath</param-value>
5657
* </context-param>
57-
*
58+
*
5859
* <!-- mandatory, applies custom config location based on the value of
5960
* logbackConfigLocation -->
6061
* <listener>
@@ -63,13 +64,13 @@
6364
* }
6465
* </code>
6566
* </pre>
66-
*
67+
*
6768
* <p>
6869
* The above means that logback will be configured using the <code>/WEB-INF/log-sc.xml</code>
6970
* servlet context resource and <code>${contextPath}</code> can be used in the logback config as a
7071
* placeholder for the webapp's context path.
7172
* </p>
72-
*
73+
*
7374
* <p>
7475
* Placeholders (ex: ${user.home}) in <code>logbackConfigLocation</code> are supported. Location
7576
* examples:<br />
@@ -80,7 +81,7 @@
8081
* <code>log-relfile.xml</code> (is a relative file path) -> loaded as file relative to the servlet
8182
* container working directory
8283
* </p>
83-
*
84+
*
8485
* @author akiraly
8586
*/
8687
public class LogbackConfigListener implements ServletContextListener
@@ -126,7 +127,7 @@ public void contextInitialized(ServletContextEvent sce)
126127

127128
/**
128129
* Configures logback with the custom config location specified in the web.xml.
129-
*
130+
*
130131
* @param sc
131132
* represents the webapp, not null
132133
* @param lc
@@ -140,8 +141,13 @@ protected void applyConfigLocation(ServletContext sc, LoggerContext lc)
140141

141142
String location = rawLocation;
142143

143-
if (location != null)
144-
location = OptionHelper.substVars(location, lc);
144+
if (location != null) {
145+
try {
146+
location = OptionHelper.substVars(location, lc);
147+
} catch (ScanException e) {
148+
sc.log("Unexpected ScanException", e);
149+
}
150+
}
145151

146152
if (location == null)
147153
{
@@ -176,7 +182,7 @@ protected void applyConfigLocation(ServletContext sc, LoggerContext lc)
176182

177183
/**
178184
* Reconfigures logback to use the config from the specified url.
179-
*
185+
*
180186
* @param sc
181187
* represents the webapp, not null
182188
* @param lc
@@ -213,7 +219,7 @@ protected void configureConfig(ServletContext sc, LoggerContext lc, URL location
213219
/**
214220
* Returns a normalized context path for the webapp. For the root webapp (context path ""),
215221
* {@link #CONTEXT_PATH_ROOT_VAL} is returned.
216-
*
222+
*
217223
* @param sc
218224
* represents the webapp, not null
219225
* @return normalized context path, not null, not empty
@@ -233,7 +239,7 @@ protected String getContextPath(ServletContext sc)
233239

234240
/**
235241
* Converts the passed in location String to an URL.
236-
*
242+
*
237243
* @param sc
238244
* represents the webapp, not null
239245
* @param location

0 commit comments

Comments
 (0)