You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2018/05/21 18:50:42 UTC
[07/10] wicket git commit: Fix to resolve Arquillian dependencies
online
Fix to resolve Arquillian dependencies online
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/da0aa1aa
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/da0aa1aa
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/da0aa1aa
Branch: refs/heads/master
Commit: da0aa1aaab62ff813f084d947ab98b31b3724266
Parents: 16d010c
Author: Andrea Del Bene <an...@edenviaggi.it>
Authored: Mon May 14 17:37:46 2018 +0200
Committer: Andrea Del Bene <an...@gmail.com>
Committed: Mon May 21 20:43:02 2018 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
.../arquillian/testing/deployment/AbstractDeploymentTest.java | 3 +--
wicket-examples/pom.xml | 7 +------
3 files changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/da0aa1aa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ae13528..cd6f3aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<!-- Project Versions -->
<cglib.version>3.2.5</cglib.version>
<jacoco.version>0.7.9</jacoco.version>
- <jetty.version>9.4.7.v20170914</jetty.version>
+ <jetty.version>9.4.10.v20180503</jetty.version>
<joda-time.version>2.9.9</joda-time.version>
<junit.version>4.12</junit.version>
<spring.version>4.3.10.RELEASE</spring.version>
http://git-wip-us.apache.org/repos/asf/wicket/blob/da0aa1aa/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
index 7a3e1a2..cb3c3eb 100644
--- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
+++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
@@ -73,8 +73,7 @@ public abstract class AbstractDeploymentTest {
// Create libs from POM.XML.
File[] asFile = Maven.configureResolver()
- // I'm not using internet directly, I have a Nexus Repository that handles the libs for me.
- .workOffline().withMavenCentralRepo(false)
+ .withMavenCentralRepo(true)
// Load everything from pom, that is compile and runtime, as a file and transitivity to don't loose anything and cause exceptions.
.loadPomFromFile("./pom.xml").importCompileAndRuntimeDependencies()
.resolve().withTransitivity().asFile();
http://git-wip-us.apache.org/repos/asf/wicket/blob/da0aa1aa/wicket-examples/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index 6e1aa5e..856373f 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -56,12 +56,7 @@
<groupId>org.codelibs</groupId>
<artifactId>jhighlight</artifactId>
<version>1.0.3</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
+
</dependency>
<dependency>
<groupId>org.hibernate</groupId>