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 2015/11/08 14:05:45 UTC
[1/8] wicket git commit: Added changelog for Wicket 6.21.0
Repository: wicket
Updated Branches:
refs/heads/build/wicket-6.21.0 [created] 53dadc49a
Added changelog for Wicket 6.21.0
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c619623c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c619623c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c619623c
Branch: refs/heads/build/wicket-6.21.0
Commit: c619623c17de3c12a1907d5f68eacc7424d9b548
Parents: 6caae75
Author: Martijn Dashorst <da...@apache.org>
Authored: Thu Oct 29 23:34:22 2015 +0100
Committer: Martijn Dashorst <da...@apache.org>
Committed: Thu Oct 29 23:36:08 2015 +0100
----------------------------------------------------------------------
CHANGELOG-6.x | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 46 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c619623c/CHANGELOG-6.x
----------------------------------------------------------------------
diff --git a/CHANGELOG-6.x b/CHANGELOG-6.x
index 98e9232..81077f9 100644
--- a/CHANGELOG-6.x
+++ b/CHANGELOG-6.x
@@ -1,6 +1,49 @@
-This file contains all changes done in releases for Apache Wicket 6.x.
+This file contains all changes done in releases for Apache Wicket 7.x.
-=============================================================================
+=======================================================================
+
+Release Notes - Wicket - Version 6.21.0
+
+** Bug
+
+ * [WICKET-5882] - AutoComplete suggestion list disappear when I click on autoComplete scrollbar in IE
+ * [WICKET-5898] - StackOverflowError after form submit with a validation error
+ * [WICKET-5925] - wicket-examples DataTablePage is broken
+ * [WICKET-5927] - Velocity remote code execution
+ * [WICKET-5939] - AjaxEventBehavior should not lower-case the event name
+ * [WICKET-5941] - Headers not rendered for components inside TransparentWebMarkupContainer on ajax update
+ * [WICKET-5944] - CSRF prevention does not work with https URLs on the default port
+ * [WICKET-5946] - JavaScript/Css PackageResource should use the same charset for compressing
+ * [WICKET-5959] - HTML input placeholder text breaks AutoCompleteTextField in IE11
+ * [WICKET-5960] - Page header isn't rendered for pages where URL has changed during render
+ * [WICKET-5968] - CachingResourceLocator lookup key doesn't take strict into account
+ * [WICKET-5970] - UrlRenderer does not render fragments
+ * [WICKET-5973] - IllegalArgumentException 'bytes' cannot be negative. on opening Inspector
+ * [WICKET-5978] - LazyInitProxyFactory fills permgen space
+ * [WICKET-5989] - BaseWicketTester#startComponentInPage fails for pages with <wicket:header-items></wicket:header> placeholder
+ * [WICKET-5994] - Mounted TemplateResourceReference throws org.apache.wicket.WicketRuntimeException when https is used
+ * [WICKET-5996] - Mounted packages throw IllegalArgumentException when visiting base package url.
+ * [WICKET-6005] - WicketRuntimeException from AjaxPagingNavigator#onAjaxEvent
+
+** Improvement
+
+ * [WICKET-5926] - Arquillian Support with Container ServletContext in BaseWicketTester/WicketTester.
+ * [WICKET-5930] - Upgrade Atmosphere to 2.2.7
+ * [WICKET-5932] - Allow empty column list for DataTable
+ * [WICKET-5933] - Avoid serialization of untouched page after ajax request
+ * [WICKET-5935] - IoC Guice: cache proxies and fail on creation when binding is missing
+ * [WICKET-5945] - add a new topic/listener that notifies of Ajax calls done
+ * [WICKET-5948] - wicket-ajax.js probably doesn't traverse the children of <div> or <span>
+ * [WICKET-5955] - error from WebPage # reportMissingHead
+ * [WICKET-5974] - Change AjaxPagingNavigator#onAjaxEvent() to only consider parent components that have setOutputMarkupId(true)
+ * [WICKET-5976] - Improve the documentation of FeedbackMessages first(int level)
+ * [WICKET-5986] - NumberTextField<N> should use Models for minimum, maximum and step
+
+** Task
+
+ * [WICKET-5951] - Upgrade Atmosphere to 2.2.8
+
+=======================================================================
Release Notes - Wicket - Version 6.20.0
@@ -1426,3 +1469,4 @@ Release Notes - Wicket - Version 6.0.0-beta1
** Wish
* [WICKET-757] - FormComponent.rawInput needs a better name
+
[8/8] wicket git commit: Added post-release scripts and vote/release
email templates
Posted by da...@apache.org.
Added post-release scripts and vote/release email templates
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/53dadc49
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/53dadc49
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/53dadc49
Branch: refs/heads/build/wicket-6.21.0
Commit: 53dadc49a8105f7c952030001f5137ace973558a
Parents: f939100
Author: Martijn Dashorst <da...@apache.org>
Authored: Thu Oct 29 23:51:51 2015 +0100
Committer: Martijn Dashorst <da...@apache.org>
Committed: Thu Oct 29 23:51:51 2015 +0100
----------------------------------------------------------------------
promote-6.21.0.sh | 42 +++++++++++++++++
release-announce.txt | 112 ++++++++++++++++++++++++++++++++++++++++++++++
release-vote.txt | 99 ++++++++++++++++++++++++++++++++++++++++
release.txt | 46 +++++++++++++++++++
revert-6.21.0.sh | 31 +++++++++++++
5 files changed, 330 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/53dadc49/promote-6.21.0.sh
----------------------------------------------------------------------
diff --git a/promote-6.21.0.sh b/promote-6.21.0.sh
new file mode 100755
index 0000000..e4f85ae
--- /dev/null
+++ b/promote-6.21.0.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+echo -n "Promoting release 6.21.0
+
+Actions about to be performed:
+------------------------------
+
+$(cat $0 | tail -n +14)
+
+------------------------------------------
+Press enter to continue or CTRL-C to abort"
+
+read
+
+# push the build branch to ASF git repo
+
+git push origin build/wicket-6.21.0:refs/heads/build/wicket-6.21.0
+
+# push the release tag to ASF git repo
+
+git push origin wicket-6.21.0
+
+# promote the source distribution by moving it from the staging area to the release area
+
+svn mv https://dist.apache.org/repos/dist/dev/wicket/6.21.0 https://dist.apache.org/repos/dist/release/wicket -m "Upload release to the mirrors"
+
+mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-release -DstagingRepositoryId=orgapachewicket-1054 -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription="Release vote has passed"
+
+# Renumber the next development iteration 6.22.0-SNAPSHOT:
+
+git checkout wicket-6.x
+mvn release:update-versions --batch-mode
+find . ! ( -type d -name "target" -prune ) -name pom.xml -exec sed -i "" -E "s/6.21.1-SNAPSHOT/6.22.0-SNAPSHOT/g" {} ;
+find . ! ( -type d -name "target" -prune ) -name pom.xml -exec sed -i "" -E "s/6.21.1-SNAPSHOT/6.22.0-SNAPSHOT/g" {} ;
+git add ` find . ! ( -type d -name "target" -prune ) -name pom.xml `
+git commit -m "Start next development version"
+git push
+
+echo "Remove the previous version of Wicket using this command:
+
+ svn rm https://dist.apache.org/repos/dist/release/wicket/6.20.0 -m "Remove previous version from mirrors"
+
+"
http://git-wip-us.apache.org/repos/asf/wicket/blob/53dadc49/release-announce.txt
----------------------------------------------------------------------
diff --git a/release-announce.txt b/release-announce.txt
new file mode 100644
index 0000000..8f57e39
--- /dev/null
+++ b/release-announce.txt
@@ -0,0 +1,112 @@
+The Apache Wicket PMC is proud to announce Apache Wicket 6.21.0!
+
+This release marks another minor release of Wicket 6. We
+use semantic versioning for the development of Wicket, and as such no
+API breaks are present breaks are present in this release compared to
+6.0.0.
+
+New and noteworthy
+------------------
+
+<OPTIONAL>
+
+Using this release
+------------------
+
+With Apache Maven update your dependency to (and don't forget to
+update any other dependencies on Wicket projects to the same version):
+
+<dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ <version>6.21.0</version>
+</dependency>
+
+Or download and build the distribution yourself, or use our
+convenience binary package
+
+ * Source: http://www.apache.org/dyn/closer.cgi/wicket/6.21.0
+ * Binary: http://www.apache.org/dyn/closer.cgi/wicket/6.21.0/binaries
+
+Upgrading from earlier versions
+-------------------------------
+
+If you upgrade from 6.y.z this release is a drop in replacement. If
+you come from a version prior to 6.0.0, please read our Wicket 6
+migration guide found at
+
+ * http://s.apache.org/wicket6migrate
+
+Have fun!
+
+— The Wicket team
+
+
+========================================================================
+
+ The signatures for the source release artefacts:
+
+
+Signature for apache-wicket-6.21.0.zip:
+
+ -----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iEYEABECAAYFAlYyougACgkQJBX8W/xy/UVf4wCfbZ9yq2/H2PVooMHRrpT4dIrT
+I2IAnjnBXDKES7QKXII71ahVYqxkJFQ9
+=LypT
+-----END PGP SIGNATURE-----
+
+Signature for apache-wicket-6.21.0.tar.gz:
+
+ -----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iEYEABECAAYFAlYyougACgkQJBX8W/xy/UVPCwCgg6JZjXQH11jCkES+UGd+Cg0E
++0QAn3np5HgwLicJCrBVRa2a9m9VjbMr
+=KxSH
+-----END PGP SIGNATURE-----
+
+========================================================================
+
+ CHANGELOG for 6.21.0:
+
+** Bug
+
+ * [WICKET-5882] - AutoComplete suggestion list disappear when I click on autoComplete scrollbar in IE
+ * [WICKET-5898] - StackOverflowError after form submit with a validation error
+ * [WICKET-5925] - wicket-examples DataTablePage is broken
+ * [WICKET-5927] - Velocity remote code execution
+ * [WICKET-5939] - AjaxEventBehavior should not lower-case the event name
+ * [WICKET-5941] - Headers not rendered for components inside TransparentWebMarkupContainer on ajax update
+ * [WICKET-5944] - CSRF prevention does not work with https URLs on the default port
+ * [WICKET-5946] - JavaScript/Css PackageResource should use the same charset for compressing
+ * [WICKET-5959] - HTML input placeholder text breaks AutoCompleteTextField in IE11
+ * [WICKET-5960] - Page header isn't rendered for pages where URL has changed during render
+ * [WICKET-5968] - CachingResourceLocator lookup key doesn't take strict into account
+ * [WICKET-5970] - UrlRenderer does not render fragments
+ * [WICKET-5973] - IllegalArgumentException 'bytes' cannot be negative. on opening Inspector
+ * [WICKET-5978] - LazyInitProxyFactory fills permgen space
+ * [WICKET-5989] - BaseWicketTester#startComponentInPage fails for pages with <wicket:header-items></wicket:header> placeholder
+ * [WICKET-5994] - Mounted TemplateResourceReference throws org.apache.wicket.WicketRuntimeException when https is used
+ * [WICKET-5996] - Mounted packages throw IllegalArgumentException when visiting base package url.
+ * [WICKET-6005] - WicketRuntimeException from AjaxPagingNavigator#onAjaxEvent
+
+** Improvement
+
+ * [WICKET-5926] - Arquillian Support with Container ServletContext in BaseWicketTester/WicketTester.
+ * [WICKET-5930] - Upgrade Atmosphere to 2.2.7
+ * [WICKET-5932] - Allow empty column list for DataTable
+ * [WICKET-5933] - Avoid serialization of untouched page after ajax request
+ * [WICKET-5935] - IoC Guice: cache proxies and fail on creation when binding is missing
+ * [WICKET-5945] - add a new topic/listener that notifies of Ajax calls done
+ * [WICKET-5948] - wicket-ajax.js probably doesn't traverse the children of <div> or <span>
+ * [WICKET-5955] - error from WebPage # reportMissingHead
+ * [WICKET-5974] - Change AjaxPagingNavigator#onAjaxEvent() to only consider parent components that have setOutputMarkupId(true)
+ * [WICKET-5976] - Improve the documentation of FeedbackMessages first(int level)
+ * [WICKET-5986] - NumberTextField<N> should use Models for minimum, maximum and step
+
+** Task
+
+ * [WICKET-5951] - Upgrade Atmosphere to 2.2.8
+
http://git-wip-us.apache.org/repos/asf/wicket/blob/53dadc49/release-vote.txt
----------------------------------------------------------------------
diff --git a/release-vote.txt b/release-vote.txt
new file mode 100644
index 0000000..26bb8ce
--- /dev/null
+++ b/release-vote.txt
@@ -0,0 +1,99 @@
+This is a vote to release Apache Wicket 6.21.0
+
+Please download the source distributions found in our staging area
+linked below.
+
+I have included the signatures for both the source archives. This vote
+lasts for 72 hours minimum.
+
+[ ] Yes, release Apache Wicket 6.21.0
+[ ] No, don't release Apache Wicket 6.21.0, because ...
+
+Distributions, changelog, keys and signatures can be found at:
+
+ https://dist.apache.org/repos/dist/dev/wicket/6.21.0
+
+Staging repository:
+
+ https://repository.apache.org/content/repositories/orgapachewicket-1054/
+
+The binaries are available in the above link, as are a staging
+repository for Maven. Typically the vote is on the source, but should
+you find a problem with one of the binaries, please let me know, I can
+re-roll them some way or the other.
+
+Staging git repository data:
+
+ Repository: git@github.com:dashorst/wicket.git
+ Branch: build/wicket-6.21.0
+ Release tag: wicket-6.21.0
+
+
+========================================================================
+
+ The signatures for the source release artefacts:
+
+
+Signature for apache-wicket-6.21.0.zip:
+
+ -----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iEYEABECAAYFAlYyougACgkQJBX8W/xy/UVf4wCfbZ9yq2/H2PVooMHRrpT4dIrT
+I2IAnjnBXDKES7QKXII71ahVYqxkJFQ9
+=LypT
+-----END PGP SIGNATURE-----
+
+Signature for apache-wicket-6.21.0.tar.gz:
+
+ -----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iEYEABECAAYFAlYyougACgkQJBX8W/xy/UVPCwCgg6JZjXQH11jCkES+UGd+Cg0E
++0QAn3np5HgwLicJCrBVRa2a9m9VjbMr
+=KxSH
+-----END PGP SIGNATURE-----
+
+========================================================================
+
+ CHANGELOG for 6.21.0:
+
+** Bug
+
+ * [WICKET-5882] - AutoComplete suggestion list disappear when I click on autoComplete scrollbar in IE
+ * [WICKET-5898] - StackOverflowError after form submit with a validation error
+ * [WICKET-5925] - wicket-examples DataTablePage is broken
+ * [WICKET-5927] - Velocity remote code execution
+ * [WICKET-5939] - AjaxEventBehavior should not lower-case the event name
+ * [WICKET-5941] - Headers not rendered for components inside TransparentWebMarkupContainer on ajax update
+ * [WICKET-5944] - CSRF prevention does not work with https URLs on the default port
+ * [WICKET-5946] - JavaScript/Css PackageResource should use the same charset for compressing
+ * [WICKET-5959] - HTML input placeholder text breaks AutoCompleteTextField in IE11
+ * [WICKET-5960] - Page header isn't rendered for pages where URL has changed during render
+ * [WICKET-5968] - CachingResourceLocator lookup key doesn't take strict into account
+ * [WICKET-5970] - UrlRenderer does not render fragments
+ * [WICKET-5973] - IllegalArgumentException 'bytes' cannot be negative. on opening Inspector
+ * [WICKET-5978] - LazyInitProxyFactory fills permgen space
+ * [WICKET-5989] - BaseWicketTester#startComponentInPage fails for pages with <wicket:header-items></wicket:header> placeholder
+ * [WICKET-5994] - Mounted TemplateResourceReference throws org.apache.wicket.WicketRuntimeException when https is used
+ * [WICKET-5996] - Mounted packages throw IllegalArgumentException when visiting base package url.
+ * [WICKET-6005] - WicketRuntimeException from AjaxPagingNavigator#onAjaxEvent
+
+** Improvement
+
+ * [WICKET-5926] - Arquillian Support with Container ServletContext in BaseWicketTester/WicketTester.
+ * [WICKET-5930] - Upgrade Atmosphere to 2.2.7
+ * [WICKET-5932] - Allow empty column list for DataTable
+ * [WICKET-5933] - Avoid serialization of untouched page after ajax request
+ * [WICKET-5935] - IoC Guice: cache proxies and fail on creation when binding is missing
+ * [WICKET-5945] - add a new topic/listener that notifies of Ajax calls done
+ * [WICKET-5948] - wicket-ajax.js probably doesn't traverse the children of <div> or <span>
+ * [WICKET-5955] - error from WebPage # reportMissingHead
+ * [WICKET-5974] - Change AjaxPagingNavigator#onAjaxEvent() to only consider parent components that have setOutputMarkupId(true)
+ * [WICKET-5976] - Improve the documentation of FeedbackMessages first(int level)
+ * [WICKET-5986] - NumberTextField<N> should use Models for minimum, maximum and step
+
+** Task
+
+ * [WICKET-5951] - Upgrade Atmosphere to 2.2.8
+
http://git-wip-us.apache.org/repos/asf/wicket/blob/53dadc49/release.txt
----------------------------------------------------------------------
diff --git a/release.txt b/release.txt
new file mode 100644
index 0000000..29c7dcc
--- /dev/null
+++ b/release.txt
@@ -0,0 +1,46 @@
+
+The release has been created. It is up to you to check if the release is up
+to par, and perform the following commands yourself when you start the vote
+to enable future development during the vote and after.
+
+A vote email has been generated in release-vote.txt, you can copy/paste it using:
+
+ cat release-vote.txt | pbcopy
+
+You can find the distribution in target/dist.
+
+
+Failed release
+--------------
+
+To rollback a release due to a failed vote or some other complication use:
+
+ $ ./revert-6.21.0.sh
+
+This will clean up the artfifacts from the staging areas, including Nexus,
+dist.apache.org and the release branch and tag.
+
+
+Successful release
+------------------
+
+Congratulations on the successful release vote!
+
+Use the release-announce.txt as a starter for the release announcement:
+
+ cat release-announce.txt | pbcopy
+
+To promote the release after a successful vote, run:
+
+ $ ./promote-6.21.0.sh
+
+This will promote the Nexus staging repository to Maven Central, and move
+the release artifacts from the staging area to dist.apache.org. It will
+also sign the release tag and push the release branch to git.apache.org
+
+You can read this message at a later time using:
+
+ $ cat release.txt
+
+Happy voting!
+
http://git-wip-us.apache.org/repos/asf/wicket/blob/53dadc49/revert-6.21.0.sh
----------------------------------------------------------------------
diff --git a/revert-6.21.0.sh b/revert-6.21.0.sh
new file mode 100755
index 0000000..673f9c1
--- /dev/null
+++ b/revert-6.21.0.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+echo -n "Reverting release 6.21.0
+
+Actions about to be performed:
+------------------------------
+
+$(cat $0 | tail -n +14)
+
+------------------------------------------
+Press enter to continue or CTRL-C to abort"
+
+read
+
+# clean up local repository
+git checkout wicket-6.x
+git branch -D build/wicket-6.21.0
+git tag -d wicket-6.21.0
+
+# clean up staging repository
+git push staging --delete refs/heads/build/wicket-6.21.0
+git push staging --delete wicket-6.21.0
+
+# clean up staging dist area
+svn rm https://dist.apache.org/repos/dist/dev/wicket/6.21.0 -m "Release vote has failed"
+
+# clean up staging maven repository
+mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-drop -DstagingRepositoryId=orgapachewicket-1054 -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription="Release vote has failed"
+
+# clean up remaining release files
+find . -name "*.releaseBackup" -exec rm {} ;
+[ -f release.properties ] && rm release.properties
[2/8] wicket git commit: Applied release scripts from 7.x to 6.x
Posted by da...@apache.org.
Applied release scripts from 7.x to 6.x
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6caae75d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6caae75d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6caae75d
Branch: refs/heads/build/wicket-6.21.0
Commit: 6caae75de82f8adf23062678c59eb4a02546cf81
Parents: f27173c
Author: Martijn Dashorst <da...@apache.org>
Authored: Thu Oct 29 22:37:37 2015 +0100
Committer: Martijn Dashorst <da...@apache.org>
Committed: Thu Oct 29 23:36:08 2015 +0100
----------------------------------------------------------------------
build-changelog.sh | 147 +++++++++++
build-versions.py | 57 +++++
patch-dashorst.sh | 283 ---------------------
release-dashorst.sh | 405 -----------------------------
release-igor.sh | 124 ---------
release.sh | 643 +++++++++++++++++++++++++++++++++++++++++++----
revert-release.sh | 52 ----
7 files changed, 794 insertions(+), 917 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6caae75d/build-changelog.sh
----------------------------------------------------------------------
diff --git a/build-changelog.sh b/build-changelog.sh
new file mode 100755
index 0000000..2c9c3d9
--- /dev/null
+++ b/build-changelog.sh
@@ -0,0 +1,147 @@
+#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+function fail {
+ echo "$1"
+ exit 1
+}
+
+function getProjectVersionFromPom {
+ cat << EOF | xmllint --noent --shell pom.xml | grep content | cut -f2 -d=
+setns pom=http://maven.apache.org/POM/4.0.0
+xpath /pom:project/pom:version/text()
+EOF
+}
+
+if [ "$1" = "--help" ] ; then
+ echo "
+Usage: $0 [--help] [version]
+
+Retrieves the release notes for the next release of Apache Wicket,
+and merges this into the CHANGELOG file.
+
+ version
+ optional version number to retrieve the release notes for
+
+ --help
+ shows this help
+
+"
+ exit 0
+fi
+
+if [ ! -z "$1" ] ; then
+ current_version="$1"
+ major_version=$(expr $current_version : '\(.*\)\..*\..*\-.*')
+ minor_version=$(expr $current_version : '.*\.\(.*\)\..*\-.*')
+ bugfix_version=$(expr $current_version : '.*\..*\.\(.*\)-.*')
+ milestone_version=$(expr $current_version : '.*\..*-\(.*\)')
+ version="$major_version.$minor_version.0-$milestone_version"
+ previous_version="$major_version.$(expr $minor_version - 1).0"
+else
+ current_version=$(getProjectVersionFromPom)
+ major_version=$(expr $current_version : '\(.*\)\..*\..*\-.*')
+ minor_version=$(expr $current_version : '.*\.\(.*\)\..*\-.*')
+ bugfix_version=$(expr $current_version : '.*\..*\.\(.*\)-.*')
+ version="$major_version.$minor_version.0"
+ previous_version="$major_version.$(expr $minor_version - 1).0"
+fi
+
+echo "
+Apache Wicket release notes generator
+=====================================
+This tool retrieves the release notes for the upcoming release from JIRA
+and merges this with the existing CHANGELOG in a text format.
+
+Version to retrieve the release notes from: $version
+
+Press <enter> to continue \c"
+
+read
+
+git status --porcelain CHANGELOG-$major_version.x | grep -q "CHANGELOG-$major_version.x"
+if [ $? -eq 0 ] ; then
+ fail "You already have changes in the CHANGELOG-$major_version.x
+"
+fi
+
+grep -q "$version\$" CHANGELOG-$major_version.x
+if [ $? -eq 0 ] ; then
+ fail "You already have added release notes for this version to the changelog.
+"
+fi
+
+
+echo "
+Extracting JIRA Release notes -- making web requests"
+echo " - determining JIRA version id for $version: \c"
+jira_project_id=12310561
+jira_version_id=$( \
+ curl -s https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=$jira_project_id \
+ | xmllint --noout --noblanks --html --xpath "string(//select[@id=\"version_select\"]/option[translate(normalize-space(text()), ' ', '')=\"$version\"]/@value)" - 2>/dev/null \
+ )
+
+re='^[0-9]+$'
+if ! [[ $jira_version_id =~ $re ]] ; then
+ echo "ERROR"
+ echo "
+Unable to retrieve the version ID from JIRA: received '$jira_version_id'" >&2
+ exit 1
+fi
+
+echo "$jira_version_id"
+
+echo " - retrieving text release notes: \c"
+curl -s "https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=$jira_project_id&version=$jira_version_id&styleName=Text&Create=Create" \
+ | xmllint --noout --noblanks --html --xpath "string(//textarea)" - 2>/dev/null | cat -s | awk '{ if ($0 ~ /^\*\* / ) {
+ printf( "%s\n\n", $0);
+} else {
+ printf( "%s\n", $0 );
+}
+}' > /tmp/release-notes-$version.txt
+
+echo "done"
+
+echo " - merging release notes into changelog: \c"
+
+echo "This file contains all changes done in releases for Apache Wicket 7.x.
+
+=======================================================================
+$(cat /tmp/release-notes-$version.txt)
+
+=======================================================================
+$(tail -n +4 CHANGELOG-$major_version.x)
+" > /tmp/changelog-$version.txt
+cp /tmp/changelog-$version.txt CHANGELOG-$major_version.x
+
+echo "done"
+
+echo "
+The CHANGELOG-$major_version.x file has been updated. Please check the contents
+and commit the changes.
+
+To see the status:
+
+ git status
+ git diff
+
+To add and commit the CHANGELOG:
+
+ git add CHANGELOG-$major_version.x
+ git commit -m \"Added CHANGELOG for release $version
+
+Have fun!
+"
http://git-wip-us.apache.org/repos/asf/wicket/blob/6caae75d/build-versions.py
----------------------------------------------------------------------
diff --git a/build-versions.py b/build-versions.py
new file mode 100755
index 0000000..cc36e94
--- /dev/null
+++ b/build-versions.py
@@ -0,0 +1,57 @@
+#!/usr/bin/python
+#
+# prints a release.properties file for instructing the Maven Release Plugin
+# to generate the proper release artefacts without having to manually version
+# everything.
+#
+# Usage:
+#
+# build-versions.py <release-version> <dev-version>
+#
+# This will generate a release.properties file that will release the
+# release-version, and will continue development on dev-version.
+#
+# Example:
+#
+# build-milestone.py 7.0.0-M1 7.0.0-SNAPSHOT
+#
+
+import sys
+from xml.dom.minidom import parse
+
+groupId = "org.apache.wicket"
+
+if len(sys.argv) != 3:
+ print "Usage: %s <release-version> <dev-version>" % sys.argv[0]
+ sys.exit(1)
+
+relVersion = sys.argv[1]
+devVersion = sys.argv[2]
+
+relVersions = []
+devVersions = []
+
+def addVersions(groupId, module):
+ relVersions.append("project.rel." + groupId + "\\:" + module + "=" + relVersion)
+ devVersions.append("project.dev." + groupId + "\\:" + module + "=" + devVersion)
+
+def getModulesFromParent(parentPomFile):
+ pom = parse(parentPomFile)
+
+ for moduleTag in pom.getElementsByTagName('module'):
+ module = moduleTag.childNodes[0].nodeValue.replace("testing/", "").replace("archetypes/quickstart", "wicket-archetype-quickstart")
+ addVersions(groupId, module)
+
+addVersions(groupId, "wicket-parent")
+addVersions("org.apache.wicket.experimental.wicket7", "wicket-experimental")
+
+getModulesFromParent("pom.xml")
+getModulesFromParent("wicket-native-websocket/pom.xml")
+
+for version in relVersions:
+ print version
+
+print
+
+for version in devVersions:
+ print version
http://git-wip-us.apache.org/repos/asf/wicket/blob/6caae75d/patch-dashorst.sh
----------------------------------------------------------------------
diff --git a/patch-dashorst.sh b/patch-dashorst.sh
deleted file mode 100755
index c6c80b0..0000000
--- a/patch-dashorst.sh
+++ /dev/null
@@ -1,283 +0,0 @@
-#!/bin/sh
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-log=/tmp/wicketrelease.out
-
-function fail {
- echo "$1"
- if [ -f $log ] ; then
- echo ""
- cat $log
- fi
- exit
-}
-
-function setup_gpg {
- gpg --armor --detach-sign --use-agent --sign pom.xml >& $log
- if [ $? -ne 0 ] ; then
- fail "ERROR: Unable to run gpg properly"
- fi
-
- gpg --verify pom.xml.asc >& $log
- if [ $? -ne 0 ]; then
- rm pom.xml.asc
- fail "It appears that you fat-fingered your GPG passphrase"
- fi
- rm pom.xml.asc
-}
-
-function getVersion {
- cat << EOF | xmllint --noent --shell pom.xml | grep content | cut -f2 -d=
-setns pom=http://maven.apache.org/POM/4.0.0
-xpath /pom:project/pom:version/text()
-EOF
-}
-
-# set -e
-
-echo "Apache Wicket Release script"
-echo "----------------------------"
-echo "Building a release for Apache Wicket."
-echo ""
-echo "This script assumes you are running on OS X, it hasn't been tested on any other"
-echo "operating systems, and you can bet it won't work on Windows..."
-echo ""
-echo "REQUIREMENTS:"
-echo ""
-echo " - a pure JDK 6 environment, JDK 7 or newer won't cut it"
-echo " - Maven 3.0.4 (older releases are b0rked, just don't bother)"
-echo " - gpg, gpg-agent and pinentry for signing"
-echo ""
-
-agentcount=`ps aux|grep gpg-agent|wc -l`
-
-current_version=$(getVersion)
-major_version=$(expr $current_version : '\(.*\)\..*\..*\-SNAPSHOT')
-minor_version=$(expr $current_version : '.*\.\(.*\)\..*\-SNAPSHOT')
-bugfix_version=$(expr $current_version : '.*\..*\.\(.*\)-SNAPSHOT')
-version="$major_version.$minor_version.$bugfix_version"
-current_version="$major_version.$minor_version.$((bugfix_version - 1))"
-
-echo "This script will create a patch release: Apache Wicket $version from $current_version"
-echo ""
-echo "Press enter to continue or CTRL-C to abort \c"
-read
-
-branch="build/wicket-$version"
-tag="wicket-$version"
-
-if [ "$agentcount" -ne 1 ]; then
- echo "Found gpg-agent running, killing all agents"
- killall gpg-agent
-fi
-
-echo ""
-echo "You are asked twice for your passphrase, one for scripting purposes, and one "
-echo "for gpg-agent using pinentry such that gpg and git are able to sign things."
-echo ""
-echo "Enter your GPG passphrase (input will be hidden) \c"
-stty_orig=`stty -g`
-stty -echo
-read passphrase
-stty $stty_orig
-
-# test the GPGP passphrase to fail-fast:
-echo "$passphrase" | gpg --passphrase-fd 0 --armor --output pom.xml.asc --detach-sig pom.xml
-gpg --verify pom.xml.asc
-if [ $? -ne 0 ]; then
- echo "It appears that you fat-fingered your GPG passphrase"
- rm pom.xml.asc
- exit $?
-fi
-rm pom.xml.asc
-
-echo "Starting new gpg-agent"
-eval $(gpg-agent --daemon --pinentry-program $(which pinentry))
-if [ $? -ne 0 ] ; then
- fail "ERROR: Unable to start gpg-agent"
-fi
-
-setup_gpg
-
-echo "Ensuring we are starting from builds/wicket-$current_version"
-# otherwise we can't remove a previous release branch that failed
-git checkout build/wicket-$current_version
-
-echo "Cleaning up any release artifacts that might linger"
-mvn -q release:clean
-
-echo "Removing previous release tag $tag (if exists)"
-oldtag=`git tag -l |grep -e "$tag"|wc -l`
-[ "$oldtag" -ne 0 ] && git tag -d $tag
-
-echo "Removing previous build branch $branch (if exists)"
-oldbranch=`git branch |grep -e "$branch"|wc -l`
-[ "$oldbranch" -ne 0 ] && git branch -D $branch
-
-git checkout -b $branch
-
-# Clear the current NOTICE.txt file
-echo "Creating notice file."
-
-NOTICE=NOTICE
-> $NOTICE
-echo "Apache Wicket" >> $NOTICE
-echo "Copyright 2006-$(date +%Y) The Apache Software Foundation" >> $NOTICE
-echo "" >> $NOTICE
-echo "This product includes software developed at" >> $NOTICE
-echo "The Apache Software Foundation (http://www.apache.org/)." >> $NOTICE
-echo "" >> $NOTICE
-echo "This is an aggregated NOTICE file for the Apache Wicket projects included" >> $NOTICE
-echo "in this distribution." >> $NOTICE
-echo "" >> $NOTICE
-echo "NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE" >> $NOTICE
-echo " NOTICE FILE OF THE CORRESPONDING PROJECT. THE RELEASE PROCEDURE WILL" >> $NOTICE
-echo " AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE." >> $NOTICE
-echo "" >> $NOTICE
-
-# next concatenate all NOTICE files from sub projects to the root file
-for i in `find . -name "NOTICE" -not -regex ".*/target/.*" -not -regex "./NOTICE"`
-do
- echo "---------------------------------------------------------------------------" >> $NOTICE
- echo "src/"$i | sed -e "s/\/src.*//g" >> $NOTICE
- echo "---------------------------------------------------------------------------" >> $NOTICE
- cat $i >> $NOTICE
- echo >> $NOTICE
-done
-
-echo "Fixing the quickstart to use the correct wicket version"
-sed -e "s/\<wicket\.version\>.*\<\/wicket\.version\>/\<wicket.version\>$version\<\/wicket.version\>/g" -i "" archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
-
-echo "Committing changes"
-git commit -am "Changes to notice files and quickstart archetype"
-
-# clean all projects
-echo "Clean all projects"
-mvn -q clean -Pall
-
-# package and assemble the release
-echo "Prepare the release"
-mvn --batch-mode release:prepare -DpreparationGoals="clean" -Dtag=$tag
-if [ $? -ne 0 ] ; then
- fail "ERROR: mvn release:prepare was not successful"
-fi
-
-# this needs to be done before signing the tag otherwise the snapshot version
-# is tagged
-#echo "Rollback the last commit of the release plugin"
-#git reset HEAD^ --hard >> $log
-
-#echo "Sign the tag"
-# TODO the git tag --sign doesn't utilize the gpg-agent for some reason
-#git tag --sign --force --message "Signed release tag for Apache Wicket $version" $tag >> $log
-
-echo "Performing the release using Maven"
-mvn -Dgpg.passphrase="$passphrase" -ff -l $log release:perform -DlocalCheckout=true -Dtag=$tag
-if [ $? -ne 0 ] ; then
- fail "ERROR: mvn release:perform was not successful"
-fi
-
-echo "Create and sign the source tarballs"
-
-mkdir -p target/dist/binaries
-
-git archive --format=tar.gz --prefix=apache-wicket-$version/ -o target/dist/apache-wicket-$version.tar.gz $tag
-git archive --format=zip --prefix=apache-wicket-$version/ -o target/dist/apache-wicket-$version.zip $tag
-gpg --armor --detach-sign --use-agent --sign target/dist/apache-wicket-$version.tar.gz
-gpg --armor --detach-sign --use-agent --sign target/dist/apache-wicket-$version.zip
-gpg --print-md SHA1 target/dist/apache-wicket-$version.tar.gz > target/dist/apache-wicket-$version.tar.gz.sha
-gpg --print-md MD5 target/dist/apache-wicket-$version.tar.gz > target/dist/apache-wicket-$version.tar.gz.md5
-gpg --print-md SHA1 target/dist/apache-wicket-$version.zip > target/dist/apache-wicket-$version.zip.sha
-gpg --print-md MD5 target/dist/apache-wicket-$version.zip > target/dist/apache-wicket-$version.zip.md5
-
-echo "Create and sign the binaries"
-mkdir target/apache-wicket-$version-bin
-pushd target/apache-wicket-$version-bin
-find ../checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-.*.[jw]ar" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*" -type f -exec cp {} . \;
-find ../checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-.*.[jw]ar\.asc" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*" -type f -exec cp {} . \;
-cp ../../LICENSE .
-cp ../../README .
-cp ../../NOTICE .
-cp ../../CHANGELOG* .
-popd
-
-pushd target
-
-tar cfz dist/binaries/apache-wicket-$version-bin.tar.gz apache-wicket-$version-bin
-zip -r dist/binaries/apache-wicket-$version-bin.zip apache-wicket-$version-bin
-gpg --armor --detach-sign --use-agent --sign dist/binaries/apache-wicket-$version-bin.tar.gz
-gpg --armor --detach-sign --use-agent --sign dist/binaries/apache-wicket-$version-bin.zip
-gpg --print-md SHA1 dist/binaries/apache-wicket-$version-bin.tar.gz > dist/binaries/apache-wicket-$version-bin.tar.gz.sha
-gpg --print-md MD5 dist/binaries/apache-wicket-$version-bin.tar.gz > dist/binaries/apache-wicket-$version-bin.tar.gz.md5
-gpg --print-md SHA1 dist/binaries/apache-wicket-$version-bin.zip > dist/binaries/apache-wicket-$version-bin.zip.sha
-gpg --print-md MD5 dist/binaries/apache-wicket-$version-bin.zip > dist/binaries/apache-wicket-$version-bin.zip.md5
-popd
-
-echo "Uploading release"
-pushd target/dist
-svn mkdir https://dist.apache.org/repos/dist/dev/wicket/$version -m "Create $version release staging area"
-svn co --force --depth=empty https://dist.apache.org/repos/dist/dev/wicket/$version .
-cp ../../CHANGELOG* .
-svn add *
-svn commit -m "Upload wicket-$version to staging area"
-popd
-
-echo ""
-echo "The release has been created. It is up to you to check if the release is up"
-echo "to par, and perform the following commands yourself when you start the vote"
-echo "to enable future development during the vote and after."
-echo ""
-echo "You can find the distribution in target/dist"
-echo ""
-echo " cd target/dist"
-echo ""
-echo "To verify all signatures:"
-echo ""
-echo " find . -name \"*.asc\" -exec gpg --verify {} \; "
-echo ""
-echo "To push the release branch to ASF git servers"
-echo ""
-echo " git push origin $branch:refs/heads/$branch"
-echo ""
-
-echo "To move the release from staging to the mirrors:"
-echo ""
-echo " svn mv https://dist.apache.org/repos/dist/dev/wicket/$version https://dist.apache.org/repos/dist/release/wicket -m \"Upload release to the mirrors\""
-echo ""
-
-echo "To sign the release tag issue the following three commands: "
-echo ""
-echo " git checkout $tag"
-echo " git tag --sign --force --message \"Signed release tag for Apache Wicket $version\" $tag >> $log"
-echo " git checkout $branch"
-echo ""
-
-mvn_version_to_replace="$major_version.$minor_version.1-SNAPSHOT"
-next_dev_version="$major_version.$(expr $minor_version + 1).0-SNAPSHOT"
-
-echo "To renumber the next development iteration $next_dev_version:"
-echo ""
-echo " git checkout wicket-6.x"
-echo " mvn release:update-versions --batch-mode"
-echo " find . ! \\( -type d -name \"target\" -prune \\) -name pom.xml -exec sed -i \"\" -E \"s/$mvn_version_to_replace/$next_dev_version/g\" {} \\;"
-# do the same for the original snapshot version, as our maven release
-# plugin friend doesn't do that for us in the dependency management section
-mvn_version_to_replace="$major_version.$minor_version.0-SNAPSHOT"
-echo " find . ! \\( -type d -name \"target\" -prune \\) -name pom.xml -exec sed -i \"\" -E \"s/$mvn_version_to_replace/$next_dev_version/g\" {} \\;"
-echo " git add \`find . ! \\( -type d -name \"target\" -prune \\) -name pom.xml\`"
-echo " git commit -m \"Start next development version\""
-echo " git push"
-echo ""
http://git-wip-us.apache.org/repos/asf/wicket/blob/6caae75d/release-dashorst.sh
----------------------------------------------------------------------
diff --git a/release-dashorst.sh b/release-dashorst.sh
deleted file mode 100755
index 78c5562..0000000
--- a/release-dashorst.sh
+++ /dev/null
@@ -1,405 +0,0 @@
-#!/bin/sh
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-log=/tmp/wicketrelease.out
-
-rm $log
-
-function fail {
- echo "$1"
- if [ -f $log ] ; then
- echo ""
- cat $log
- fi
- exit
-}
-
-function getVersion {
- cat << EOF | xmllint --noent --shell pom.xml | grep content | cut -f2 -d=
-setns pom=http://maven.apache.org/POM/4.0.0
-xpath /pom:project/pom:version/text()
-EOF
-}
-
-function getJdkToolchain {
- xmllint ~/.m2/toolchains.xml --xpath "/toolchains/toolchain[provides/version/text() = '1.6']/configuration/jdkHome/text()"
-}
-
-# set -e
-
-#export JAVA_HOME=`/usr/libexec/java_home -v1.6`
-
-echo "
-Apache Wicket Release script
-----------------------------
-Building a release for Apache Wicket.
-
-This script assumes you are running on OS X, it hasn't been tested on any other
-operating systems, and you can bet it won't work on Windows...
-
-REQUIREMENTS:
-
- - a pure JDK 6 environment, JDK 7 or newer won't cut it
- - Maven 3.3.0 (older releases are b0rked, just don't bother)
- - gpg, gpg-agent and pinentry for signing
-"
-
-if [ ! -f ~/.m2/toolchains.xml ] ; then
- fail "
-Maven will load the JDK 6 environment from the toolchain specified in
-~/.m2/toolchains.xml
-
-You don't have a toolchains.xml file in your .m2 folder. Please specify your
-JDK's in the toolchains.xml file.
-"
-fi
-
-grep -q "<version>1.6</version>" ~/.m2/toolchains.xml
-
-if [ $? -ne 0 ] ; then
- fail "
-Your ~/.m2/toolchains.xml file doesn't provide a JDK 1.6 toolchain.
-"
-fi
-
-echo "Java version for running Maven is: $(java -version 2>&1 | tail -n 2 | head -n 1)
-Java used to compile (from toolchain) is: $(getJdkToolchain)
-"
-
-agentcount=`ps aux|grep gpg-agent|wc -l`
-
-current_version=$(getVersion)
-major_version=$(expr $current_version : '\(.*\)\..*\..*\-SNAPSHOT')
-minor_version=$(expr $current_version : '.*\.\(.*\)\..*\-SNAPSHOT')
-bugfix_version=$(expr $current_version : '.*\..*\.\(.*\)-SNAPSHOT')
-version="$major_version.$minor_version.0"
-previous_version="$major_version.$(expr $minor_version - 1).0"
-
-# Check if the changelog has the issues of 6.x
-
-grep -q "$version\$" CHANGELOG-6.x
-if [ $? -ne 0 ] ; then
- fail "
-You have forgotten to add the closed tickets for Wicket $version to the CHANGELOG-6.x file
-
-Go to https://issues.apache.org/jira/secure/ConfigureReleaseNote.jspa?projectId=12310561
-and export the issues to the changelog.
-"
-fi
-
-echo "This script will release version: Apache Wicket $version"
-echo ""
-echo "Press enter to continue or CTRL-C to abort \c"
-read
-
-branch="build/wicket-$version"
-tag="wicket-$version"
-
-echo "Ensuring we are starting from wicket-6.x"
-# otherwise we can't remove a previous release branch that failed
-git checkout wicket-6.x
-
-echo "Cleaning up any release artifacts that might linger"
-mvn -q release:clean
-
-echo "Removing previous release tag $tag (if exists)"
-oldtag=`git tag -l |grep -e "$tag"|wc -l`
-[ "$oldtag" -ne 0 ] && git tag -d $tag
-
-echo "Removing previous build branch $branch (if exists)"
-oldbranch=`git branch |grep -e "$branch"|wc -l`
-[ "$oldbranch" -ne 0 ] && git branch -D $branch
-
-git checkout -b $branch
-
-# Clear the current NOTICE.txt file
-echo "Creating notice file."
-
-NOTICE=NOTICE
-
-echo "Apache Wicket
-Copyright 2006-$(date +%Y) The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This is an aggregated NOTICE file for the Apache Wicket projects included
-in this distribution.
-
-NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE
- NOTICE FILE OF THE CORRESPONDING PROJECT. THE RELEASE PROCEDURE WILL
- AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE.
-" > $NOTICE
-
-# next concatenate all NOTICE files from sub projects to the root file
-for i in `find . -name "NOTICE" -not -regex ".*/target/.*" -not -regex "./NOTICE"`
-do
- echo "---------------------------------------------------------------------------" >> $NOTICE
- echo "src/"$i | sed -e "s/\/src.*//g" >> $NOTICE
- echo "---------------------------------------------------------------------------" >> $NOTICE
- cat $i >> $NOTICE
- echo >> $NOTICE
-done
-
-echo "Fixing the quickstart to use the correct wicket version"
-sed -e "s/\<wicket\.version\>.*\<\/wicket\.version\>/\<wicket.version\>$version\<\/wicket.version\>/g" -i "" archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
-
-echo "Committing changes"
-git commit -am "Changes to notice files and quickstart archetype"
-
-# clean all projects
-echo "Clean all projects"
-mvn -q clean -Pall
-
-# package and assemble the release
-echo "Prepare the release"
-mvn --batch-mode release:prepare -DpreparationGoals="clean" -Dtag=$tag -Papache-release
-if [ $? -ne 0 ] ; then
- fail "ERROR: mvn release:prepare was not successful"
-fi
-
-# this needs to be done before signing the tag otherwise the snapshot version
-# is tagged
-#echo "Rollback the last commit of the release plugin"
-#git reset HEAD^ --hard >> $log
-
-#echo "Sign the tag"
-# TODO the git tag --sign doesn't utilize the gpg-agent for some reason
-#git tag --sign --force --message "Signed release tag for Apache Wicket $version" $tag >> $log
-
-echo "Performing the release using Maven"
-mvn -Dgpg.passphrase="$passphrase" -ff -l $log release:perform -DlocalCheckout=true -Dtag=$tag -Papache-release
-if [ $? -ne 0 ] ; then
- fail "ERROR: mvn release:perform was not successful"
-fi
-
-# Determine the staging repository and close it after deploying the release to the staging area
-stagingrepoid=$(mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-list -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https | grep -v "CLOSED" | grep -Eo "(orgapachewicket-\d+)";)
-
-echo "Closing staging repository with id $stagingrepoid"
-mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-close -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription="Release has been built, awaiting vote"
-
-
-echo "Create and sign the source tarballs"
-
-mkdir -p target/dist/binaries
-
-git archive --format=tar.gz --prefix=apache-wicket-$version/ -o target/dist/apache-wicket-$version.tar.gz $tag
-git archive --format=zip --prefix=apache-wicket-$version/ -o target/dist/apache-wicket-$version.zip $tag
-gpg --armor --detach-sign --use-agent --sign target/dist/apache-wicket-$version.tar.gz
-gpg --armor --detach-sign --use-agent --sign target/dist/apache-wicket-$version.zip
-gpg --print-md SHA1 target/dist/apache-wicket-$version.tar.gz > target/dist/apache-wicket-$version.tar.gz.sha
-gpg --print-md MD5 target/dist/apache-wicket-$version.tar.gz > target/dist/apache-wicket-$version.tar.gz.md5
-gpg --print-md SHA1 target/dist/apache-wicket-$version.zip > target/dist/apache-wicket-$version.zip.sha
-gpg --print-md MD5 target/dist/apache-wicket-$version.zip > target/dist/apache-wicket-$version.zip.md5
-
-echo "Create and sign the binaries"
-mkdir target/apache-wicket-$version-bin
-pushd target/apache-wicket-$version-bin
-find ../checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-.*.[jw]ar" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*" -type f -exec cp {} . \;
-find ../checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-.*.[jw]ar\.asc" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*" -type f -exec cp {} . \;
-cp ../../LICENSE .
-cp ../../README .
-cp ../../NOTICE .
-cp ../../CHANGELOG* .
-popd
-
-pushd target
-
-tar cfz dist/binaries/apache-wicket-$version-bin.tar.gz apache-wicket-$version-bin
-zip -r dist/binaries/apache-wicket-$version-bin.zip apache-wicket-$version-bin
-gpg --armor --detach-sign --use-agent --sign dist/binaries/apache-wicket-$version-bin.tar.gz
-gpg --armor --detach-sign --use-agent --sign dist/binaries/apache-wicket-$version-bin.zip
-gpg --print-md SHA1 dist/binaries/apache-wicket-$version-bin.tar.gz > dist/binaries/apache-wicket-$version-bin.tar.gz.sha
-gpg --print-md MD5 dist/binaries/apache-wicket-$version-bin.tar.gz > dist/binaries/apache-wicket-$version-bin.tar.gz.md5
-gpg --print-md SHA1 dist/binaries/apache-wicket-$version-bin.zip > dist/binaries/apache-wicket-$version-bin.zip.sha
-gpg --print-md MD5 dist/binaries/apache-wicket-$version-bin.zip > dist/binaries/apache-wicket-$version-bin.zip.md5
-popd
-
-echo "Uploading release to dist.apache.org"
-pushd target/dist
-svn mkdir https://dist.apache.org/repos/dist/dev/wicket/$version -m "Create $version release staging area"
-svn co --force --depth=empty https://dist.apache.org/repos/dist/dev/wicket/$version .
-cp ../../CHANGELOG* .
-svn add *
-svn commit -m "Upload wicket-$version to staging area"
-popd
-
-
-echo "========================================================================
-
-The signatures for the source release artefacts:
-
-" > /tmp/release-$version-sigs.txt
-
-pushd target/dist > /dev/null
-for i in apache-wicket*{zip,tar.gz}
-do
- echo "Signature for $i:
-
-$(cat $i.asc)
-" >> /tmp/release-$version-sigs.txt
-done
-popd > /dev/null
-
-echo "========================================================================
-
-CHANGELOG for $version:
-" >> /tmp/release-$version-sigs.txt
-
-awk "/Release Notes - Wicket - Version $version/{flag=1;next} /==================/{flag=0} flag { print }" CHANGELOG-6.x >> /tmp/release-$version-sigs.txt
-
-
-echo "Generating Vote email"
-
-echo "This is a vote to release Apache Wicket $version
-
-Please download the source distributions found in our staging area
-linked below.
-
-I have included the signatures for both the source archives. This vote
-lasts for 72 hours minimum.
-
-[ ] Yes, release Apache Wicket $version
-[ ] No, don't release Apache Wicket $version, because ...
-
-Distributions, changelog, keys and signatures can be found at:
-
- https://dist.apache.org/repos/dist/dev/wicket/$version
-
-Staging repository:
-
- https://repository.apache.org/content/repositories/$stagingrepoid/
-
-The binaries are available in the above link, as are a staging
-repository for Maven. Typically the vote is on the source, but should
-you find a problem with one of the binaries, please let me know, I can
-re-roll them some way or the other.
-
-" > release-vote.txt
-
-cat /tmp/release-$version-sigs.txt >> release-vote.txt
-
-echo "The Apache Wicket PMC is proud to announce Apache Wicket $version!
-
-This release marks another minor release of Wicket 6. Starting
-with Wicket 6 we use semantic versioning for the future development
-of Wicket, and as such no API breaks are present in this release
-compared to 6.0.0.
-
-New and noteworthy
-------------------
-
-<OPTIONAL>
-
-Using this release
-------------------
-
-With Apache Maven update your dependency to (and don't forget to
-update any other dependencies on Wicket projects to the same version):
-
-<dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- <version>$version</version>
-</dependency>
-
-Or download and build the distribution yourself, or use our
-convenience binary package
-
- * Source: http://www.apache.org/dyn/closer.cgi/wicket/$version
- * Binary: http://www.apache.org/dyn/closer.cgi/wicket/$version/binaries
-
-Upgrading from earlier versions
--------------------------------
-
-If you upgrade from 6.y.z this release is a drop in replacement. If
-you come from a version prior to 6.0.0, please read our Wicket 6
-migration guide found at
-
- * https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0
-
-Have fun!
-
-— The Wicket team
-
-" > release-announce.txt
-
-cat /tmp/release-$version-sigs.txt >> release-announce.txt
-
-# Done with the tasks, now print out the next things the release manager
-# needs to do
-
-mvn_version_to_replace="$major_version.$minor_version.1-SNAPSHOT"
-mvn_version_to_replace2="$major_version.$minor_version.0-SNAPSHOT"
-next_dev_version="$major_version.$(expr $minor_version + 1).0-SNAPSHOT"
-
-echo "
-The release has been created. It is up to you to check if the release is up
-to par, and perform the following commands yourself when you start the vote
-to enable future development during the vote and after.
-
-A vote email has been generated in release-vote.txt, you can copy/paste it using:
-
- cat release-vote.txt | pbcopy
-
-You can find the distribution in target/dist
-
- cd target/dist
-
-To verify all signatures:
-
- find . -name \"*.asc\" -exec gpg --verify {} \;
-
-To push the release branch to ASF git servers
-
- git push origin $branch:refs/heads/$branch
-
-To move the release from staging to the mirrors:
-
- svn mv https://dist.apache.org/repos/dist/dev/wicket/$version https://dist.apache.org/repos/dist/release/wicket -m \"Upload release to the mirrors\"
-
-Remove previous version $previous_version from the mirrors
-
- svn rm https://dist.apache.org/repos/dist/release/wicket/$previous_version -m \"Remove previous version from mirrors\"
-
-To sign the release tag issue the following three commands:
-
- git checkout $tag
- git tag --sign --force --message \"Signed release tag for Apache Wicket $version\" $tag >> $log
- git checkout $branch
-
-To renumber the next development iteration $next_dev_version:
-
- git checkout wicket-6.x
- mvn release:update-versions --batch-mode
- find . ! \\( -type d -name \"target\" -prune \\) -name pom.xml -exec sed -i \"\" -E \"s/$mvn_version_to_replace/$next_dev_version/g\" {} \\;
- find . ! \\( -type d -name \"target\" -prune \\) -name pom.xml -exec sed -i \"\" -E \"s/$mvn_version_to_replace/$next_dev_version/g\" {} \\;
- git add \`find . ! \\( -type d -name \"target\" -prune \\) -name pom.xml\`
- git commit -m \"Start next development version\"
- git push
-
-To release the Maven artefacts:
-
- mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-release -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription=\"Release vote has passed\"
-
-Or in case of a failed vote, to drop the staging repository:
-
- mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-drop -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription=\"Release vote has failed\"
-" > release.txt
-
-cat release.txt
-
http://git-wip-us.apache.org/repos/asf/wicket/blob/6caae75d/release-igor.sh
----------------------------------------------------------------------
diff --git a/release-igor.sh b/release-igor.sh
deleted file mode 100755
index 660dc2e..0000000
--- a/release-igor.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/sh
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e
-
-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:"
-read version
-
-echo "Enter your GPG passphrase (input will be hidden)"
-stty_orig=`stty -g`
-stty -echo
-read passphrase
-stty $stty_orig
-
-# test the GPGP passphrase to fail-fast:
-echo "$passphrase" | gpg --passphrase-fd 0 --armor --output pom.xml.asc --detach-sig pom.xml
-gpg --verify pom.xml.asc
-if [ $? -ne 0 ]; then
- echo "It appears that you fat-fingered your GPG passphrase"
- exit $?
-fi
-rm pom.xml.asc
-
-branch="build/wicket-$version"
-
-echo "Removing previous build branch $branch (if exists)"
-oldbranch=`git branch |grep -e "$branch"|wc -l`
-[ "$oldbranch" -ne 0 ] && git branch -D $branch
-
-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
-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"
-
-echo "Committing changes"
-git commit -am "modified poms for release $version"
-
-# Clear the current NOTICE.txt file
-echo "Creating notice file."
-
-NOTICE=NOTICE
-> $NOTICE
-echo "Apache Wicket" >> $NOTICE
-echo "Copyright 2006-$(date +%Y) The Apache Software Foundation" >> $NOTICE
-echo "" >> $NOTICE
-echo "This product includes software developed at" >> $NOTICE
-echo "The Apache Software Foundation (http://www.apache.org/)." >> $NOTICE
-echo "" >> $NOTICE
-echo "This is an aggregated NOTICE file for the Apache Wicket projects included" >> $NOTICE
-echo "in this distribution." >> $NOTICE
-echo "" >> $NOTICE
-echo "NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE" >> $NOTICE
-echo " NOTICE FILE OF THE CORRESPONDING PROJECT. THE RELEASE PROCEDURE WILL" >> $NOTICE
-echo " AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE." >> $NOTICE
-echo "" >> $NOTICE
-
-# next concatenate all NOTICE files from sub projects to the root file
-for i in `find . -name "NOTICE" -not -regex ".*/target/.*" -not -regex "./NOTICE"`
-do
- echo "---------------------------------------------------------------------------" >> $NOTICE
- echo "src/"$i | sed -e "s/\/src.*//g" >> $NOTICE
- echo "---------------------------------------------------------------------------" >> $NOTICE
- cat $i >> $NOTICE
- echo >> $NOTICE
-done
-
-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
-
-# clean all projects
-echo "Clean all projects"
-mvn5 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
-
-filename=`ls target/dist/apache-wicket*gz`
-gpg --print-md MD5 $filename > $filename.md5
-gpg --print-md SHA1 $filename > $filename.sha
-echo "$passphrase" | gpg --passphrase-fd 0 --armor --output $filename.asc --detach-sig $filename
-
-filename=`ls target/dist/apache-wicket*zip`
-gpg --print-md MD5 $filename > $filename.md5
-gpg --print-md SHA1 $filename > $filename.sha
-echo "$passphrase" | gpg --passphrase-fd 0 --armor --output $filename.asc --detach-sig $filename
-
-echo "Publishing build branch"
-git push origin $branch:refs/heads/$branch
-
-echo "Uploading release"
-svn export http://svn.apache.org/repos/asf/wicket/common/KEYS target/dist/KEYS
-ssh people.apache.org mkdir public_html/wicket-$version
-scp -r target/dist people.apache.org:public_html/wicket-$version
-
http://git-wip-us.apache.org/repos/asf/wicket/blob/6caae75d/release.sh
----------------------------------------------------------------------
diff --git a/release.sh b/release.sh
index bfa7f65..77a2dde 100755
--- a/release.sh
+++ b/release.sh
@@ -13,72 +13,609 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-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 your GPG passphrase (input will be hidden)"
-stty_orig=`stty -g`
-stty -echo
-read passphrase
-stty $stty_orig
-
-# test the GPGP passphrase to fail-fast:
-echo "$passphrase" | gpg --passphrase-fd 0 --armor --output pom.xml.asc --detach-sig pom.xml
-gpg --verify pom.xml.asc
-if [ $? -ne 0 ]; then
- echo "It appears that you fat-fingered your GPG passphrase"
- exit $?
+
+# set -e
+# set -x
+
+function fail {
+ >&2 echo "\033[31m
+FATAL ERROR
+-----------
+$1
+\033[0m"
+ exit 1
+}
+
+function getJavaVersionFromPom {
+ cat << EOF | xmllint --noent --shell pom.xml | grep content | cut -f2 -d=
+setns pom=http://maven.apache.org/POM/4.0.0
+xpath /pom:project/pom:properties/pom:maven.compiler.source/text()
+EOF
+}
+
+function getProjectVersionFromPom {
+ cat << EOF | xmllint --noent --shell pom.xml | grep content | cut -f2 -d=
+setns pom=http://maven.apache.org/POM/4.0.0
+xpath /pom:project/pom:version/text()
+EOF
+}
+
+function getJdkToolchain {
+ xmllint ~/.m2/toolchains.xml --xpath "/toolchains/toolchain[provides/version/text() = '$JAVA_VERSION']/configuration/jdkHome/text()"
+}
+
+function generate_promotion_script {
+ echo "Generating release promotion script 'promote-$version.sh'"
+read -d '' script <<- EOF
+#!/bin/sh
+echo -n "Promoting release $version
+
+Actions about to be performed:
+------------------------------
+
+\$(cat \$0 | tail -n +14)
+
+------------------------------------------
+Press enter to continue or CTRL-C to abort"
+
+read
+
+# push the build branch to ASF git repo
+
+git push origin $branch:refs/heads/$branch
+
+# push the release tag to ASF git repo
+
+git push origin $tag
+
+# promote the source distribution by moving it from the staging area to the release area
+
+svn mv https://dist.apache.org/repos/dist/dev/wicket/$version https://dist.apache.org/repos/dist/release/wicket -m "Upload release to the mirrors"
+
+mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-release -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription="Release vote has passed"
+
+# Renumber the next development iteration $next_version:
+
+git checkout $GIT_BRANCH
+mvn release:update-versions --batch-mode
+find . ! \( -type d -name "target" -prune \) -name pom.xml -exec sed -i "" -E "s/$mvn_version_to_replace/$next_version/g" {} \;
+find . ! \( -type d -name "target" -prune \) -name pom.xml -exec sed -i "" -E "s/$mvn_version_to_replace/$next_version/g" {} \;
+git add \` find . ! \( -type d -name "target" -prune \) -name pom.xml \`
+git commit -m "Start next development version"
+git push
+
+echo "Remove the previous version of Wicket using this command:
+
+ svn rm https://dist.apache.org/repos/dist/release/wicket/$previous_version -m \"Remove previous version from mirrors\"
+
+"
+EOF
+
+echo "$script" > promote-$version.sh
+ chmod +x promote-$version.sh
+ git add promote-$version.sh
+}
+
+function generate_rollback_script {
+ echo "Generating release rollback script 'revert-$version.sh'"
+read -d '' script <<- EOF
+#!/bin/sh
+echo -n "Reverting release $version
+
+Actions about to be performed:
+------------------------------
+
+\$(cat \$0 | tail -n +14)
+
+------------------------------------------
+Press enter to continue or CTRL-C to abort"
+
+read
+
+# clean up local repository
+git checkout $GIT_BRANCH
+git branch -D $branch
+git tag -d $tag
+
+# clean up staging repository
+git push staging --delete refs/heads/$branch
+git push staging --delete $tag
+
+# clean up staging dist area
+svn rm https://dist.apache.org/repos/dist/dev/wicket/$version -m "Release vote has failed"
+
+# clean up staging maven repository
+mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-drop -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription="Release vote has failed"
+
+# clean up remaining release files
+find . -name "*.releaseBackup" -exec rm {} \;
+[ -f release.properties ] && rm release.properties
+
+EOF
+echo "$script" > revert-$version.sh
+
+ chmod +x revert-$version.sh
+ git add revert-$version.sh
+}
+
+function generate_signatures_from_release {
+
+ echo "========================================================================
+
+ The signatures for the source release artefacts:
+
+ " > /tmp/release-$version-sigs.txt
+
+ pushd target/dist > /dev/null
+ for i in apache-wicket*{zip,tar.gz}
+ do
+ echo "Signature for $i:
+
+ $(cat $i.asc)
+ " >> /tmp/release-$version-sigs.txt
+ done
+ popd > /dev/null
+
+ echo "========================================================================
+
+ CHANGELOG for $version:
+ " >> /tmp/release-$version-sigs.txt
+
+ if [ -f "/tmp/release-notes-$version.txt" ] ; then
+ tail -n +4 /tmp/release-notes-$version.txt >> /tmp/release-$version-sigs.txt
+ else
+ awk "/Release Notes - Wicket - Version $version/{flag=1;next} /==================/{flag=0} flag { print }" CHANGELOG-$major_version.x >> /tmp/release-$version-sigs.txt
+ fi
+}
+
+function generate_release_vote_email {
+
+ echo "Generating Vote email"
+
+ echo "This is a vote to release Apache Wicket $version
+
+Please download the source distributions found in our staging area
+linked below.
+
+I have included the signatures for both the source archives. This vote
+lasts for 72 hours minimum.
+
+[ ] Yes, release Apache Wicket $version
+[ ] No, don't release Apache Wicket $version, because ...
+
+Distributions, changelog, keys and signatures can be found at:
+
+ https://dist.apache.org/repos/dist/dev/wicket/$version
+
+Staging repository:
+
+ https://repository.apache.org/content/repositories/$stagingrepoid/
+
+The binaries are available in the above link, as are a staging
+repository for Maven. Typically the vote is on the source, but should
+you find a problem with one of the binaries, please let me know, I can
+re-roll them some way or the other.
+
+Staging git repository data:
+
+ Repository: $(git config --get remote.staging.url)
+ Branch: $branch
+ Release tag: $tag
+
+" > release-vote.txt
+
+ cat /tmp/release-$version-sigs.txt >> release-vote.txt
+ git add release-vote.txt
+}
+
+function generate_announce_email {
+ echo "The Apache Wicket PMC is proud to announce Apache Wicket $version!
+
+This release marks another minor release of Wicket $major_version. We
+use semantic versioning for the development of Wicket, and as such no
+API breaks are present breaks are present in this release compared to
+$major_version.0.0.
+
+New and noteworthy
+------------------
+
+<OPTIONAL>
+
+Using this release
+------------------
+
+With Apache Maven update your dependency to (and don't forget to
+update any other dependencies on Wicket projects to the same version):
+
+<dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ <version>$version</version>
+</dependency>
+
+Or download and build the distribution yourself, or use our
+convenience binary package
+
+ * Source: http://www.apache.org/dyn/closer.cgi/wicket/$version
+ * Binary: http://www.apache.org/dyn/closer.cgi/wicket/$version/binaries
+
+Upgrading from earlier versions
+-------------------------------
+
+If you upgrade from $major_version.y.z this release is a drop in replacement. If
+you come from a version prior to $major_version.0.0, please read our Wicket $major_version
+migration guide found at
+
+ * http://s.apache.org/wicket${major_version}migrate
+
+Have fun!
+
+— The Wicket team
+
+ " > release-announce.txt
+
+ cat /tmp/release-$version-sigs.txt >> release-announce.txt
+ git add release-announce.txt
+}
+
+# the branch on which the code base lives for this version (master is
+# always current development version)
+GIT_BRANCH=wicket-6.x
+
+JAVA_VERSION=$(getJavaVersionFromPom)
+
+echo "
+Apache Wicket Release script
+----------------------------
+Building a release for Apache Wicket.
+
+This script assumes you are running on OS X, it hasn't been tested on any other
+operating systems, and you can bet it won't work on Windows...
+
+REQUIREMENTS:
+
+ - A Java version $JAVA_VERSION configured through the Maven toolchain
+ - Maven 3.3.0 (older releases are b0rked, just don't bother)
+ - gpg, gpg-agent and pinentry for signing
+"
+
+if [ ! $( git config --get remote.staging.url ) ] ; then
+ fail "
+No staging remote git repository found. The staging repository is used to temporarily
+publish the build artifacts during the voting process. Since no staging repository is
+available at Apache, it is best to use a git mirror on your personal github account.
+
+First fork the github Apache Wicket mirror (https://github.com/apache/wicket) and then
+add the remote staging repository with the following command:
+
+ $ git remote add staging git@github.com:<your github username>/wicket.git
+ $ git fetch staging
+ $ git push staging
+
+This will bring the staging area in sync with the origin and the release script can
+push the build branch and the tag to the staging area.
+"
+fi
+
+if [ ! -f ~/.m2/toolchains.xml ] ; then
+ fail "
+Maven will load the Java $JAVA_VERSION environment from the toolchain specified in
+~/.m2/toolchains.xml
+
+You don't have a toolchains.xml file in your .m2 folder. Please specify your
+JDK's in the toolchains.xml file.
+"
fi
-rm pom.xml.asc
+
+grep -q "<version>$JAVA_VERSION</version>" ~/.m2/toolchains.xml
+
+if [ $? -ne 0 ] ; then
+ fail "
+Your ~/.m2/toolchains.xml file doesn't provide a Java $JAVA_VERSION toolchain.
+"
+fi
+
+echo "Java version for running Maven is: $(java -version 2>&1 | tail -n 2 | head -n 1)
+Java used to compile (from toolchain) is: $(getJdkToolchain)
+"
+
+agentcount=`ps aux|grep gpg-agent|wc -l`
+
+current_version=$(getProjectVersionFromPom)
+major_version=$(expr $current_version : '\(.*\)\..*\..*\-.*')
+minor_version=$(expr $current_version : '.*\.\(.*\)\..*\-.*')
+bugfix_version=$(expr $current_version : '.*\..*\.\(.*\)-.*')
+version="$major_version.$minor_version.0"
+
+default_version="$version"
+
+version=
+
+while [[ ! $version =~ ^[0-9]+\.[0-9]+\.[0-9]+(-M[0-9]+)?$ ]]
+do
+ read -p "Version to release (default is $default_version): " -e t1
+ if [ -n "$t1" ]
+ then
+ version="$t1"
+ else
+ version="$default_version"
+ fi
+done
+
+# recalculate the version coordinates for the current release
+major_version=$(expr $version : '\(.*\)\..*\..*')
+minor_version=$(expr $version : '.*\.\(.*\)\..*')
+bugfix_version=$(expr $version : '.*\..*\.\(.*\)')
+
+if [[ $version =~ .+-M[0-9]+ ]]
+then
+ milestone_version=$(expr $version : '.*\..*-M\(.*\)')
+fi
+
+if [ ! -z "$milestone_version" ] ; then
+ next_version="$major_version.0.0-SNAPSHOT"
+ previous_version="$major_version.0.0-SNAPSHOT"
+else
+ next_version="$major_version.$(expr $minor_version + 1).0-SNAPSHOT"
+ previous_minor_version=$(expr $minor_version - 1)
+ if [ $previous_minor_version -lt 0 ] ; then
+ previous_version="$major_version.0.0-SNAPSHOT"
+ else
+ previous_version="$major_version.$(expr $minor_version - 1).0"
+ fi
+fi
+
+# work around for versions upgrade (TODO maybe no longer necessary?)
+mvn_version_to_replace="$major_version.$minor_version.1-SNAPSHOT"
+mvn_version_to_replace2="$major_version.$minor_version.0-SNAPSHOT"
+
+# Check if the changelog has the issues this release
+
+grep -q "$version\$" CHANGELOG-$major_version.x
+if [ $? -ne 0 ] ; then
+ fail "You have forgotten to add the closed tickets for Wicket $version to the CHANGELOG-$major_version.x file
+
+Use build-changelog.sh to add the release notes to the changelog.
+"
+fi
+
+git status --porcelain CHANGELOG-$major_version.x | grep -q "M"
+if [ $? -eq 0 ] ; then
+ fail "You have changes in your workspace that have not been committed.
+
+$(git status)
+"
+fi
+
+echo "Cleaning up any release artifacts that might linger"
+mvn -q release:clean
+
+log=$(pwd)/release.out
+
+if [ -f $log ] ; then
+ rm $log
+fi
+
+branch="build/wicket-$version"
+tag="wicket-$version"
+
+echo "# Release configuration for Wicket-$version
+scm.tag=${tag}
+" > release.properties
+
+./build-versions.py $version $next_version >> release.properties
+
+echo "Contents of the release properties generated for Maven:
+-------------------------------------------------------------------------------
+$(cat ./release.properties)
+-------------------------------------------------------------------------------
+
+Writing detailed log to $log
+
+This script will release version: Apache Wicket $version and continue
+development with $next_version
+
+Press enter to continue or CTRL-C to abort \c"
+read
+
+echo "Ensuring we are starting from wicket-$major_version.x"
+# otherwise we can't remove a previous release branch that failed
+git checkout $GIT_BRANCH
+
+echo "Removing previous release tag $tag (if exists)"
+oldtag=`git tag -l |grep -e "$tag"|wc -l` >> release.out
+[ "$oldtag" -ne 0 ] && git tag -d $tag >> release.out
+
+echo "Removing previous build branch $branch (if exists)"
+oldbranch=`git branch |grep -e "$branch"|wc -l` >> release.out
+[ "$oldbranch" -ne 0 ] && git branch -D $branch >> release.out
+
+echo "Removing previous staging branch (if exists)"
+git push staging --delete refs/heads/$branch >> release.out
+git push staging --delete $tag >> release.out
+
+
+echo "Creating release branch"
+git checkout -b $branch >> release.out
# Clear the current NOTICE.txt file
echo "Creating notice file."
NOTICE=NOTICE
-> $NOTICE
-echo "Apache Wicket" >> $NOTICE
-echo "Copyright 2006-$(date +%Y) The Apache Software Foundation" >> $NOTICE
-echo "" >> $NOTICE
-echo "This product includes software developed at" >> $NOTICE
-echo "The Apache Software Foundation (http://www.apache.org/)." >> $NOTICE
-echo "" >> $NOTICE
-echo "This is an aggregated NOTICE file for the Apache Wicket projects included" >> $NOTICE
-echo "in this distribution." >> $NOTICE
-echo "" >> $NOTICE
-echo "NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE" >> $NOTICE
-echo " NOTICE FILE OF THE CORRESPONDING PROJECT. THE RELEASE PROCEDURE WILL" >> $NOTICE
-echo " AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE." >> $NOTICE
-echo "" >> $NOTICE
+
+echo "Apache Wicket
+Copyright 2006-$(date +%Y) The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This is an aggregated NOTICE file for the Apache Wicket projects included
+in this distribution.
+
+NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE
+ NOTICE FILE OF THE CORRESPONDING PROJECT. THE RELEASE PROCEDURE WILL
+ AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE.
+" > $NOTICE
# next concatenate all NOTICE files from sub projects to the root file
for i in `find . -name "NOTICE" -not -regex ".*/target/.*" -not -regex "./NOTICE"`
do
- echo "---------------------------------------------------------------------------" >> $NOTICE
- echo "src/"$i | sed -e "s/\/src.*//g" >> $NOTICE
- echo "---------------------------------------------------------------------------" >> $NOTICE
- cat $i >> $NOTICE
- echo >> $NOTICE
+ echo "---------------------------------------------------------------------------" >> $NOTICE
+ echo "src/"$i | sed -e "s/\/src.*//g" >> $NOTICE
+ echo "---------------------------------------------------------------------------" >> $NOTICE
+ cat $i >> $NOTICE
+ echo >> $NOTICE
done
+echo "Fixing the quickstart to use the correct wicket version"
+sed -e "s/\<wicket\.version\>.*\<\/wicket\.version\>/\<wicket.version\>$version\<\/wicket.version\>/g" -i "" archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+
+echo "Committing changes"
+git commit -am "Changes to notice files and quickstart archetype"
+
# clean all projects
echo "Clean all projects"
-mvn5 clean -Pall
+mvn -q 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
-
-filename=`ls target/dist/apache-wicket*gz`
-gpg --print-md MD5 $filename > $filename.md5
-gpg --print-md SHA1 $filename > $filename.sha
-echo "$passphrase" | gpg --passphrase-fd 0 --armor --output $filename.asc --detach-sig $filename
-
-filename=`ls target/dist/apache-wicket*zip`
-gpg --print-md MD5 $filename > $filename.md5
-gpg --print-md SHA1 $filename > $filename.sha
-echo "$passphrase" | gpg --passphrase-fd 0 --armor --output $filename.asc --detach-sig $filename
+echo "Prepare the release"
+mvn --batch-mode release:prepare -l $log -DpreparationGoals="clean" -Dtag=$tag -Papache-release,release
+if [ $? -ne 0 ] ; then
+ fail "ERROR: mvn release:prepare was not successful"
+fi
+
+echo "Performing the release using Maven"
+mvn -Dgpg.passphrase="$passphrase" -ff -l $log release:perform -DlocalCheckout=true -Dtag=$tag -Papache-release,release
+if [ $? -ne 0 ] ; then
+ fail "ERROR: mvn release:perform was not successful"
+fi
+
+# Determine the staging repository and close it after deploying the release to the staging area
+stagingrepoid=$(mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-list -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https | grep -v "CLOSED" | grep -Eo "(orgapachewicket-\d+)";)
+
+echo "Closing staging repository with id $stagingrepoid"
+mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-close -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription="Release has been built, awaiting vote"
+
+generate_promotion_script
+generate_rollback_script
+
+echo "Create and sign the source tarballs"
+
+mkdir -p target/dist/binaries
+
+git archive --format=tar.gz --prefix=apache-wicket-$version/ -o target/dist/apache-wicket-$version.tar.gz $tag
+git archive --format=zip --prefix=apache-wicket-$version/ -o target/dist/apache-wicket-$version.zip $tag
+gpg --armor --detach-sign --use-agent --sign target/dist/apache-wicket-$version.tar.gz
+gpg --armor --detach-sign --use-agent --sign target/dist/apache-wicket-$version.zip
+gpg --print-md SHA1 target/dist/apache-wicket-$version.tar.gz > target/dist/apache-wicket-$version.tar.gz.sha
+gpg --print-md MD5 target/dist/apache-wicket-$version.tar.gz > target/dist/apache-wicket-$version.tar.gz.md5
+gpg --print-md SHA1 target/dist/apache-wicket-$version.zip > target/dist/apache-wicket-$version.zip.sha
+gpg --print-md MD5 target/dist/apache-wicket-$version.zip > target/dist/apache-wicket-$version.zip.md5
+
+echo "Create and sign the binaries"
+mkdir target/apache-wicket-$version-bin
+pushd target/apache-wicket-$version-bin
+find ../checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-.*.[jw]ar" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*" -type f -exec cp {} . \;
+find ../checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-.*.[jw]ar\.asc" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*" -type f -exec cp {} . \;
+cp ../../LICENSE .
+cp ../../README .
+cp ../../NOTICE .
+cp ../../CHANGELOG* .
+popd
+
+pushd target
+
+tar cfz dist/binaries/apache-wicket-$version-bin.tar.gz apache-wicket-$version-bin
+zip -r dist/binaries/apache-wicket-$version-bin.zip apache-wicket-$version-bin
+gpg --armor --detach-sign --use-agent --sign dist/binaries/apache-wicket-$version-bin.tar.gz
+gpg --armor --detach-sign --use-agent --sign dist/binaries/apache-wicket-$version-bin.zip
+gpg --print-md SHA1 dist/binaries/apache-wicket-$version-bin.tar.gz > dist/binaries/apache-wicket-$version-bin.tar.gz.sha
+gpg --print-md MD5 dist/binaries/apache-wicket-$version-bin.tar.gz > dist/binaries/apache-wicket-$version-bin.tar.gz.md5
+gpg --print-md SHA1 dist/binaries/apache-wicket-$version-bin.zip > dist/binaries/apache-wicket-$version-bin.zip.sha
+gpg --print-md MD5 dist/binaries/apache-wicket-$version-bin.zip > dist/binaries/apache-wicket-$version-bin.zip.md5
+popd
+
+echo "Uploading release to dist.apache.org"
+pushd target/dist
+svn mkdir https://dist.apache.org/repos/dist/dev/wicket/$version -m "Create $version release staging area"
+svn co --force --depth=empty https://dist.apache.org/repos/dist/dev/wicket/$version .
+cp ../../CHANGELOG* .
+svn add *
+svn commit -m "Upload wicket-$version to staging area"
+popd
+
+generate_signatures_from_release
+generate_release_vote_email
+generate_announce_email
+
+# Done with the tasks, now print out the next things the release manager
+# needs to do
+
+pushd target/dist
+find . -name "*.asc" -exec gpg --verify {} \;
+popd
+
+echo "
+The release has been created. It is up to you to check if the release is up
+to par, and perform the following commands yourself when you start the vote
+to enable future development during the vote and after.
+
+A vote email has been generated in release-vote.txt, you can copy/paste it using:
+
+ cat release-vote.txt | pbcopy
+
+You can find the distribution in target/dist.
+
+
+Failed release
+--------------
+
+To rollback a release due to a failed vote or some other complication use:
+
+ $ ./revert-$version.sh
+
+This will clean up the artfifacts from the staging areas, including Nexus,
+dist.apache.org and the release branch and tag.
+
+
+Successful release
+------------------
+
+Congratulations on the successful release vote!
+
+Use the release-announce.txt as a starter for the release announcement:
+
+ cat release-announce.txt | pbcopy
+
+To promote the release after a successful vote, run:
+
+ $ ./promote-$version.sh
+
+This will promote the Nexus staging repository to Maven Central, and move
+the release artifacts from the staging area to dist.apache.org. It will
+also sign the release tag and push the release branch to git.apache.org
+
+You can read this message at a later time using:
+
+ $ cat release.txt
+
+Happy voting!
+" > release.txt
+
+git add release.txt
+
+echo "Adding post-release scripts and vote/release email templates to build branch"
+git commit -m "Added post-release scripts and vote/release email templates"
+
+echo "Signing the release tag"
+git checkout $tag
+git tag --sign --force --message \"Signed release tag for Apache Wicket $version\" $tag >> $log
+git checkout $branch
+
+echo "Pushing build artifacts to the staging repository"
+git push staging $branch:refs/heads/$branch
+
+echo "Pushing release tag to the staging repository"
+git push staging $tag
+
+cat release.txt
http://git-wip-us.apache.org/repos/asf/wicket/blob/6caae75d/revert-release.sh
----------------------------------------------------------------------
diff --git a/revert-release.sh b/revert-release.sh
deleted file mode 100755
index 4002472..0000000
--- a/revert-release.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-function getVersion {
- cat << EOF | xmllint --noent --shell pom.xml | grep content | cut -f2 -d=
-setns pom=http://maven.apache.org/POM/4.0.0
-xpath /pom:project/pom:version/text()
-EOF
-}
-
-current_version=$(getVersion)
-major_version=$(expr $current_version : '\(.*\)\..*\..*\-SNAPSHOT')
-minor_version=$(expr $current_version : '.*\.\(.*\)\..*\-SNAPSHOT')
-bugfix_version=$(expr $current_version : '.*\..*\.\(.*\)-SNAPSHOT')
-version="$major_version.$minor_version.0"
-
-echo "Revert the current in-progress release for apache-wicket-$version"
-
-echo ""
-echo "Press enter to continue or CTRL-C to abort \c"
-read
-
-branch="build/wicket-$version"
-tag="wicket-$version"
-
-git checkout wicket-6.x
-git branch -D $branch
-git tag -d $tag
-
-svn rm https://dist.apache.org/repos/dist/dev/wicket/$version -m "Reverting release $version"
-
-find . -name "*.releaseBackup" -exec rm {} \;
-rm release.properties release.txt > /dev/null
-
-echo ""
-echo "Cleaned up the release"
-echo ""
-echo "Don't forget to drop the Maven staging repository"
-echo ""
[7/8] wicket git commit: [maven-release-plugin] prepare for next
development iteration
Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f939100b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f939100b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f939100b
Branch: refs/heads/build/wicket-6.21.0
Commit: f939100bbddb9a7755dd59a2f21a6165b62afc7b
Parents: 072b78d
Author: Martijn Dashorst <da...@apache.org>
Authored: Thu Oct 29 23:37:16 2015 +0100
Committer: Martijn Dashorst <da...@apache.org>
Committed: Thu Oct 29 23:37:16 2015 +0100
----------------------------------------------------------------------
archetypes/quickstart/pom.xml | 2 +-
pom.xml | 46 ++++++++++----------
testing/wicket-common-tests/pom.xml | 2 +-
testing/wicket-js-tests/pom.xml | 2 +-
wicket-auth-roles/pom.xml | 2 +-
wicket-bean-validation/pom.xml | 4 +-
wicket-cdi-1.1/pom.xml | 4 +-
wicket-cdi/pom.xml | 2 +-
wicket-core/pom.xml | 2 +-
wicket-datetime/pom.xml | 2 +-
wicket-devutils/pom.xml | 2 +-
wicket-examples/pom.xml | 2 +-
wicket-experimental/pom.xml | 3 +-
wicket-experimental/wicket-atmosphere/pom.xml | 4 +-
wicket-extensions/pom.xml | 2 +-
wicket-guice/pom.xml | 2 +-
wicket-ioc/pom.xml | 2 +-
wicket-jmx/pom.xml | 2 +-
wicket-native-websocket/pom.xml | 4 +-
.../wicket-native-websocket-core/pom.xml | 4 +-
.../wicket-native-websocket-jetty/pom.xml | 4 +-
.../wicket-native-websocket-jetty9/pom.xml | 4 +-
.../wicket-native-websocket-tomcat/pom.xml | 4 +-
wicket-objectsizeof-agent/pom.xml | 2 +-
wicket-request/pom.xml | 4 +-
wicket-spring/pom.xml | 2 +-
wicket-user-guide/pom.xml | 2 +-
wicket-util/pom.xml | 2 +-
wicket-velocity/pom.xml | 2 +-
wicket/pom.xml | 2 +-
30 files changed, 62 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml
index 43236ab..8bc87cb 100644
--- a/archetypes/quickstart/pom.xml
+++ b/archetypes/quickstart/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>wicket-archetype-quickstart</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 66b8b47..ad48455 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
</parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Wicket Parent</name>
<description>Wicket is a Java-based open source component web application framework.</description>
@@ -207,7 +207,7 @@
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/wicket.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/wicket.git</developerConnection>
<url>http://git-wip-us.apache.org/repos/asf/wicket/repo?p=wicket.git</url>
- <tag>wicket-6.21.0</tag>
+ <tag>HEAD</tag>
</scm>
<mailingLists>
<mailingList>
@@ -248,7 +248,7 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
- <version>6.21.0</version>
+ <version>6.22.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 -->
@@ -257,121 +257,121 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-cdi</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-devutils</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-guice</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-ioc</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-jmx</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-datetime</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-velocity</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-bean-validation</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-core</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-jetty</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-jetty9</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-tomcat</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket.experimental.wicket6</groupId>
<artifactId>wicket-atmosphere</artifactId>
- <version>0.24</version>
+ <version>0.25-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-cdi-1.1</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/testing/wicket-common-tests/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-common-tests/pom.xml b/testing/wicket-common-tests/pom.xml
index 2e8f1c7..469f1dd 100644
--- a/testing/wicket-common-tests/pom.xml
+++ b/testing/wicket-common-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.wicket</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/testing/wicket-js-tests/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml
index 4390d36..1c8ebec 100644
--- a/testing/wicket-js-tests/pom.xml
+++ b/testing/wicket-js-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>wicket-js-tests</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-auth-roles/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-auth-roles/pom.xml b/wicket-auth-roles/pom.xml
index 70e07f8..86d9c32 100644
--- a/wicket-auth-roles/pom.xml
+++ b/wicket-auth-roles/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-auth-roles</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-bean-validation/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml
index 9652f21..11a9370 100644
--- a/wicket-bean-validation/pom.xml
+++ b/wicket-bean-validation/pom.xml
@@ -4,11 +4,11 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-bean-validation</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<name>Wicket Bean Validation</name>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-cdi-1.1/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-cdi-1.1/pom.xml b/wicket-cdi-1.1/pom.xml
index e27ec3d..542b3bd 100644
--- a/wicket-cdi-1.1/pom.xml
+++ b/wicket-cdi-1.1/pom.xml
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-cdi-1.1</artifactId>
<packaging>jar</packaging>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<name>Wicket CDI 1.1</name>
<description>
Provides integration between Wicket and CDI containers. Enables injection of
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml
index 1282eb0..0600fd6 100644
--- a/wicket-cdi/pom.xml
+++ b/wicket-cdi/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-cdi</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index 3444bbb..bb83d51 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-core</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-datetime/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-datetime/pom.xml b/wicket-datetime/pom.xml
index 5a06eec..9c21fa9 100644
--- a/wicket-datetime/pom.xml
+++ b/wicket-datetime/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-datetime</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-devutils/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-devutils/pom.xml b/wicket-devutils/pom.xml
index ae378e1..f70378f 100644
--- a/wicket-devutils/pom.xml
+++ b/wicket-devutils/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-devutils</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-examples/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index b9f3675..956cf8b 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-experimental/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/pom.xml b/wicket-experimental/pom.xml
index 9ca8999..6921efd 100644
--- a/wicket-experimental/pom.xml
+++ b/wicket-experimental/pom.xml
@@ -20,11 +20,12 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.wicket.experimental.wicket6</groupId>
<artifactId>wicket-experimental</artifactId>
+ <version>6.21.1-SNAPSHOT</version>
<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>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-experimental/wicket-atmosphere/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/pom.xml b/wicket-experimental/wicket-atmosphere/pom.xml
index 24ecd2f..e8b2aea 100644
--- a/wicket-experimental/wicket-atmosphere/pom.xml
+++ b/wicket-experimental/wicket-atmosphere/pom.xml
@@ -20,11 +20,11 @@
<parent>
<groupId>org.apache.wicket.experimental.wicket6</groupId>
<artifactId>wicket-experimental</artifactId>
- <version>6.21.0</version>
+ <version>6.21.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-atmosphere</artifactId>
- <version>0.24</version>
+ <version>0.25-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<atmosphere.version>2.2.8</atmosphere.version>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-extensions/pom.xml b/wicket-extensions/pom.xml
index d7a6768..4aaae3c 100644
--- a/wicket-extensions/pom.xml
+++ b/wicket-extensions/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-guice/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-guice/pom.xml b/wicket-guice/pom.xml
index bd64dab..228dfc4 100644
--- a/wicket-guice/pom.xml
+++ b/wicket-guice/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-guice</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-ioc/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml
index bf9d4b0..d2bd9ac 100644
--- a/wicket-ioc/pom.xml
+++ b/wicket-ioc/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-ioc</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-jmx/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-jmx/pom.xml b/wicket-jmx/pom.xml
index 019e2ad..8485109 100644
--- a/wicket-jmx/pom.xml
+++ b/wicket-jmx/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-jmx</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-native-websocket/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/pom.xml b/wicket-native-websocket/pom.xml
index ea2b5b7..d67d6d1 100644
--- a/wicket-native-websocket/pom.xml
+++ b/wicket-native-websocket/pom.xml
@@ -20,11 +20,11 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-native-websocket</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Wicket Native WebSocket Parent</name>
<description>Wicket Native WebSocket provides native integration for WebSocket support with Servlet web containers.</description>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/pom.xml b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
index 49655d7..35f88b1 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
@@ -21,13 +21,13 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-native-websocket-core</artifactId>
<packaging>jar</packaging>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<name>Wicket Native WebSocket Core</name>
<description>Provides the common code needed for the different integrations with web container's WebSocket implementations</description>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-native-websocket/wicket-native-websocket-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-jetty/pom.xml b/wicket-native-websocket/wicket-native-websocket-jetty/pom.xml
index db57820..02411bc 100644
--- a/wicket-native-websocket/wicket-native-websocket-jetty/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-jetty/pom.xml
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-native-websocket-jetty</artifactId>
<packaging>jar</packaging>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<name>Wicket Native WebSocket Jetty</name>
<description>Provides the code specific to integrate with Jetty web container</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-native-websocket/wicket-native-websocket-jetty9/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-jetty9/pom.xml b/wicket-native-websocket/wicket-native-websocket-jetty9/pom.xml
index 336c95a..39c4a4d 100644
--- a/wicket-native-websocket/wicket-native-websocket-jetty9/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-jetty9/pom.xml
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-native-websocket-jetty9</artifactId>
<packaging>jar</packaging>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<name>Wicket Native WebSocket Jetty 9</name>
<description>Provides the code specific to integrate with Jetty 9 web container</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml b/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml
index 74085d4..d96abc6 100644
--- a/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-native-websocket-tomcat</artifactId>
<packaging>jar</packaging>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<name>Wicket Native WebSocket Tomcat 7.x</name>
<description>Provides the code specific to integrate with Tomcat web container</description>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-objectsizeof-agent/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-objectsizeof-agent/pom.xml b/wicket-objectsizeof-agent/pom.xml
index 83a5311..63984b1 100644
--- a/wicket-objectsizeof-agent/pom.xml
+++ b/wicket-objectsizeof-agent/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-objectsizeof-agent</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-request/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-request/pom.xml b/wicket-request/pom.xml
index d17e7ea..5b39e98 100755
--- a/wicket-request/pom.xml
+++ b/wicket-request/pom.xml
@@ -20,11 +20,11 @@
<parent>
<artifactId>wicket-parent</artifactId>
<groupId>org.apache.wicket</groupId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<name>Wicket Request</name>
<url>http://maven.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-spring/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-spring/pom.xml b/wicket-spring/pom.xml
index c71909a..7162540 100644
--- a/wicket-spring/pom.xml
+++ b/wicket-spring/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-spring</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-user-guide/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-user-guide/pom.xml b/wicket-user-guide/pom.xml
index 2506e19..475d97f 100644
--- a/wicket-user-guide/pom.xml
+++ b/wicket-user-guide/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-user-guide</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-util/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index 9b6697e..f2f5044 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-util</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket-velocity/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-velocity/pom.xml b/wicket-velocity/pom.xml
index 3335155..7ef3cee 100644
--- a/wicket-velocity/pom.xml
+++ b/wicket-velocity/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-velocity</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/f939100b/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/wicket/pom.xml b/wicket/pom.xml
index 7517ec0..9db4b34 100644
--- a/wicket/pom.xml
+++ b/wicket/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0</version>
+ <version>6.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket</artifactId>
[6/8] wicket git commit: [maven-release-plugin] prepare release
wicket-6.21.0
Posted by da...@apache.org.
[maven-release-plugin] prepare release wicket-6.21.0
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/072b78d9
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/072b78d9
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/072b78d9
Branch: refs/heads/build/wicket-6.21.0
Commit: 072b78d99d47d438c6786e878f20f762c17c1425
Parents: 50774b1
Author: Martijn Dashorst <da...@apache.org>
Authored: Thu Oct 29 23:37:16 2015 +0100
Committer: Martijn Dashorst <da...@apache.org>
Committed: Thu Oct 29 23:37:16 2015 +0100
----------------------------------------------------------------------
archetypes/quickstart/pom.xml | 2 +-
pom.xml | 46 ++++++++++----------
testing/wicket-common-tests/pom.xml | 2 +-
testing/wicket-js-tests/pom.xml | 2 +-
wicket-auth-roles/pom.xml | 2 +-
wicket-bean-validation/pom.xml | 4 +-
wicket-cdi-1.1/pom.xml | 4 +-
wicket-cdi/pom.xml | 2 +-
wicket-core/pom.xml | 2 +-
wicket-datetime/pom.xml | 2 +-
wicket-devutils/pom.xml | 2 +-
wicket-examples/pom.xml | 2 +-
wicket-experimental/pom.xml | 2 +-
wicket-experimental/wicket-atmosphere/pom.xml | 4 +-
wicket-extensions/pom.xml | 2 +-
wicket-guice/pom.xml | 2 +-
wicket-ioc/pom.xml | 2 +-
wicket-jmx/pom.xml | 2 +-
wicket-native-websocket/pom.xml | 4 +-
.../wicket-native-websocket-core/pom.xml | 4 +-
.../wicket-native-websocket-jetty/pom.xml | 4 +-
.../wicket-native-websocket-jetty9/pom.xml | 4 +-
.../wicket-native-websocket-tomcat/pom.xml | 4 +-
wicket-objectsizeof-agent/pom.xml | 2 +-
wicket-request/pom.xml | 4 +-
wicket-spring/pom.xml | 2 +-
wicket-user-guide/pom.xml | 2 +-
wicket-util/pom.xml | 2 +-
wicket-velocity/pom.xml | 2 +-
wicket/pom.xml | 2 +-
30 files changed, 61 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml
index 17d9147..43236ab 100644
--- a/archetypes/quickstart/pom.xml
+++ b/archetypes/quickstart/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>wicket-archetype-quickstart</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fced03f..66b8b47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
</parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<packaging>pom</packaging>
<name>Wicket Parent</name>
<description>Wicket is a Java-based open source component web application framework.</description>
@@ -207,7 +207,7 @@
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/wicket.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/wicket.git</developerConnection>
<url>http://git-wip-us.apache.org/repos/asf/wicket/repo?p=wicket.git</url>
- <tag>HEAD</tag>
+ <tag>wicket-6.21.0</tag>
</scm>
<mailingLists>
<mailingList>
@@ -248,7 +248,7 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</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 -->
@@ -257,121 +257,121 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-cdi</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-devutils</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-guice</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-ioc</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-jmx</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-datetime</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-velocity</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-bean-validation</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-core</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-jetty</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-jetty9</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-tomcat</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket.experimental.wicket6</groupId>
<artifactId>wicket-atmosphere</artifactId>
- <version>0.24-SNAPSHOT</version>
+ <version>0.24</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-cdi-1.1</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/testing/wicket-common-tests/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-common-tests/pom.xml b/testing/wicket-common-tests/pom.xml
index 1a6c620..2e8f1c7 100644
--- a/testing/wicket-common-tests/pom.xml
+++ b/testing/wicket-common-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.wicket</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/testing/wicket-js-tests/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml
index 2ac2b05..4390d36 100644
--- a/testing/wicket-js-tests/pom.xml
+++ b/testing/wicket-js-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>wicket-js-tests</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-auth-roles/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-auth-roles/pom.xml b/wicket-auth-roles/pom.xml
index ba848a3..70e07f8 100644
--- a/wicket-auth-roles/pom.xml
+++ b/wicket-auth-roles/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-auth-roles</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-bean-validation/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml
index 74b844a..9652f21 100644
--- a/wicket-bean-validation/pom.xml
+++ b/wicket-bean-validation/pom.xml
@@ -4,11 +4,11 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-bean-validation</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<name>Wicket Bean Validation</name>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-cdi-1.1/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-cdi-1.1/pom.xml b/wicket-cdi-1.1/pom.xml
index 01c42ea..e27ec3d 100644
--- a/wicket-cdi-1.1/pom.xml
+++ b/wicket-cdi-1.1/pom.xml
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-cdi-1.1</artifactId>
<packaging>jar</packaging>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<name>Wicket CDI 1.1</name>
<description>
Provides integration between Wicket and CDI containers. Enables injection of
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml
index dd81c76..1282eb0 100644
--- a/wicket-cdi/pom.xml
+++ b/wicket-cdi/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-cdi</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index 9b19045..3444bbb 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-core</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-datetime/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-datetime/pom.xml b/wicket-datetime/pom.xml
index 4a86901..5a06eec 100644
--- a/wicket-datetime/pom.xml
+++ b/wicket-datetime/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-datetime</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-devutils/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-devutils/pom.xml b/wicket-devutils/pom.xml
index ec3c865..ae378e1 100644
--- a/wicket-devutils/pom.xml
+++ b/wicket-devutils/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-devutils</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-examples/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index d88e06c..b9f3675 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-experimental/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/pom.xml b/wicket-experimental/pom.xml
index 670c1d6..9ca8999 100644
--- a/wicket-experimental/pom.xml
+++ b/wicket-experimental/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.wicket.experimental.wicket6</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-experimental/wicket-atmosphere/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/pom.xml b/wicket-experimental/wicket-atmosphere/pom.xml
index b885705..24ecd2f 100644
--- a/wicket-experimental/wicket-atmosphere/pom.xml
+++ b/wicket-experimental/wicket-atmosphere/pom.xml
@@ -20,11 +20,11 @@
<parent>
<groupId>org.apache.wicket.experimental.wicket6</groupId>
<artifactId>wicket-experimental</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-atmosphere</artifactId>
- <version>0.24-SNAPSHOT</version>
+ <version>0.24</version>
<packaging>jar</packaging>
<properties>
<atmosphere.version>2.2.8</atmosphere.version>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-extensions/pom.xml b/wicket-extensions/pom.xml
index a9f58a3..d7a6768 100644
--- a/wicket-extensions/pom.xml
+++ b/wicket-extensions/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-guice/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-guice/pom.xml b/wicket-guice/pom.xml
index c8f2f5b..bd64dab 100644
--- a/wicket-guice/pom.xml
+++ b/wicket-guice/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-guice</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-ioc/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml
index 2993825..bf9d4b0 100644
--- a/wicket-ioc/pom.xml
+++ b/wicket-ioc/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-ioc</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-jmx/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-jmx/pom.xml b/wicket-jmx/pom.xml
index 87a1f26..019e2ad 100644
--- a/wicket-jmx/pom.xml
+++ b/wicket-jmx/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-jmx</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-native-websocket/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/pom.xml b/wicket-native-websocket/pom.xml
index ea7f9b3..ea2b5b7 100644
--- a/wicket-native-websocket/pom.xml
+++ b/wicket-native-websocket/pom.xml
@@ -20,11 +20,11 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-native-websocket</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<packaging>pom</packaging>
<name>Wicket Native WebSocket Parent</name>
<description>Wicket Native WebSocket provides native integration for WebSocket support with Servlet web containers.</description>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-native-websocket/wicket-native-websocket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/pom.xml b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
index 61371aa..49655d7 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
@@ -21,13 +21,13 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-native-websocket-core</artifactId>
<packaging>jar</packaging>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<name>Wicket Native WebSocket Core</name>
<description>Provides the common code needed for the different integrations with web container's WebSocket implementations</description>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-native-websocket/wicket-native-websocket-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-jetty/pom.xml b/wicket-native-websocket/wicket-native-websocket-jetty/pom.xml
index cb948d4..db57820 100644
--- a/wicket-native-websocket/wicket-native-websocket-jetty/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-jetty/pom.xml
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-native-websocket-jetty</artifactId>
<packaging>jar</packaging>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<name>Wicket Native WebSocket Jetty</name>
<description>Provides the code specific to integrate with Jetty web container</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-native-websocket/wicket-native-websocket-jetty9/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-jetty9/pom.xml b/wicket-native-websocket/wicket-native-websocket-jetty9/pom.xml
index 8034ab7..336c95a 100644
--- a/wicket-native-websocket/wicket-native-websocket-jetty9/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-jetty9/pom.xml
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-native-websocket-jetty9</artifactId>
<packaging>jar</packaging>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<name>Wicket Native WebSocket Jetty 9</name>
<description>Provides the code specific to integrate with Jetty 9 web container</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml b/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml
index 22988db..74085d4 100644
--- a/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-native-websocket-tomcat</artifactId>
<packaging>jar</packaging>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<name>Wicket Native WebSocket Tomcat 7.x</name>
<description>Provides the code specific to integrate with Tomcat web container</description>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-objectsizeof-agent/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-objectsizeof-agent/pom.xml b/wicket-objectsizeof-agent/pom.xml
index 1a4549a..83a5311 100644
--- a/wicket-objectsizeof-agent/pom.xml
+++ b/wicket-objectsizeof-agent/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-objectsizeof-agent</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-request/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-request/pom.xml b/wicket-request/pom.xml
index f50464c..d17e7ea 100755
--- a/wicket-request/pom.xml
+++ b/wicket-request/pom.xml
@@ -20,11 +20,11 @@
<parent>
<artifactId>wicket-parent</artifactId>
<groupId>org.apache.wicket</groupId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
</parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<name>Wicket Request</name>
<url>http://maven.apache.org</url>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-spring/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-spring/pom.xml b/wicket-spring/pom.xml
index 3e4ab2f..c71909a 100644
--- a/wicket-spring/pom.xml
+++ b/wicket-spring/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-spring</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-user-guide/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-user-guide/pom.xml b/wicket-user-guide/pom.xml
index 5f93a13..2506e19 100644
--- a/wicket-user-guide/pom.xml
+++ b/wicket-user-guide/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-user-guide</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-util/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index c1d4ac6..9b6697e 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-util</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket-velocity/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-velocity/pom.xml b/wicket-velocity/pom.xml
index fc1e734..3335155 100644
--- a/wicket-velocity/pom.xml
+++ b/wicket-velocity/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-velocity</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/072b78d9/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/wicket/pom.xml b/wicket/pom.xml
index 613a9a4..7517ec0 100644
--- a/wicket/pom.xml
+++ b/wicket/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.21.0-SNAPSHOT</version>
+ <version>6.21.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket</artifactId>
[5/8] wicket git commit: Changes to notice files and quickstart
archetype
Posted by da...@apache.org.
Changes to notice files and quickstart archetype
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/50774b13
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/50774b13
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/50774b13
Branch: refs/heads/build/wicket-6.21.0
Commit: 50774b138fbc8e13018d19090fe7b7b7dc9fea62
Parents: c619623
Author: Martijn Dashorst <da...@apache.org>
Authored: Thu Oct 29 23:37:06 2015 +0100
Committer: Martijn Dashorst <da...@apache.org>
Committed: Thu Oct 29 23:37:06 2015 +0100
----------------------------------------------------------------------
NOTICE | 104 +++++++++----------
.../main/resources/archetype-resources/pom.xml | 2 +-
2 files changed, 52 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/50774b13/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 12c4f13..46f866d 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,21 +12,62 @@ NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE
AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE.
---------------------------------------------------------------------------
-src/./wicket-guice
+src/./wicket-core
---------------------------------------------------------------------------
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/).
- This product includes Guice, developed at Google, and licensed
- under the Apache License 2.0. (http://code.google.com/p/google-guice/).
+ 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-2011 Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Contains code of the Yahoo User Interface library (version: 2.8.2r1),
+ released under the BSD License:
+ http://developer.yahoo.net/yui/license.txt
+ Copyright (c) 2010, Yahoo! Inc.
+
+ This product includes software developed by
+ Joda.org (http://www.joda.org/).
+
---------------------------------------------------------------------------
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,56 +107,13 @@ src/./wicket-examples
which is released under CDDL 1.0 license (http://www.opensource.org/licenses/cddl1.php).
---------------------------------------------------------------------------
-src/./wicket-core
+src/./wicket-guice
---------------------------------------------------------------------------
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
-
- This product includes software developed by the jQuery Foundation (http://jquery.com/), released under MIT.
-
- 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/).
-
- Contains code of the Yahoo User Interface library (version: 2.8.2r1),
- released under the BSD License:
- http://developer.yahoo.net/yui/license.txt
- Copyright (c) 2010, Yahoo! Inc.
- This product includes software developed by
- Joda.org (http://www.joda.org/).
-
+ This product includes Guice, developed at Google, and licensed
+ under the Apache License 2.0. (http://code.google.com/p/google-guice/).
http://git-wip-us.apache.org/repos/asf/wicket/blob/50774b13/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 7a09811..57b0303 100644
--- a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
@@ -42,7 +42,7 @@
</license>
</licenses>
<properties>
- <wicket.version>6.20.0-SNAPSHOT</wicket.version>
+ <wicket.version>6.21.0</wicket.version>
<jetty.version>7.6.13.v20130916</jetty.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- allowed values: R7, 1.0, 1.5, 2.0 or none -->
[4/8] wicket git commit: Don't commit Eclipse metadata
Posted by da...@apache.org.
Don't commit Eclipse metadata
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3ee1cea0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3ee1cea0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3ee1cea0
Branch: refs/heads/build/wicket-6.21.0
Commit: 3ee1cea010ffd70478b4f8c0feeec0da376668e8
Parents: b9ea449
Author: Martijn Dashorst <da...@apache.org>
Authored: Thu Oct 29 23:25:50 2015 +0100
Committer: Martijn Dashorst <da...@apache.org>
Committed: Thu Oct 29 23:36:08 2015 +0100
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3ee1cea0/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9dda9e1..16ac05c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ velocity.log
**.project
**.classpath
**.settings/
+.metadata
**velocity.log*
*.idea/
*.iml
[3/8] wicket git commit: Stopped logging of exceptions during unit
tests
Posted by da...@apache.org.
Stopped logging of exceptions during unit tests
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f27173ca
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f27173ca
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f27173ca
Branch: refs/heads/build/wicket-6.21.0
Commit: f27173ca39653795f66502935a479a4185c9e445
Parents: 3ee1cea
Author: Martijn Dashorst <da...@apache.org>
Authored: Thu Oct 29 23:26:25 2015 +0100
Committer: Martijn Dashorst <da...@apache.org>
Committed: Thu Oct 29 23:36:08 2015 +0100
----------------------------------------------------------------------
wicket-core/src/test/java/log4j.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f27173ca/wicket-core/src/test/java/log4j.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/log4j.properties b/wicket-core/src/test/java/log4j.properties
index 76a9aff..3d0dfd6 100644
--- a/wicket-core/src/test/java/log4j.properties
+++ b/wicket-core/src/test/java/log4j.properties
@@ -9,10 +9,10 @@ log4j.rootLogger=INFO,Stdout
# changing back to ERROR. Looks like in some cases the log4j.properties
# in wicket gets picked which results in not printing the exceptions
# and that can be a bit dangerous (matej)
-log4j.logger.org.apache.wicket=ERROR
+log4j.logger.org.apache.wicket=FATAL
#log4j.logger.org.apache.wicket.resource=FATAL
#log4j.logger.org.apache.wicket.Localizer=FATAL
-
+log4j.logger.RequestCycleExtra=OFF
log4j.appender.Stdout=org.apache.log4j.ConsoleAppender
log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m\n