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:40 UTC
[05/10] wicket git commit: Fixed problems with arquillian
Fixed problems with arquillian
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f769b694
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f769b694
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f769b694
Branch: refs/heads/master
Commit: f769b6942a46a8bfcebf7aa90e8ca8d980b27041
Parents: bd19e3b
Author: Andrea Del Bene <an...@gmail.com>
Authored: Sun May 13 22:52:06 2018 +0200
Committer: Andrea Del Bene <an...@gmail.com>
Committed: Mon May 21 20:42:49 2018 +0200
----------------------------------------------------------------------
pom.xml | 4 +--
testing/wicket-arquillian/pom.xml | 51 ++++++++++++++++++++++++----------
2 files changed, 38 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f769b694/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4ce4246..ae13528 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
<servlet-api.version>3.1.0</servlet-api.version>
<maven.javadoc.version>2.10.4</maven.javadoc.version>
<maven.surefire.version>2.20</maven.surefire.version>
- <mockito.version>2.9.0</mockito.version>
+ <mockito.version>2.18.3</mockito.version>
<slf4j.version>1.7.25</slf4j.version>
<logback.version>1.2.3</logback.version>
<hamcrest.version>2.0.0.0</hamcrest.version>
@@ -969,7 +969,7 @@
<includes>
<include>**/*Test.java</include>
</includes>
- <argLine>--add-opens java.base/jdk.internal.loader=ALL-UNNAMED</argLine>
+ <argLine>--add-opens java.base/jdk.internal.loader=ALL-UNNAMED --add-modules=ALL-SYSTEM</argLine>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f769b694/testing/wicket-arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml
index 954dd62..b3d5de0 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -15,7 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -45,7 +47,7 @@
<arquillian.version>1.4.0.Final</arquillian.version>
<maven.dependency.plugin.version>2.10</maven.dependency.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <wildfly.version>8.2.1.Final</wildfly.version>
+ <wildfly.version>11.0.0.Final</wildfly.version>
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
<jee.spec.version>1.1.0.Final</jee.spec.version>
</properties>
@@ -77,21 +79,27 @@
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
- <artifactId>wildfly-arquillian-container-embedded</artifactId>
+ <artifactId>wildfly-weld</artifactId>
<version>${wildfly.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>sun.jdk</groupId>
+ <artifactId>jconsole</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-embedded</artifactId>
- <version>${wildfly.version}</version>
- <exclusions>
- <exclusion>
- <groupId>sun.jdk</groupId>
- <artifactId>jconsole</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.wildfly.arquillian</groupId>
+ <artifactId>wildfly-arquillian-container-embedded</artifactId>
+ <version>2.1.0.Final</version>
+ <scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.arquillian.protocol</groupId>
+ <artifactId>arquillian-protocol-servlet</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
@@ -107,7 +115,7 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
@@ -117,11 +125,12 @@
<artifactId>shrinkwrap-resolver-spi</artifactId>
</dependency>
+
</dependencies>
<build>
<resources>
- <resource>
+ <resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
@@ -198,6 +207,18 @@
</plugin>
</plugins>
</build>
-
+ <repositories>
+ <repository>
+ <id>Apache Nexus</id>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
</project>