This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new 1957907 Dependency updates
1957907 is described below
commit 195790745b3724feace410280b2a253083c977e4
Author: Martin Tzvetanov Grigorov <[email protected]>
AuthorDate: Wed Oct 28 14:54:23 2020 +0200
Dependency updates
---
pom.xml | 32 +++++++++++-----------
testing/wicket-js-tests/pom.xml | 6 ++--
.../wicket/spring/test/ApplicationContextMock.java | 10 +++++++
3 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 89f88e0..0c7cfd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,9 +131,9 @@
<maven.compiler.target>11</maven.compiler.target>
<!-- Project Versions -->
- <asm.version>8.0.1</asm.version>
- <aspectj.version>1.9.5</aspectj.version>
- <assertj-core.version>3.15.0</assertj-core.version>
+ <asm.version>9.0</asm.version>
+ <aspectj.version>1.9.6</aspectj.version>
+ <assertj-core.version>3.18.0</assertj-core.version>
<cdi-unit.version>4.1.0</cdi-unit.version>
<cglib.version>3.3.0</cglib.version>
<commons-collections.version>3.2.2</commons-collections.version>
@@ -143,8 +143,8 @@
<commons-lang3.version>3.11</commons-lang3.version>
<guice.version>4.2.3</guice.version>
<el-impl.version>2.2.1-b05</el-impl.version>
- <forbiddenapis.version>3.0.1</forbiddenapis.version>
- <jacoco.version>0.8.5</jacoco.version>
+ <forbiddenapis.version>3.1</forbiddenapis.version>
+ <jacoco.version>0.8.6</jacoco.version>
<jackson.version>2.10.5</jackson.version>
<jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
<jakarta.el.version>3.0.3</jakarta.el.version>
@@ -155,26 +155,26 @@
<jakarta.websocket-api.version>1.1.2</jakarta.websocket-api.version>
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<jdk-serializable-functional.version>1.9.0</jdk-serializable-functional.version>
- <jetty.version>9.4.31.v20200723</jetty.version>
+ <jetty.version>9.4.33.v20201020</jetty.version>
<junit.version>5.7.0</junit.version>
<jsr305.version>3.0.2</jsr305.version>
<logback.version>1.2.3</logback.version>
<hamcrest.version>2.2</hamcrest.version>
-
<hibernate-validator.version>6.1.3.Final</hibernate-validator.version>
+
<hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
<httpunit.version>1.7.3</httpunit.version>
- <metrics.version>4.1.12.1</metrics.version>
- <mockito.version>3.5.10</mockito.version>
+ <metrics.version>4.1.14</metrics.version>
+ <mockito.version>3.6.0</mockito.version>
<objenesis.version>3.1</objenesis.version>
<openjson.version>1.0.12</openjson.version>
<slf4j.version>1.7.25</slf4j.version>
- <spring.version>5.2.9.RELEASE</spring.version>
+ <spring.version>5.3.0</spring.version>
<wagon-ssh-external.version>3.3.4</wagon-ssh-external.version>
<weld.version>3.1.5.SP1</weld.version>
<velocity-engine-core.version>2.2</velocity-engine-core.version>
<!-- Maven plugins -->
<clirr-maven-plugin.version>2.8</clirr-maven-plugin.version>
-
<maven-archetype-plugin.version>3.1.2</maven-archetype-plugin.version>
+
<maven-archetype-plugin.version>3.2.0</maven-archetype-plugin.version>
<maven-bundle-plugin.version>5.1.1</maven-bundle-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
@@ -184,12 +184,12 @@
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
-
<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
+
<maven-project-info-reports-plugin.version>3.1.1</maven-project-info-reports-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-remote-resources-plugin.version>1.7.0</maven-remote-resources-plugin.version>
-
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
- <maven-site-plugin.version>3.9.0</maven-site-plugin.version>
-
<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
+
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
+ <maven-site-plugin.version>3.9.1</maven-site-plugin.version>
+
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-toolchains-plugin.version>3.0.0</maven-toolchains-plugin.version>
<maven-war-plugin.version>3.3.1</maven-war-plugin.version>
@@ -943,7 +943,7 @@
<dependency>
<groupId>com.github.ferstl</groupId>
<artifactId>pedantic-pom-enforcers</artifactId>
- <version>1.3.2</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml
index ed2ca81..cf0cba9 100644
--- a/testing/wicket-js-tests/pom.xml
+++ b/testing/wicket-js-tests/pom.xml
@@ -91,7 +91,7 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>1.10.0</version>
+ <version>1.10.3</version>
<executions>
<execution>
<id>install
node and npm</id>
@@ -100,8 +100,8 @@
</goals>
<phase>generate-resources</phase>
<configuration>
-
<npmVersion>6.10.3</npmVersion>
-
<nodeVersion>v10.16.2</nodeVersion>
+
<npmVersion>6.14.8</npmVersion>
+
<nodeVersion>v14.15.0</nodeVersion>
</configuration>
</execution>
<execution>
diff --git
a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
index 1a65fea..5d285f7 100644
---
a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
+++
b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
@@ -274,6 +274,16 @@ public class ApplicationContextMock implements
ApplicationContext, Serializable
}
@Override
+ public <T> ObjectProvider<T> getBeanProvider(final Class<T> aClass,
final boolean b) {
+ return null;
+ }
+
+ @Override
+ public <T> ObjectProvider<T> getBeanProvider(final ResolvableType
resolvableType, final boolean b) {
+ return null;
+ }
+
+ @Override
public String[] getBeanNamesForType(ResolvableType resolvableType)
{
return new String[0];