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 2012/05/17 20:40:15 UTC
[2/2] git commit: Make poms release-plugin compatible
Make poms release-plugin compatible
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d64a24c0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d64a24c0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d64a24c0
Branch: refs/heads/master
Commit: d64a24c0ded4c85d1e621dcb4c95fb1e000e24b5
Parents: 11037c4
Author: Martijn Dashorst <da...@apache.org>
Authored: Thu May 10 11:18:22 2012 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Thu May 17 20:39:52 2012 +0200
----------------------------------------------------------------------
pom.xml | 29 ++++++++++++++---------------
wicket-experimental/pom.xml | 3 ---
2 files changed, 14 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d64a24c0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cc6f4d2..7fbff65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,6 @@
<spring.version>3.0.6.RELEASE</spring.version>
<maven.javadoc.version>2.8</maven.javadoc.version>
<maven.surefire.version>2.11</maven.surefire.version>
- <wicket.version>${project.version}</wicket.version>
</properties>
<modules>
<module>wicket</module>
@@ -197,7 +196,7 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
- <version>${wicket.version}</version>
+ <version>6.0-SNAPSHOT</version>
<!-- It seems there is a bug in Maven (2.2.1 & 3.0.1) and
type 'pom' is not properly inherited. I.e. the
dependency management doesn't work -->
@@ -206,73 +205,73 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
- <version>${wicket.version}</version>
+ <version>6.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-devutils</artifactId>
- <version>${wicket.version}</version>
+ <version>6.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
- <version>${wicket.version}</version>
+ <version>6.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
- <version>${wicket.version}</version>
+ <version>6.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
- <version>${wicket.version}</version>
+ <version>6.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-guice</artifactId>
- <version>${wicket.version}</version>
+ <version>6.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-ioc</artifactId>
- <version>${wicket.version}</version>
+ <version>6.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-jmx</artifactId>
- <version>${wicket.version}</version>
+ <version>6.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
- <version>${wicket.version}</version>
+ <version>6.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
- <version>${wicket.version}</version>
+ <version>6.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-datetime</artifactId>
- <version>${wicket.version}</version>
+ <version>6.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-velocity</artifactId>
- <version>${wicket.version}</version>
+ <version>6.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
@@ -581,7 +580,7 @@
<descriptors>
<descriptor>wicket-assembly-all.xml</descriptor>
</descriptors>
- <finalName>apache-wicket-${wicket.version}</finalName>
+ <finalName>apache-wicket-6.0-SNAPSHOT</finalName>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d64a24c0/wicket-experimental/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/pom.xml b/wicket-experimental/pom.xml
index bd94ac8..4658bc8 100644
--- a/wicket-experimental/pom.xml
+++ b/wicket-experimental/pom.xml
@@ -27,9 +27,6 @@
<packaging>pom</packaging>
<name>Wicket-Experimental</name>
<description>Wicket-Experimental contains experimental Wicket modules that may or may not be supported in the future.</description>
- <properties>
- <wicket.version>6.0-SNAPSHOT</wicket.version>
- </properties>
<modules>
<module>wicket-atmosphere</module>
</modules>