You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2015/07/31 18:18:24 UTC
wicket git commit: Satisfied the POM enforcer for Wicket 7.x
Repository: wicket
Updated Branches:
refs/heads/master 20a7dc3d2 -> 23955214b
Satisfied the POM enforcer for Wicket 7.x
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/23955214
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/23955214
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/23955214
Branch: refs/heads/master
Commit: 23955214bf30a0ab3c5f0bd74ee54f0ed643c906
Parents: 20a7dc3
Author: Martijn Dashorst <ma...@gmail.com>
Authored: Fri Jul 31 18:20:29 2015 +0200
Committer: Martijn Dashorst <ma...@gmail.com>
Committed: Fri Jul 31 18:20:29 2015 +0200
----------------------------------------------------------------------
pom.xml | 16 +-
testing/wicket-arquillian/pom.xml | 287 ++++++++++++---------
wicket-core/pom.xml | 16 +-
wicket-experimental/wicket-atmosphere/pom.xml | 1 -
wicket-ioc/pom.xml | 16 +-
wicket-user-guide/pom.xml | 16 ++
6 files changed, 206 insertions(+), 146 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/23955214/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b0ef9b0..785e276 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,11 +223,6 @@
<version>4.0</version>
</dependency>
<dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- <version>${objenesis.version}</version>
- </dependency>
- <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.1</version>
@@ -414,6 +409,11 @@
<version>2.2.4.Final</version>
</dependency>
<dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>${objenesis.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>5.0.3</version>
@@ -480,6 +480,12 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>${hamcrest.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-junit</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/wicket/blob/23955214/testing/wicket-arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml
index d8f8cc7..e5f22f9 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -30,13 +30,6 @@
<packaging>war</packaging>
<name>Wicket Arquillian Testing</name>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <distribution>repo</distribution>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- </license>
- </licenses>
<description>
A sample JAVA EE 6 project demonstrating how to use Arquillian with Wicket Framework deployed on JBoss WildFly managed downloaded from maven repository (NEXUS for example) and unpacked with dependency plugin.
@@ -61,39 +54,6 @@
<dependencyManagement>
<dependencies>
- <!-- JBoss distributes a complete set of Java EE 6 APIs including a Bill
- of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection)
- of artifacts. We use this here so that we always get the correct versions
- of artifacts. Here we use the jboss-javaee-6.0-with-tools stack (you can
- read this as the JBoss stack of the Java EE 6 APIs, with some extras tools
- for your project, such as Arquillian for testing) and the jboss-javaee-6.0-with-hibernate
- stack you can read this as the JBoss stack of the Java EE 6 APIs, with extras
- from the Hibernate family of projects) -->
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <version>${version.jboss.spec.javaee.6.0}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
- <!-- Arquillian -->
- <!-- Override dependency resolver with latest version. This must go *BEFORE*
- the Arquillian BOM. -->
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-bom</artifactId>
- <version>${version.shrinkwrap.resolvers}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-bom</artifactId>
- <version>${version.arquillian_core}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-impl-base</artifactId>
@@ -106,11 +66,74 @@
<version>${version.arquillian_core}</version>
<classifier>tests</classifier>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.1.4.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling</artifactId>
+ <version>1.4.9.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling-river</artifactId>
+ <version>1.4.9.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ <version>4.0.6.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-api</artifactId>
+ <version>3.3.0.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-nio</artifactId>
+ <version>3.3.0.Final</version>
+ </dependency>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<version>${version.wildfly_8}</version>
</dependency>
+ <!-- Arquillian -->
+ <!-- Override dependency resolver with latest version. This must go *BEFORE*
+ the Arquillian BOM. -->
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-bom</artifactId>
+ <version>${version.arquillian_core}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-bom</artifactId>
+ <version>${version.shrinkwrap.resolvers}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <!-- JBoss distributes a complete set of Java EE 6 APIs including a Bill
+ of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection)
+ of artifacts. We use this here so that we always get the correct versions
+ of artifacts. Here we use the jboss-javaee-6.0-with-tools stack (you can
+ read this as the JBoss stack of the Java EE 6 APIs, with some extras tools
+ for your project, such as Arquillian for testing) and the jboss-javaee-6.0-with-hibernate
+ stack you can read this as the JBoss stack of the Java EE 6 APIs, with extras
+ from the Hibernate family of projects) -->
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-6.0</artifactId>
+ <version>${version.jboss.spec.javaee.6.0}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -126,6 +149,13 @@
<scope>provided</scope>
</dependency>
+ <!-- Import the JPA API. -->
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Import the Common Annotations API (JSR-250). -->
<dependency>
<groupId>org.jboss.spec.javax.annotation</groupId>
@@ -140,17 +170,10 @@
<scope>provided</scope>
</dependency>
- <!-- Import the JPA API. -->
- <dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Servlet -->
+ <!-- Wicket CDI integration. -->
<dependency>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-cdi</artifactId>
</dependency>
<!-- Wicket -->
@@ -159,39 +182,29 @@
<artifactId>wicket-core</artifactId>
</dependency>
- <!-- Wicket CDI integration. -->
+ <!-- Servlet -->
<dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-cdi</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
- <!-- Shrinkwrap -->
+ <!-- JUnit -->
<dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-depchain</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
- <type>pom</type>
</dependency>
<!-- Arquillian -->
<dependency>
- <groupId>org.jboss.arquillian.core</groupId>
- <artifactId>arquillian-core-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.core</groupId>
- <artifactId>arquillian-core-spi</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.test</groupId>
- <artifactId>arquillian-test-spi</artifactId>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-container-spi</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-container-spi</artifactId>
+ <artifactId>arquillian-container-test-impl-base</artifactId>
+ <classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
@@ -200,20 +213,24 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
+ <groupId>org.jboss.arquillian.core</groupId>
+ <artifactId>arquillian-core-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-container-test-impl-base</artifactId>
+ <groupId>org.jboss.arquillian.core</groupId>
+ <artifactId>arquillian-core-impl-base</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.core</groupId>
- <artifactId>arquillian-core-impl-base</artifactId>
- <classifier>tests</classifier>
+ <artifactId>arquillian-core-spi</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -221,12 +238,18 @@
<artifactId>arquillian-protocol-servlet</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.test</groupId>
+ <artifactId>arquillian-test-spi</artifactId>
+ <scope>test</scope>
+ </dependency>
- <!-- JUnit -->
+ <!-- Shrinkwrap -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-depchain</artifactId>
<scope>test</scope>
+ <type>pom</type>
</dependency>
<!-- Wildfly managed. -->
@@ -246,55 +269,71 @@
</testResources>
<!-- Set the name of the war, used as the context root when the app is deployed. -->
<finalName>${project.artifactId}</finalName>
- <plugins>
- <!-- WildFly plugin to deploy the war -->
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-dist</artifactId>
+ <version>${version.wildfly_8}</version>
+ <type>zip</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <environmentVariables>
+ <JBOSS_HOME>${project.build.directory}/wildfly-${version.wildfly_8}</JBOSS_HOME>
+ </environmentVariables>
+ <systemProperties>
+ <jboss.version>${version.wildfly_8}</jboss.version>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <!-- WildFly plugin to deploy the war -->
+ <plugin>
+ <groupId>org.wildfly.plugins</groupId>
+ <artifactId>wildfly-maven-plugin</artifactId>
+ <version>${version.wildfly.maven.plugin}</version>
+ <configuration>
+ <filename>target/${project.build.finalName}.war</filename>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
<plugin>
- <groupId>org.wildfly.plugins</groupId>
- <artifactId>wildfly-maven-plugin</artifactId>
- <version>${version.wildfly.maven.plugin}</version>
- <configuration>
- <filename>target/${project.build.finalName}.war</filename>
- </configuration>
- </plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <environmentVariables>
- <JBOSS_HOME>${project.build.directory}/wildfly-${version.wildfly_8}</JBOSS_HOME>
- </environmentVariables>
- <systemProperties>
- <jboss.version>${version.wildfly_8}</jboss.version>
- </systemProperties>
- </configuration>
- </plugin>
+ </plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-dist</artifactId>
- <version>${version.wildfly_8}</version>
- <type>zip</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <groupId>org.wildfly.plugins</groupId>
+ <artifactId>wildfly-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
-
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/23955214/wicket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index a88a718..cccd9b9 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -43,14 +43,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
</dependency>
@@ -58,6 +50,14 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ </dependency>
</dependencies>
<build>
<pluginManagement>
http://git-wip-us.apache.org/repos/asf/wicket/blob/23955214/wicket-experimental/wicket-atmosphere/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/pom.xml b/wicket-experimental/wicket-atmosphere/pom.xml
index 73f2c2f..6573680 100644
--- a/wicket-experimental/wicket-atmosphere/pom.xml
+++ b/wicket-experimental/wicket-atmosphere/pom.xml
@@ -79,7 +79,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
</dependency>
<dependency>
<groupId>de.agilecoders.wicket.webjars</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/23955214/wicket-ioc/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml
index 8a2f664..35eba31 100644
--- a/wicket-ioc/pom.xml
+++ b/wicket-ioc/pom.xml
@@ -45,21 +45,21 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/23955214/wicket-user-guide/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-user-guide/pom.xml b/wicket-user-guide/pom.xml
index 57345a9..1bd04e5 100644
--- a/wicket-user-guide/pom.xml
+++ b/wicket-user-guide/pom.xml
@@ -114,6 +114,22 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4</version>
+ <inherited>false</inherited>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>com.github.ferstl</groupId>
+ <artifactId>pedantic-pom-enforcers</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- Just documentation, no sources -->