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 2016/02/05 12:06:07 UTC
[1/3] wicket git commit: Upgrade all plugin versions
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x 8003719b5 -> 1da4d2687
Upgrade all plugin versions
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1da4d268
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1da4d268
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1da4d268
Branch: refs/heads/wicket-6.x
Commit: 1da4d2687fbf19874adace33a7f4d094d5b83af4
Parents: 2d63219
Author: Martijn Dashorst <da...@apache.org>
Authored: Fri Feb 5 11:52:24 2016 +0100
Committer: Martijn Dashorst <da...@apache.org>
Committed: Fri Feb 5 12:05:58 2016 +0100
----------------------------------------------------------------------
pom.xml | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1da4d268/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3fff996..a1fdd11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<maven.javadoc.version>2.10.3</maven.javadoc.version>
- <maven.surefire.version>2.12.2</maven.surefire.version>
+ <maven.surefire.version>2.19.1</maven.surefire.version>
<!-- do not increase the version - wicket-user-guide requires 2.2.4 -->
<grails.version>2.2.4</grails.version>
</properties>
@@ -645,7 +645,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.8.2</version>
<configuration>
<retryFailedDeploymentCount>10</retryFailedDeploymentCount>
<deployAtEnd>false</deployAtEnd>
@@ -654,35 +654,35 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.5</version>
+ <version>2.5.3</version>
<inherited>true</inherited>
<configuration>
<localCheckout>true</localCheckout>
<pushChanges>false</pushChanges>
- <tagNameFormat>wicket-@{project.version}</tagNameFormat>
+ <tagNameFormat>rel/wicket-@{project.version}</tagNameFormat>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
- <version>1.8.1</version>
+ <version>1.9.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
- <version>1.8.1</version>
+ <version>1.9.4</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
+ <version>2.7</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
@@ -690,7 +690,7 @@
<dependency> <!-- remove me when maven-resources-plugin upgrades to plexus-utils:3.0.7 -->
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.7</version>
+ <version>3.0.22</version>
</dependency>
</dependencies>
</plugin>
@@ -698,7 +698,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
+ <version>3.5</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
@@ -730,7 +730,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
+ <version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -763,7 +763,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
+ <version>2.6</version>
<configuration>
<warName>${project.artifactId}</warName>
</configuration>
@@ -771,7 +771,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
<configuration>
<useDefaultManifestFile>true</useDefaultManifestFile>
<archive>
@@ -808,13 +808,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.1</version>
+ <version>3.4</version>
</plugin>
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -860,7 +860,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.3</version>
+ <version>1.5</version>
<executions>
<execution>
<goals>
@@ -878,7 +878,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
+ <version>3.0.1</version>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -900,7 +900,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
@@ -922,7 +922,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
- <version>2.6.1</version>
+ <version>2.7</version>
<configuration>
<comparisonVersion>6.0.0</comparisonVersion>
<failOnError>true</failOnError>
@@ -1006,7 +1006,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.5</version>
+ <version>2.8.1</version>
<reportSets>
<reportSet>
<reports>
[2/3] wicket git commit: Use correct ASF approved tag
Posted by da...@apache.org.
Use correct ASF approved tag
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2d63219a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2d63219a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2d63219a
Branch: refs/heads/wicket-6.x
Commit: 2d63219afb34c6b63c6700cd3d5bc2762bc9e564
Parents: 8f661e8
Author: Martijn Dashorst <da...@apache.org>
Authored: Fri Feb 5 11:32:43 2016 +0100
Committer: Martijn Dashorst <da...@apache.org>
Committed: Fri Feb 5 12:05:58 2016 +0100
----------------------------------------------------------------------
release.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/2d63219a/release.sh
----------------------------------------------------------------------
diff --git a/release.sh b/release.sh
index 05810a8..29a7590 100755
--- a/release.sh
+++ b/release.sh
@@ -395,7 +395,7 @@ if [ -f $log ] ; then
fi
branch="build/wicket-$version"
-tag="wicket-$version"
+tag="rel/wicket-$version"
echo "# Release configuration for Wicket-$version
scm.tag=${tag}
[3/3] wicket git commit: Update wicket 6 experimentals too
Posted by da...@apache.org.
Update wicket 6 experimentals too
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8f661e8a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8f661e8a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8f661e8a
Branch: refs/heads/wicket-6.x
Commit: 8f661e8a70194e6999855e4a3cc1f47ed4b39df8
Parents: 8003719
Author: Martijn Dashorst <da...@apache.org>
Authored: Fri Feb 5 11:19:41 2016 +0100
Committer: Martijn Dashorst <da...@apache.org>
Committed: Fri Feb 5 12:05:58 2016 +0100
----------------------------------------------------------------------
build-versions.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/8f661e8a/build-versions.py
----------------------------------------------------------------------
diff --git a/build-versions.py b/build-versions.py
index cc36e94..217e309 100755
--- a/build-versions.py
+++ b/build-versions.py
@@ -43,7 +43,7 @@ def getModulesFromParent(parentPomFile):
addVersions(groupId, module)
addVersions(groupId, "wicket-parent")
-addVersions("org.apache.wicket.experimental.wicket7", "wicket-experimental")
+addVersions("org.apache.wicket.experimental.wicket6", "wicket-experimental")
getModulesFromParent("pom.xml")
getModulesFromParent("wicket-native-websocket/pom.xml")