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 2015/06/24 14:58:08 UTC
[02/50] [abbrv] wicket git commit: Fix Maven enforcer errors
Fix Maven enforcer errors
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6edfc1a5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6edfc1a5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6edfc1a5
Branch: refs/heads/master
Commit: 6edfc1a55bdf65095ac3857267303b09b484d0f3
Parents: 654a3f7
Author: Martijn Dashorst <da...@apache.org>
Authored: Fri Jun 12 13:52:36 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jun 24 14:56:32 2015 +0300
----------------------------------------------------------------------
pom.xml | 10 +++---
wicket-core/pom.xml | 18 +++++++---
wicket-examples/pom.xml | 10 +++---
wicket-jmx/pom.xml | 8 ++---
wicket-user-guide/pom.xml | 75 ++++++++++++++++++++++++------------------
5 files changed, 70 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6edfc1a5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8537a63..637854c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -263,11 +263,6 @@
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-eclipse-settings</artifactId>
- <version>2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
<version>7.0.0-SNAPSHOT</version>
<!-- It seems there is a bug in Maven (2.2.1 & 3.0.1) and
@@ -319,6 +314,11 @@
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-eclipse-settings</artifactId>
+ <version>2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
<version>7.0.0-SNAPSHOT</version>
<type>jar</type>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6edfc1a5/wicket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index bf6006d..3b88940 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -68,15 +68,23 @@
</dependency>
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/jquery*.js</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/jquery*.js</exclude>
- </excludes>
- </configuration>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6edfc1a5/wicket-examples/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index c184b27..e7eb538 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -97,6 +97,11 @@
<artifactId>jhighlight</artifactId>
</dependency>
<dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -158,11 +163,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6edfc1a5/wicket-jmx/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-jmx/pom.xml b/wicket-jmx/pom.xml
index 7efc48b..ca35450 100644
--- a/wicket-jmx/pom.xml
+++ b/wicket-jmx/pom.xml
@@ -33,12 +33,12 @@
<artifactId>cglib</artifactId>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-util</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/6edfc1a5/wicket-user-guide/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-user-guide/pom.xml b/wicket-user-guide/pom.xml
index 5829954..50f6e97 100644
--- a/wicket-user-guide/pom.xml
+++ b/wicket-user-guide/pom.xml
@@ -30,28 +30,52 @@
<description>
Provides the user guide of wicket
</description>
-
+ <repositories>
+ <repository>
+ <id>grails</id>
+ <name>grails</name>
+ <url>http://repo.grails.org/grails/core</url>
+ </repository>
+ <repository>
+ <id>grails-plugins</id>
+ <name>grails-plugins</name>
+ <url>http://repo.grails.org/grails/plugins</url>
+ </repository>
+ </repositories>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.grails</groupId>
+ <artifactId>grails-dependencies</artifactId>
+ <version>${grails.version}</version>
+ <type>pom</type>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.grails</groupId>
+ <artifactId>grails-plugin-log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.grails</groupId>
+ <artifactId>grails-docs</artifactId>
+ <version>${grails.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.grails</groupId>
<artifactId>grails-dependencies</artifactId>
- <version>${grails.version}</version>
<type>pom</type>
- <exclusions>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>grails-plugin-log4j</artifactId>
- <groupId>org.grails</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.grails</groupId>
<artifactId>grails-docs</artifactId>
- <version>${grails.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -63,19 +87,6 @@
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>grails</id>
- <name>grails</name>
- <url>http://repo.grails.org/grails/core</url>
- </repository>
- <repository>
- <id>grails-plugins</id>
- <name>grails-plugins</name>
- <url>http://repo.grails.org/grails/plugins</url>
- </repository>
- </repositories>
-
<build>
<plugins>
<plugin>
@@ -84,11 +95,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
+ <artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
+ <artifactId>maven-source-plugin</artifactId>
</plugin>
</plugins>
<pluginManagement>
@@ -103,18 +114,18 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
+ <artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- Just documentation, no sources -->
- <skipSource>true</skipSource>
+ <skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
+ <artifactId>maven-source-plugin</artifactId>
<configuration>
<!-- Just documentation, no sources -->
- <skip>true</skip>
+ <skipSource>true</skipSource>
</configuration>
</plugin>
</plugins>