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/10/18 13:31:54 UTC
[1/3] wicket git commit: Use mvn7 so that it uses Java 7 for the
release. With Java 8 the build fails with Javadoc lint errors
Repository: wicket
Updated Branches:
refs/heads/build/wicket-1.5.14 [created] c157055f5
Use mvn7 so that it uses Java 7 for the release. With Java 8 the build fails with Javadoc lint errors
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/893c7583
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/893c7583
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/893c7583
Branch: refs/heads/build/wicket-1.5.14
Commit: 893c7583b7dcdf31a8707fd9ac246a467aebab80
Parents: 299943c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Oct 18 13:16:48 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Oct 18 13:16:48 2015 +0200
----------------------------------------------------------------------
release-martin.sh | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/893c7583/release-martin.sh
----------------------------------------------------------------------
diff --git a/release-martin.sh b/release-martin.sh
index 63d79d0..5b271cd 100755
--- a/release-martin.sh
+++ b/release-martin.sh
@@ -20,8 +20,6 @@ echo "Apache Wicket Release script"
echo "----------------------------"
echo "Building a release for Apache Wicket. We will need the passphrase for"
echo "GPG to sign the release."
-echo "This program assumes you use a jdk 1.5 explicitly configured when"
-echo "invoking the 'mvn5' Maven 2 command."
echo ""
echo "Enter release version:"
@@ -52,8 +50,8 @@ echo "Switching to branch $branch"
git checkout -b $branch
echo "Modifying poms with the new version: $version"
-mvn5 versions:set -DnewVersion=$version
-mvn5 versions:commit
+mvn7 versions:set -DnewVersion=$version
+mvn7 versions:commit
find . -name "pom.xml" | xargs sed -i -e "s/1.5-SNAPSHOT/$version/g"
find . -name "pom.xml" | xargs sed -i -e "s/wicket\/trunk/wicket\/releases\/$version/g"
@@ -93,16 +91,16 @@ echo "Committing changes"
git commit -am "changes to notice files"
# prebuilding to work around javadoc generation problem
-mvn5 clean install -DskipTests=true
-mvn5 javadoc:jar
+mvn7 clean install -DskipTests=true
+mvn7 javadoc:jar
# clean all projects
echo "Clean all projects"
-mvn5 clean -Pall
+mvn7 clean -Pall
# package and assemble the release
echo "Package and assemble the release"
-mvn5 -ff -Dgpg.passphrase="$passphrase" -Prelease deploy javadoc:javadoc assembly:attached $1
+mvn7 -ff -Dgpg.passphrase="$passphrase" -Prelease deploy javadoc:javadoc assembly:attached $1
filename=`ls target/dist/apache-wicket*gz`
gpg --print-md MD5 $filename > $filename.md5
[3/3] wicket git commit: changes to notice files
Posted by mg...@apache.org.
changes to notice files
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c157055f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c157055f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c157055f
Branch: refs/heads/build/wicket-1.5.14
Commit: c157055f5dfccf98eccd0f78a2e6f31ac012104c
Parents: b0a6373
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Oct 18 13:17:47 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Oct 18 13:17:47 2015 +0200
----------------------------------------------------------------------
NOTICE | 78 ++++++++++++++++++++++++++++++-------------------------------
1 file changed, 39 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c157055f/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 61a0b9b..641d07c 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Wicket
-Copyright 2006-2012 The Apache Software Foundation
+Copyright 2006-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -12,10 +12,45 @@ NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE
AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE.
---------------------------------------------------------------------------
+src/./wicket-core
+---------------------------------------------------------------------------
+ Apache Wicket
+ Copyright 2006-2011 Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ This product includes software from QOS.ch (http://slf4j.org) licensed under the X11 license
+ Copyright (c) 2004-2008 QOS.ch
+
+ Contains Diff library from Mavens JRCS, released under
+ The Apache Software License, Version 1.1.
+ (c) 1999-2003
+
+ org.apache.wicket.markup.html.form.upload.MultiFileUploadField.js is taken from [1]
+ and has the following notice:
+ "Licence:
+ Use this however/wherever you like, just don't blame me if it breaks
+ anything.
+
+ Credit:
+ If you're nice, you'll leave this bit:
+
+ Class by Stickman -- http://www.the-stickman.com
+ with thanks to:
+ [for Safari fixes]
+ Luis Torrefranca -- http://www.law.pitt.edu
+ and
+ Shawn Parker & John Pennypacker -- http://www.fuzzycoconut.com
+ [for duplicate name bug]
+ 'neal'"
+ [1]: http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/
+
+---------------------------------------------------------------------------
src/./wicket-guice
---------------------------------------------------------------------------
Apache Wicket
- Copyright 2006-2012 Apache Software Foundation
+ Copyright 2006-2011 Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -26,7 +61,7 @@ src/./wicket-guice
src/./wicket-examples
---------------------------------------------------------------------------
Apache Wicket Examples
- Copyright 2006-2012 Apache Software Foundation
+ Copyright 2006-2011 Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -66,45 +101,10 @@ src/./wicket-examples
which is released under CDDL 1.0 license (http://www.opensource.org/licenses/cddl1.php).
---------------------------------------------------------------------------
-src/./wicket-core
----------------------------------------------------------------------------
- Apache Wicket
- Copyright 2006-2012 Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- This product includes software from QOS.ch (http://slf4j.org) licensed under the X11 license
- Copyright (c) 2004-2008 QOS.ch
-
- Contains Diff library from Mavens JRCS, released under
- The Apache Software License, Version 1.1.
- (c) 1999-2003
-
- org.apache.wicket.markup.html.form.upload.MultiFileUploadField.js is taken from [1]
- and has the following notice:
- "Licence:
- Use this however/wherever you like, just don't blame me if it breaks
- anything.
-
- Credit:
- If you're nice, you'll leave this bit:
-
- Class by Stickman -- http://www.the-stickman.com
- with thanks to:
- [for Safari fixes]
- Luis Torrefranca -- http://www.law.pitt.edu
- and
- Shawn Parker & John Pennypacker -- http://www.fuzzycoconut.com
- [for duplicate name bug]
- 'neal'"
- [1]: http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/
-
----------------------------------------------------------------------------
src/./wicket-datetime
---------------------------------------------------------------------------
Apache Wicket Date Time
- Copyright 2006-2012 Apache Software Foundation
+ Copyright 2006-2011 Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[2/3] wicket git commit: modified poms for release 1.5.14
Posted by mg...@apache.org.
modified poms for release 1.5.14
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b0a63731
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b0a63731
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b0a63731
Branch: refs/heads/build/wicket-1.5.14
Commit: b0a6373166d3085455ac943b59770149cbf3a8ba
Parents: 893c758
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Oct 18 13:17:47 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Oct 18 13:17:47 2015 +0200
----------------------------------------------------------------------
archetypes/quickstart/pom.xml | 2 +-
.../quickstart/src/main/resources/archetype-resources/pom.xml | 2 +-
pom.xml | 2 +-
testing/wicket-threadtest/pom.xml | 2 +-
wicket-auth-roles/pom.xml | 2 +-
wicket-core/pom.xml | 2 +-
wicket-datetime/pom.xml | 2 +-
wicket-devutils/pom.xml | 2 +-
wicket-examples/pom.xml | 2 +-
wicket-extensions/pom.xml | 2 +-
wicket-guice/pom.xml | 2 +-
wicket-ioc/pom.xml | 2 +-
wicket-jmx/pom.xml | 2 +-
wicket-objectssizeof-agent/pom.xml | 2 +-
wicket-request/pom.xml | 4 ++--
wicket-spring/pom.xml | 2 +-
wicket-util/pom.xml | 4 ++--
wicket-velocity/pom.xml | 2 +-
wicket/pom.xml | 2 +-
19 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml
index 727c107..08166d3 100644
--- a/archetypes/quickstart/pom.xml
+++ b/archetypes/quickstart/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
index 839b1ec..5a8b7c9 100644
--- a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
@@ -20,7 +20,7 @@
</license>
</licenses>
<properties>
- <wicket.version>1.5-SNAPSHOT</wicket.version>
+ <wicket.version>1.5.14</wicket.version>
<jetty.version>7.5.0.v20110901</jetty.version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6c86b23..5a7d789 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<packaging>pom</packaging>
<name>Wicket Parent</name>
<description>Wicket is a Java-based open source component web application framework.</description>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/testing/wicket-threadtest/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-threadtest/pom.xml b/testing/wicket-threadtest/pom.xml
index f2ca2e3..de9f274 100644
--- a/testing/wicket-threadtest/pom.xml
+++ b/testing/wicket-threadtest/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/wicket-auth-roles/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-auth-roles/pom.xml b/wicket-auth-roles/pom.xml
index 9f5631e..0417842 100644
--- a/wicket-auth-roles/pom.xml
+++ b/wicket-auth-roles/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/wicket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index 93cde91..aa59a86 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/wicket-datetime/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-datetime/pom.xml b/wicket-datetime/pom.xml
index 8ab6e83..ed1196d 100644
--- a/wicket-datetime/pom.xml
+++ b/wicket-datetime/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-datetime</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/wicket-devutils/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-devutils/pom.xml b/wicket-devutils/pom.xml
index 7178c59..2d2d066 100644
--- a/wicket-devutils/pom.xml
+++ b/wicket-devutils/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/wicket-examples/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index 5e574b8..496c554 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/wicket-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-extensions/pom.xml b/wicket-extensions/pom.xml
index b7b04ac..a948eeb 100644
--- a/wicket-extensions/pom.xml
+++ b/wicket-extensions/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/wicket-guice/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-guice/pom.xml b/wicket-guice/pom.xml
index 232ae3f..d0b7f5f 100644
--- a/wicket-guice/pom.xml
+++ b/wicket-guice/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/wicket-ioc/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml
index 77deafd..d50820f 100644
--- a/wicket-ioc/pom.xml
+++ b/wicket-ioc/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/wicket-jmx/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-jmx/pom.xml b/wicket-jmx/pom.xml
index 39250ec..32ebb19 100644
--- a/wicket-jmx/pom.xml
+++ b/wicket-jmx/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/wicket-objectssizeof-agent/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-objectssizeof-agent/pom.xml b/wicket-objectssizeof-agent/pom.xml
index 7b5cca8..5c5036a 100644
--- a/wicket-objectssizeof-agent/pom.xml
+++ b/wicket-objectssizeof-agent/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/wicket-request/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-request/pom.xml b/wicket-request/pom.xml
index 0207c6d..cb5d7bf 100755
--- a/wicket-request/pom.xml
+++ b/wicket-request/pom.xml
@@ -21,11 +21,11 @@
<parent>
<artifactId>wicket-parent</artifactId>
<groupId>org.apache.wicket</groupId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
</parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<name>Wicket Request</name>
<url>http://maven.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/wicket-spring/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-spring/pom.xml b/wicket-spring/pom.xml
index 0df5911..ac23083 100644
--- a/wicket-spring/pom.xml
+++ b/wicket-spring/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/wicket-util/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index 078f35e..e200f7e 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -21,11 +21,11 @@
<parent>
<artifactId>wicket-parent</artifactId>
<groupId>org.apache.wicket</groupId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
</parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<name>Wicket Util</name>
<url>http://maven.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/wicket-velocity/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-velocity/pom.xml b/wicket-velocity/pom.xml
index 91d24b9..cdaeb31 100644
--- a/wicket-velocity/pom.xml
+++ b/wicket-velocity/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0a63731/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/wicket/pom.xml b/wicket/pom.xml
index 995ae0a..b3f7727 100644
--- a/wicket/pom.xml
+++ b/wicket/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.14</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket</artifactId>