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 2014/08/29 13:51:46 UTC

[1/5] git commit: Upgrade to Apache Parent 14

Repository: wicket
Updated Branches:
  refs/heads/master 013680019 -> ef44b7e3c


Upgrade to Apache Parent 14


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c0d8e73f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c0d8e73f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c0d8e73f

Branch: refs/heads/master
Commit: c0d8e73f3fc1ef53b463c45605957883680acf47
Parents: bdb75b9
Author: Martijn Dashorst <da...@apache.org>
Authored: Sun Aug 24 21:25:36 2014 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Sun Aug 24 21:25:36 2014 +0200

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/c0d8e73f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 00b6c7d..8fdafd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.apache</groupId>
 		<artifactId>apache</artifactId>
-		<version>10</version>
+		<version>14</version>
 	</parent>
 	<groupId>org.apache.wicket</groupId>
 	<artifactId>wicket-parent</artifactId>


[3/5] git commit: Added missing changes to log

Posted by da...@apache.org.
Added missing changes to log


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ca0d51fd
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ca0d51fd
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ca0d51fd

Branch: refs/heads/master
Commit: ca0d51fd1f09e0a5282d5812931c1b9461eb1ef7
Parents: 7750c23
Author: Martijn Dashorst <da...@apache.org>
Authored: Fri Aug 29 13:39:57 2014 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Fri Aug 29 13:40:01 2014 +0200

----------------------------------------------------------------------
 CHANGELOG-7.x | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/ca0d51fd/CHANGELOG-7.x
----------------------------------------------------------------------
diff --git a/CHANGELOG-7.x b/CHANGELOG-7.x
index 06b47fb..b1051ff 100644
--- a/CHANGELOG-7.x
+++ b/CHANGELOG-7.x
@@ -34,6 +34,11 @@ Release Notes - Wicket - Version 7.0.0-M3
     * [WICKET-5670] - org.apache.wicket.protocol.ws.api.registry.IKey should be Serializable (IClusterable)
     * [WICKET-5679] - RenderStrategy REDIRECT_TO_RENDER lets fail test with BaseWicketTester#startComponentInPage
     * [WICKET-5680] - AjaxEditableLabel keeps raw input after cancel following a validation failure 
+    * [WICKET-5682] - AbstractAjaxTimerBehavior fails to trigger
+    * [WICKET-5684] - Autocomplete example renders the search term
+    * [WICKET-5686] - @Inject should require the bean dependency instead of setting null
+    * [WICKET-5687] - content type in header is being lost when using a AbstractTransformerBehavior
+    * [WICKET-5688] - Restore the functionality an IPageManager to be able to clean all data/pages for the current session 
 
 ** Improvement
 
@@ -71,6 +76,7 @@ Release Notes - Wicket - Version 7.0.0-M3
     * [WICKET-5672] - Form#findSubmittingComponent() should not throw exceptions if the submitter is disabled/invisible
     * [WICKET-5673] - Improve BookmarkableMapper and BasicResourceReferenceMapper to not match when the last segment is empty
     * [WICKET-5674] - Use jquery.atmosphere.js as a Webjar
+    * [WICKET-5683] - PreviousButton isEnabled() should bo logical conjunction of getWizardModel().isPreviousAvailable() and super.isEnabled()
 
 ** Task
 


[5/5] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/wicket

Posted by da...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/wicket


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ef44b7e3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ef44b7e3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ef44b7e3

Branch: refs/heads/master
Commit: ef44b7e3cd3a8046a358b57fca0a26a6259989df
Parents: 1f084f6 0136800
Author: Martijn Dashorst <da...@apache.org>
Authored: Fri Aug 29 13:49:52 2014 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Fri Aug 29 13:49:52 2014 +0200

----------------------------------------------------------------------
 archetypes/quickstart/pom.xml                   |   4 +-
 pom.xml                                         |   5 +-
 testing/wicket-common-tests/pom.xml             |   4 +-
 wicket-auth-roles/pom.xml                       |   4 +-
 wicket-core/pom.xml                             |   4 +-
 .../java/org/apache/wicket/Application.java     |   2 -
 .../main/java/org/apache/wicket/Component.java  |   2 +-
 .../main/java/org/apache/wicket/Session.java    |   2 +-
 .../wicket/ajax/res/js/wicket-event-jquery.js   |   4 +
 .../wicket/markup/head/MetaDataHeaderItem.java  |   6 +
 .../AbstractTransformerBehavior.java            |   6 +
 .../wicket/markup/transformer/ITransformer.java |   3 +-
 .../org/apache/wicket/mock/MockPageManager.java |   2 +-
 .../apache/wicket/page/AbstractPageManager.java |   6 -
 .../org/apache/wicket/page/IPageManager.java    |   7 +-
 .../wicket/page/PageManagerDecorator.java       |  12 +-
 .../apache/wicket/page/PageStoreManager.java    |  59 +++---
 .../ListenerInterfaceRequestHandlerTest.java    |   2 +-
 wicket-datetime/pom.xml                         |   4 +-
 wicket-devutils/pom.xml                         |   4 +-
 wicket-examples/pom.xml                         |   4 +-
 .../wicket/examples/repeater/Contact.java       |  10 ++
 .../wicket/examples/spring/common/Contact.java  |  10 ++
 wicket-experimental/wicket-atmosphere/pom.xml   |  11 +-
 wicket-extensions/pom.xml                       |   4 +-
 .../html/autocomplete/wicket-autocomplete.js    |   4 +-
 .../wicket/extensions/wizard/CancelButton.java  |   2 +-
 .../wicket/extensions/wizard/FinishButton.java  |   3 +-
 .../wicket/extensions/wizard/LastButton.java    |   4 +-
 .../extensions/wizard/PreviousButton.java       |   2 +-
 wicket-guice/pom.xml                            |   4 +-
 .../wicket/guice/GuiceFieldValueFactory.java    |  17 +-
 .../wicket/guice/AbstractInjectorTest.java      | 179 +++++++++++++++++++
 .../wicket/guice/GuiceInjectInjectorTest.java   |  34 ++++
 .../apache/wicket/guice/GuiceInjectorTest.java  | 178 ------------------
 .../guice/JavaxInjectGuiceInjectorTest.java     |  40 ++++-
 .../wicket/guice/JavaxInjectTestComponent.java  |  16 +-
 .../wicket/guice/TestComponentInterface.java    |   1 -
 wicket-ioc/pom.xml                              |   4 +-
 wicket-jmx/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               |   4 +-
 wicket-request/pom.xml                          |   4 +-
 .../wicket/request/RequestHandlerStack.java     |   2 +-
 wicket-spring/pom.xml                           |   4 +-
 .../annot/AnnotProxyFieldValueFactory.java      |   3 +-
 .../annot/AnnotProxyFieldValueFactoryTest.java  |  22 +--
 ...axInjectAnnotProxyFieldValueFactoryTest.java |  29 ++-
 ...ringBeanAnnotProxyFieldValueFactoryTest.java |  34 ++++
 .../spring/injection/util/Injectable.java       |  64 -------
 .../injection/util/JavaxInjectInjectable.java   |  69 +++++++
 .../spring/injection/util/JavaxInjectable.java  |  66 -------
 .../injection/util/SpringBeanInjectable.java    |  63 +++++++
 wicket-util/pom.xml                             |   4 +-
 .../java/org/apache/wicket/util/diff/Delta.java |   4 +-
 .../util/license/XmlPrologHeaderHandler.java    |   3 +-
 .../org/apache/wicket/util/thread/Task.java     |   4 +-
 wicket-velocity/pom.xml                         |   4 +-
 61 files changed, 607 insertions(+), 465 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/ef44b7e3/pom.xml
----------------------------------------------------------------------


[2/5] git commit: Deploy configuration added

Posted by da...@apache.org.
Deploy configuration added


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7750c237
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7750c237
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7750c237

Branch: refs/heads/master
Commit: 7750c2371dc748264d12a261d5dfd14b4faf92a4
Parents: c0d8e73
Author: Martijn Dashorst <da...@apache.org>
Authored: Sun Aug 24 21:26:02 2014 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Sun Aug 24 21:26:02 2014 +0200

----------------------------------------------------------------------
 pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/7750c237/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8fdafd8..9bfd220 100644
--- a/pom.xml
+++ b/pom.xml
@@ -651,6 +651,14 @@
 			<plugins>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>2.8.1</version>
+					<configuration>
+						<retryFailedDeploymentCount>10</retryFailedDeploymentCount>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-install-plugin</artifactId>
 					<version>2.5.1</version>
 				</plugin>


[4/5] git commit: Get changes from 6.x build script

Posted by da...@apache.org.
Get changes from 6.x build script


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1f084f6f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1f084f6f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1f084f6f

Branch: refs/heads/master
Commit: 1f084f6f52787ffb7f76e4bded802ae5247484dc
Parents: ca0d51f
Author: Martijn Dashorst <da...@apache.org>
Authored: Fri Aug 29 13:49:41 2014 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Fri Aug 29 13:49:41 2014 +0200

----------------------------------------------------------------------
 release-milestone.sh | 108 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 91 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/1f084f6f/release-milestone.sh
----------------------------------------------------------------------
diff --git a/release-milestone.sh b/release-milestone.sh
index 18194d6..00ae4e8 100755
--- a/release-milestone.sh
+++ b/release-milestone.sh
@@ -88,7 +88,7 @@ operating systems, and you can bet it won't work on Windows...
 REQUIREMENTS:
 
  - a pure JDK 7 environment, JDK 8 or newer won't cut it
- - Maven 3.0.4 (older releases are b0rked, just don't bother)
+ - Maven 3.2.3
  - gpg, gpg-agent and pinentry for signing"
 
 export JAVA_HOME=`/usr/libexec/java_home -v1.7`
@@ -105,13 +105,26 @@ bugfix_version=$(expr $current_version : '.*\..*\.\(.*\)-SNAPSHOT')
 
 read -p "What is the version to be released? " version
 
-previous_version="$major_version.$(expr $minor_version - 1).0"
+current_milestone_version=$(expr $version : '.*-M(\d+)')
+
+#previous_version="$major_version.$(expr $minor_version - 1).0"
+previous_version="7.0.0-M$(expr $current_milestone_version - 1)"
 
 log=/tmp/wicketrelease-$version.out
 
 branch="build/wicket-$version"
 tag="wicket-$version"
 
+grep -q "$version\$" CHANGELOG-7.x
+if [ $? -ne 0 ] ; then
+	fail "
+You have forgotten to add the closed tickets for Wicket $version to the CHANGELOG-7.x file
+
+Go to https://issues.apache.org/jira/secure/ConfigureReleaseNote.jspa?projectId=12310561
+and export the issues to the changelog.
+"
+fi
+
 read -p "
 This script will release version: Apache Wicket $version and continue 
 development with 7.0.0-SNAPSHOT
@@ -137,10 +150,10 @@ oldbranch=`git branch |grep -e "$branch"|wc -l`
 
 git checkout -b $branch
 
-echo ""
-echo "# Release configuration for Wicket-$version" > release.properties
-echo "scm.tag=${tag}" >> release.properties
-echo >> release.properties
+echo "# Release configuration for Wicket-$version
+scm.tag=${tag}
+" > release.properties
+
 ./release-milestone.py $version 7.0.0-SNAPSHOT >> release.properties
 
 cat ./release.properties
@@ -207,6 +220,13 @@ if [ $? -ne 0 ] ; then
 	fail "ERROR: mvn release:perform was not successful"
 fi
 
+stagingrepoid=$(mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-list -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https |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
@@ -252,18 +272,72 @@ svn add *
 svn commit -m "Upload wicket-$version to staging area"
 popd
 
+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.
+
+========================================================================
+
+The signatures for the source release artefacts:
+
+" > release-vote.txt
+
+pushd target/dist > /dev/null
+for i in apache-wicket*{zip,tar.gz}
+do
+	echo "Signature for $i:
+
+$(cat $i.asc)
+" >> ../../release-vote.txt
+done
+popd > /dev/null
+
+echo "========================================================================
+
+CHANGELOG for $version:
+" >> release-vote.txt
+
+awk "/Release Notes - Wicket - Version $version/{flag=1;next} /==================/{flag=0} flag { print }" CHANGELOG-7.x >> release-vote.txt
+
 
 # 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.1-SNAPSHOT"
 mvn_version_to_replace2="$major_version.$minor_version.0-SNAPSHOT"
-next_dev_version="$major_version.$(expr $minor_version + 1).0-SNAPSHOT"
+next_dev_version="7.0.0-SNAPSHOT"
 
-echo "The release has been created. It is up to you to check if the release is up
+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
@@ -290,14 +364,14 @@ To sign the release tag issue the following three commands:
     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:
+To release the Maven artefacts:
 
-    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_replace2/$next_dev_version/g\" {} \\;
-    git add \`find . ! \\( -type d -name \"target\" -prune \\) -name pom.xml\`
-    git commit -m \"Start next development version\"
-    git push
+	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
 
-"