updated pom.xml with new junit dependency
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0465d2c0 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0465d2c0 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0465d2c0 Branch: refs/heads/WICKET-6563 Commit: 0465d2c01df6f3b20069b77d863d27e43f9d2911 Parents: 694ee32 Author: renoth <johannes.ren...@gmx.de> Authored: Sat Sep 1 07:52:38 2018 +0200 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Wed Sep 26 16:14:30 2018 +0300 ---------------------------------------------------------------------- testing/wicket-arquillian/pom.xml | 8 +- .../deployment/AbstractDeploymentTest.java | 5 +- wicket-cdi-1.1/pom.xml | 98 ++++++++++++++++++++ 3 files changed, 104 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/0465d2c0/testing/wicket-arquillian/pom.xml ---------------------------------------------------------------------- diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml index 13023a6..2190f5c 100644 --- a/testing/wicket-arquillian/pom.xml +++ b/testing/wicket-arquillian/pom.xml @@ -164,10 +164,10 @@ <groupId>org.wildfly</groupId> <artifactId>wildfly-weld</artifactId> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + </dependency> <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> http://git-wip-us.apache.org/repos/asf/wicket/blob/0465d2c0/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 52b9014..d5ad762 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 @@ -58,9 +58,8 @@ import org.slf4j.LoggerFactory; * */ @Tag(WicketTestTag.SLOW) -public abstract class AbstractDeploymentTest -{ - +public abstract class AbstractDeploymentTest { + private static final Logger log = LoggerFactory.getLogger(AbstractDeploymentTest.class); private static final String WEBAPP_SRC = "src/main/webapp"; http://git-wip-us.apache.org/repos/asf/wicket/blob/0465d2c0/wicket-cdi-1.1/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-cdi-1.1/pom.xml b/wicket-cdi-1.1/pom.xml new file mode 100644 index 0000000..6860248 --- /dev/null +++ b/wicket-cdi-1.1/pom.xml @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + 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";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-parent</artifactId> + <version>9.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>wicket-cdi-1.1</artifactId> + <packaging>bundle</packaging> + <name>Wicket CDI 1.1</name> + <description> + Provides integration between Wicket and CDI containers. Enables injection of + components and behaviors, as well as other non-contextual object instances. + Also enables propagation of conversations between wicket artifacts such as pages + and resources. + </description> + <dependencyManagement> + <dependencies> + <!-- local management because we can only define one GAV in the parent --> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-core</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.weld.module</groupId> + <artifactId>weld-web</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.weld.se</groupId> + <artifactId>weld-se</artifactId> + </dependency> + <dependency> + <groupId>org.jglue.cdi-unit</groupId> + <artifactId>cdi-unit</artifactId> + </dependency> + </dependencies> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> +</project>
