You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2019/02/24 00:31:58 UTC
[wicket] branch master updated: Update Spring to 5.1.5
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 fd4b583 Update Spring to 5.1.5
fd4b583 is described below
commit fd4b58376e6bbab72fa97bd6c6609942808035cf
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Sun Feb 24 02:31:03 2019 +0200
Update Spring to 5.1.5
and Hamcrest to 2.1 - this uncovered a transitive dependency to junit:4.12
---
pom.xml | 6 +++---
wicket-core/pom.xml | 2 +-
.../apache/wicket/page/AsyncPageStoreManagerTest.java | 16 +++++++++-------
.../org/apache/wicket/protocol/http/WebSessionTest.java | 4 ++--
4 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index b06fe0e..fa170c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,14 +142,14 @@
<jackson.version>2.9.8</jackson.version>
<jetty.version>9.4.14.v20181114</jetty.version>
<junit.version>5.4.0</junit.version>
- <spring.version>5.1.4.RELEASE</spring.version>
+ <spring.version>5.1.5.RELEASE</spring.version>
<servlet-api.version>3.1.0</servlet-api.version>
<maven.javadoc.version>3.0.1</maven.javadoc.version>
<maven.surefire.version>2.22.1</maven.surefire.version>
<mockito.version>2.24.5</mockito.version>
<slf4j.version>1.7.26</slf4j.version>
<logback.version>1.2.3</logback.version>
- <hamcrest.version>2.0.0.0</hamcrest.version>
+ <hamcrest.version>2.1</hamcrest.version>
<objenesis.version>3.0.1</objenesis.version>
<aspectj.version>1.9.2</aspectj.version>
<metrics.version>4.0.5</metrics.version>
@@ -200,7 +200,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-junit</artifactId>
+ <artifactId>hamcrest</artifactId>
<version>${hamcrest.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index d597ab1..a1cf865 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -43,7 +43,7 @@
<dependencies>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-junit</artifactId>
+ <artifactId>hamcrest</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
diff --git a/wicket-core/src/test/java/org/apache/wicket/page/AsyncPageStoreManagerTest.java b/wicket-core/src/test/java/org/apache/wicket/page/AsyncPageStoreManagerTest.java
index d3af3bf..38df077 100644
--- a/wicket-core/src/test/java/org/apache/wicket/page/AsyncPageStoreManagerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/page/AsyncPageStoreManagerTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.page;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import org.apache.wicket.pageStore.AsynchronousPageStore;
import org.apache.wicket.pageStore.DefaultPageStore;
import org.apache.wicket.pageStore.DiskDataStore;
@@ -27,7 +30,6 @@ import org.apache.wicket.serialize.java.DeflatedJavaSerializer;
import org.apache.wicket.util.WicketTestTag;
import org.apache.wicket.util.file.File;
import org.apache.wicket.util.lang.Bytes;
-import org.junit.Assert;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.mockito.internal.util.reflection.FieldReader;
@@ -76,7 +78,7 @@ class AsyncPageStoreManagerTest
Thread.sleep(1000);
// Page should be stored on disk
- Assert.assertNotNull(dataStore.getData("dummy_id", 0));
+ assertNotNull(dataStore.getData("dummy_id", 0));
// "Stop" the PageSavingRunnable, so we can simulate a pending page
Thread t = null;
@@ -109,14 +111,14 @@ class AsyncPageStoreManagerTest
Thread.sleep(1000);
// PageSavingRunnable is not running so page should not be in the datastore
- Assert.assertNull(dataStore.getData("dummy_id", 1));
+ assertNull(dataStore.getData("dummy_id", 1));
// Session is invalidated and a clear on the PageStoreManager is called
newPageManager.clear();
// Datastore is indeed empty after the clear
- Assert.assertNull(dataStore.getData("dummy_id", 0));
- Assert.assertNull(dataStore.getData("dummy_id", 1));
+ assertNull(dataStore.getData("dummy_id", 0));
+ assertNull(dataStore.getData("dummy_id", 1));
// "Restart" the PageSavingRunnable
t.start();
@@ -127,8 +129,8 @@ class AsyncPageStoreManagerTest
// Session has been invalidated. The datastore should not contain any pages for this
// session, because they will never be cleaned! Not in the DiskDataStore.sessionEntryMap
// (OOM) and not on disk (slowly filling disk as this even survives application restarts.
- Assert.assertNull(dataStore.getData("dummy_id", 0));
- Assert.assertNull(dataStore.getData("dummy_id", 1));
+ assertNull(dataStore.getData("dummy_id", 0));
+ assertNull(dataStore.getData("dummy_id", 1));
//destroy page manager to clean static variables
newPageManager.destroy();
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java
index c4a8f97..c775d19 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.protocol.http;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.Locale;