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/01/05 21:22:38 UTC

[1/3] git commit: Trying to fix the release process

Updated Branches:
  refs/heads/wicket-6.x a296b6c5e -> 44fd2e941


Trying to fix the release process

Apply fix for inability to release, see MRELEASE-812


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

Branch: refs/heads/wicket-6.x
Commit: 97cd11758ac4f5081ea0449cac2780ebed97931e
Parents: a296b6c
Author: Martijn Dashorst <ma...@gmail.com>
Authored: Tue Dec 24 21:41:28 2013 +0100
Committer: Martijn Dashorst <ma...@gmail.com>
Committed: Sun Jan 5 21:17:29 2014 +0100

----------------------------------------------------------------------
 pom.xml             | 17 +++++++++++++++--
 release-dashorst.sh |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/97cd1175/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cde9c60..b08bcb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.apache</groupId>
 		<artifactId>apache</artifactId>
-		<version>13</version>
+		<version>10</version>
 	</parent>
 	<groupId>org.apache.wicket</groupId>
 	<artifactId>wicket-parent</artifactId>
@@ -622,12 +622,25 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>2.4.2</version>
+					<version>2.3.2</version>
 					<inherited>true</inherited>
 					<configuration>
+						<localCheckout>true</localCheckout>
 						<pushChanges>false</pushChanges>
 						<tagNameFormat>wicket-@{project.version}</tagNameFormat>
 					</configuration>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.maven.scm</groupId>
+							<artifactId>maven-scm-api</artifactId>
+							<version>1.8.1</version>
+						</dependency>
+						<dependency>
+							<groupId>org.apache.maven.scm</groupId>
+							<artifactId>maven-scm-provider-gitexe</artifactId>
+							<version>1.8.1</version>
+						</dependency>
+					</dependencies>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>

http://git-wip-us.apache.org/repos/asf/wicket/blob/97cd1175/release-dashorst.sh
----------------------------------------------------------------------
diff --git a/release-dashorst.sh b/release-dashorst.sh
index fe173b8..e47c6a5 100755
--- a/release-dashorst.sh
+++ b/release-dashorst.sh
@@ -174,7 +174,7 @@ mvn -q clean -Pall
 
 # package and assemble the release
 echo "Prepare the release"
-mvn --batch-mode release:prepare -DpreparationGoals="clean" -Dtag=$tag -Papache-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


[2/3] git commit: Update change log for rebase of 6.13.0

Posted by da...@apache.org.
Update change log for rebase of 6.13.0


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

Branch: refs/heads/wicket-6.x
Commit: 4940d1c47c7167cbc36e524606e52a30acf161b8
Parents: 97cd117
Author: Martijn Dashorst <ma...@gmail.com>
Authored: Sun Jan 5 21:21:25 2014 +0100
Committer: Martijn Dashorst <ma...@gmail.com>
Committed: Sun Jan 5 21:21:25 2014 +0100

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


http://git-wip-us.apache.org/repos/asf/wicket/blob/4940d1c4/CHANGELOG-6.x
----------------------------------------------------------------------
diff --git a/CHANGELOG-6.x b/CHANGELOG-6.x
index dd5b97f..d7ac2ea 100644
--- a/CHANGELOG-6.x
+++ b/CHANGELOG-6.x
@@ -6,11 +6,15 @@ Release Notes - Wicket - Version 6.13.0
 
 ** Bug
 
+    * [WICKET-4294] - AutoCompleteTextField does not show suggestions when it is used on ModalWindow in InternetExplorer
     * [WICKET-4997] - Mounted bookmarkable Page not recreated on Session Expiry
     * [WICKET-5084] - ClassNotFoundException with Atmosphere on Bookmarkable pages
+    * [WICKET-5224] - ModalWindow is not visible in Safari when opened from a link at the bottom of a large page
+    * [WICKET-5321] - Incorporate Wicket Guide into website
     * [WICKET-5379] - IE7: AutoCompleteTextField inside a ModalWindow shows auto complete dropdown behind ModalWindow
     * [WICKET-5387] - Page#onInitialize called after an exception in the constructor of Page
     * [WICKET-5400] - Behaviors#internalAdd(Behavior) erroneously gets id for stateless behaviors
+    * [WICKET-5402] - NullPointerException when logging out with wicket-atmosphere
     * [WICKET-5404] - JQuery 1.10.1 does not work well with IE11, upgrade to 1.10.2
     * [WICKET-5409] - wicket-native-websocket does not work with Safari/Safari iOS
     * [WICKET-5413] - Positioning AutoCompleteTextField not correct on resized window
@@ -19,22 +23,44 @@ Release Notes - Wicket - Version 6.13.0
     * [WICKET-5422] - ComponentRenderer.renderComponent() adds a page to DataStore
     * [WICKET-5424] - Page.isPageStateless() returning true in regular run but false in WicketTester
     * [WICKET-5425] - WicketTester doesn't preserve the request cookies when #executeListener() is used
+    * [WICKET-5426] - Page not recognized as stateless although stateful component is hidden in #onConfigure()
+    * [WICKET-5429] - ResourceReference's properties are not preserved when using reference replacement
     * [WICKET-5437] - When a ConversionException is thrown, its message is not used in the ValidationError
+    * [WICKET-5441] - IResourceCachingStrategy implementations should only set caching if version matches
+    * [WICKET-5442] - TimeOfDay.valueOf(Calendar, Time) and TimeOfDay.valueOf(Time) incorrectly use 12-hour clock
+    * [WICKET-5444] - Make org.apache.wicket.pageStore.memory.PageTable public so custom impls of IDataStoreEvictionStrategy can be made
+    * [WICKET-5447] - TableTree's NodeBorder does not properly close divs
+    * [WICKET-5450] - Double escaping when using EnumChoiceRenderer and DropDownChoice
 
 ** Improvement
 
+    * [WICKET-4268] - Quality of ThumbnailImageResource
+    * [WICKET-4762] - IResourceVersion should be based on final result
+    * [WICKET-4905] - PagingNavigation: possible to call setStartIndex() earlier than onBeforeRender?
+    * [WICKET-4909] - ModalWindow overwrites window.onbeforeunload
+    * [WICKET-5364] - Reduce logging for wicket-atmosphere
     * [WICKET-5367] - migrate Wicket-Atmosphere to Atmosphere 2
     * [WICKET-5401] - provide no-argument constructor in string based header items
     * [WICKET-5411] - Improve AutoLabels by updating their CSS classes automatically during Ajax requests
     * [WICKET-5415] - Do not initialize pages which were not rendered
     * [WICKET-5420] - Make UploadProgressBar easier to extend
     * [WICKET-5423] - Create IResource based implementation of Native Web Sockets
+    * [WICKET-5435] - Ajaxified version of WebSession#getClientInfo should be added
     * [WICKET-5436] - Implement BigIntegerConverter
+    * [WICKET-5443] - Increase randomness and reduce predictability of CaptchaImageResource rendered images
+    * [WICKET-5445] - Make CaptchaImageResource easier to extend and reuse
+    * [WICKET-5455] - Allow access to the JS ResourceReference of AbstractAutoCompleteBehavior
+    * [WICKET-5456] - Make RawMarkup extendable
 
 ** Task
 
     * [WICKET-5431] - Download pages must use ASF mirror system for current releases
 
+** Wish
+
+    * [WICKET-1197] - add/remove all buttons in Palette component
+    * [WICKET-4951] - Wicket-cdi and OpenWebBeans 1.1.x incompatibility
+
 =============================================================================
 
 Release Notes - Wicket - Version 6.12.0


[3/3] git commit: Update apache pom to v13

Posted by da...@apache.org.
Update apache pom to v13


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

Branch: refs/heads/wicket-6.x
Commit: 44fd2e9413a1eea13c87c20632554ee883c884fb
Parents: 4940d1c
Author: Martijn Dashorst <ma...@gmail.com>
Authored: Sun Jan 5 21:22:23 2014 +0100
Committer: Martijn Dashorst <ma...@gmail.com>
Committed: Sun Jan 5 21:22:23 2014 +0100

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


http://git-wip-us.apache.org/repos/asf/wicket/blob/44fd2e94/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b08bcb4..841a9d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.apache</groupId>
 		<artifactId>apache</artifactId>
-		<version>10</version>
+		<version>13</version>
 	</parent>
 	<groupId>org.apache.wicket</groupId>
 	<artifactId>wicket-parent</artifactId>