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 2018/10/18 14:27:45 UTC
[3/3] wicket git commit: WICKET-6595 Upgrade JUnit to v5.x
WICKET-6595 Upgrade JUnit to v5.x
Tidy up the Hamcrest dependencies management
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/804f5106
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/804f5106
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/804f5106
Branch: refs/heads/master
Commit: 804f5106e935ac929f14976a6a3b9bedb4f3a97e
Parents: ebdeed5
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Oct 18 17:26:55 2018 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Oct 18 17:27:37 2018 +0300
----------------------------------------------------------------------
pom.xml | 23 -----------------------
testing/wicket-js-tests/pom.xml | 8 ++++++++
wicket-core/pom.xml | 5 -----
wicket-ioc/pom.xml | 4 ----
wicket-user-guide/pom.xml | 8 ++++++++
5 files changed, 16 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/804f5106/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2213355..efc943d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,12 +185,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>${cglib.version}</version>
@@ -579,12 +573,6 @@
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</dependencyManagement>
@@ -594,10 +582,6 @@
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-junit</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -905,13 +889,6 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.version}</version>
<configuration>
- <additionalDependencies>
- <additionalDependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-junit</artifactId>
- <version>${hamcrest.version}</version>
- </additionalDependency>
- </additionalDependencies>
<minmemory>128m</minmemory>
<maxmemory>256m</maxmemory>
<quiet>true</quiet>
http://git-wip-us.apache.org/repos/asf/wicket/blob/804f5106/testing/wicket-js-tests/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml
index 627b93b..f62708d 100644
--- a/testing/wicket-js-tests/pom.xml
+++ b/testing/wicket-js-tests/pom.xml
@@ -68,6 +68,14 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- No Java tests here -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
http://git-wip-us.apache.org/repos/asf/wicket/blob/804f5106/wicket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index 0ab47f9..a3746b4 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -77,11 +77,6 @@
<artifactId>assertj-core</artifactId>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/804f5106/wicket-ioc/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml
index d557623..ae4280b 100644
--- a/wicket-ioc/pom.xml
+++ b/wicket-ioc/pom.xml
@@ -34,10 +34,6 @@
</description>
<dependencies>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-junit</artifactId>
- </dependency>
- <dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/804f5106/wicket-user-guide/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-user-guide/pom.xml b/wicket-user-guide/pom.xml
index 95f1283..4347f8e 100644
--- a/wicket-user-guide/pom.xml
+++ b/wicket-user-guide/pom.xml
@@ -173,6 +173,14 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- No Java tests here -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>