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/09/05 18:35:14 UTC
wicket git commit: Fix ridiculous maven-enforcer-plugin rules which
came with the update to org.apache:apache:21 parent pom
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x b50edd3b1 -> 7f328774c
Fix ridiculous maven-enforcer-plugin rules which came with the update to org.apache:apache:21 parent pom
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7f328774
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7f328774
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7f328774
Branch: refs/heads/wicket-7.x
Commit: 7f328774c17e1655a964129d236ae2bcfbd458e0
Parents: b50edd3
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Sep 5 21:34:31 2018 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 5 21:34:31 2018 +0300
----------------------------------------------------------------------
archetypes/quickstart/pom.xml | 20 +++++---
pom.xml | 27 +++++-----
testing/wicket-arquillian/pom.xml | 65 ++++++++++++++++---------
wicket-experimental/wicket-metrics/pom.xml | 8 +--
wicket-request/pom.xml | 8 +--
5 files changed, 79 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7f328774/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml
index 4d6c7e8..e678b60 100644
--- a/archetypes/quickstart/pom.xml
+++ b/archetypes/quickstart/pom.xml
@@ -58,13 +58,21 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <useDefaultDelimiters>false</useDefaultDelimiters>
- <delimiters>
- <delimiter>@</delimiter>
- </delimiters>
- </configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>@</delimiter>
+ </delimiters>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/7f328774/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 66f1b4b..869e9c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,6 +240,11 @@
<version>0.5.4</version>
</dependency>
<dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <version>${metrics.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
@@ -401,14 +406,20 @@
</dependency>
<dependency>
<groupId>org.apache.wicket.experimental.wicket7</groupId>
+ <artifactId>wicket-atmosphere</artifactId>
+ <version>0.34-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket.experimental.wicket7</groupId>
<artifactId>wicket-metrics</artifactId>
<version>0.9-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.wicket.experimental.wicket7</groupId>
- <artifactId>wicket-atmosphere</artifactId>
- <version>0.34-SNAPSHOT</version>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>${aspectj.version}</version>
<type>jar</type>
</dependency>
<dependency>
@@ -539,16 +550,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>${aspectj.version}</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>${metrics.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/7f328774/testing/wicket-arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml
index b0bd49a..bfdc64b 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -54,6 +54,23 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-7.0</artifactId>
+ <version>${jee.spec.version}</version>
+ <type>pom</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-arquillian-container-embedded</artifactId>
+ <version>${wildfly.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-embedded</artifactId>
+ <version>${wildfly.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${arquillian.version}</version>
@@ -67,29 +84,7 @@
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-7.0</artifactId>
- <version>${jee.spec.version}</version>
<type>pom</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-arquillian-container-embedded</artifactId>
- <version>${wildfly.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-embedded</artifactId>
- <version>${wildfly.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <scope>test</scope>
</dependency>
<!-- Wicket CDI integration. -->
<dependency>
@@ -111,7 +106,26 @@
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-spi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-arquillian-container-embedded</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-embedded</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -125,6 +139,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>${maven.dependency.plugin.version}</version>
<executions>
http://git-wip-us.apache.org/repos/asf/wicket/blob/7f328774/wicket-experimental/wicket-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-metrics/pom.xml b/wicket-experimental/wicket-metrics/pom.xml
index 91e2a54..5696c01 100644
--- a/wicket-experimental/wicket-metrics/pom.xml
+++ b/wicket-experimental/wicket-metrics/pom.xml
@@ -33,8 +33,8 @@
</description>
<dependencies>
<dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
@@ -46,8 +46,8 @@
<artifactId>metrics-core</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/7f328774/wicket-request/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-request/pom.xml b/wicket-request/pom.xml
index 40f88d0..1f52dca 100755
--- a/wicket-request/pom.xml
+++ b/wicket-request/pom.xml
@@ -27,12 +27,12 @@
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ </dependency>
</dependencies>
</project>