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/06/22 10:23:53 UTC
[1/9] wicket git commit: Added workspace uncommitted changes detection
Repository: wicket
Updated Branches:
refs/heads/master 0b6a46f77 -> 08f6c9ef5
Added workspace uncommitted changes detection
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3a9785fa
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3a9785fa
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3a9785fa
Branch: refs/heads/master
Commit: 3a9785fa4f60dcb078080728927482750a295197
Parents: e9944ee
Author: Martijn Dashorst <da...@apache.org>
Authored: Fri Jun 12 18:19:05 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Fri Jun 12 18:19:05 2015 +0200
----------------------------------------------------------------------
release-dashorst.sh | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3a9785fa/release-dashorst.sh
----------------------------------------------------------------------
diff --git a/release-dashorst.sh b/release-dashorst.sh
index a6d9a1e..e5ff22d 100755
--- a/release-dashorst.sh
+++ b/release-dashorst.sh
@@ -118,6 +118,14 @@ 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
+
log=$(pwd)/release.out
if [ -f $log ] ; then
[4/9] wicket git commit: Moved release:cleanup to better position
Posted by da...@apache.org.
Moved release:cleanup to better position
It appears that the mvn release:cleanup removes the release.properties
file, thus breaking the script.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f069fc5d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f069fc5d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f069fc5d
Branch: refs/heads/master
Commit: f069fc5dddc402c10a56861df24816fbe0e4333d
Parents: 847634e
Author: Martijn Dashorst <da...@apache.org>
Authored: Mon Jun 15 13:12:14 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Mon Jun 15 13:12:14 2015 +0200
----------------------------------------------------------------------
release-dashorst.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f069fc5d/release-dashorst.sh
----------------------------------------------------------------------
diff --git a/release-dashorst.sh b/release-dashorst.sh
index 80dac3c..d7bb3ea 100755
--- a/release-dashorst.sh
+++ b/release-dashorst.sh
@@ -126,6 +126,9 @@ $(git status)
"
fi
+echo "Cleaning up any release artifacts that might linger"
+mvn -q release:clean
+
log=$(pwd)/release.out
if [ -f $log ] ; then
@@ -158,9 +161,6 @@ 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 "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
[6/9] wicket git commit: Ask for release version,
with default from pom
Posted by da...@apache.org.
Ask for release version, with default from pom
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9c377b82
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9c377b82
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9c377b82
Branch: refs/heads/master
Commit: 9c377b822d9a817db8af67bd40ca1fb425df8b78
Parents: 4b582cc
Author: Martijn Dashorst <da...@apache.org>
Authored: Tue Jun 16 14:27:33 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Tue Jun 16 14:27:33 2015 +0200
----------------------------------------------------------------------
release-dashorst.sh | 45 +++++++++++++++++++++++++++++++++------------
1 file changed, 33 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c377b82/release-dashorst.sh
----------------------------------------------------------------------
diff --git a/release-dashorst.sh b/release-dashorst.sh
index d7bb3ea..317e5c4 100755
--- a/release-dashorst.sh
+++ b/release-dashorst.sh
@@ -38,6 +38,7 @@ function getJdkToolchain {
}
# set -e
+# set -x
# the branch on which the code base lives for this version (master is
# always current development version)
@@ -84,21 +85,41 @@ Java used to compile (from toolchain) is: $(getJdkToolchain)
agentcount=`ps aux|grep gpg-agent|wc -l`
-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 : '.*\..*-M\(.*\)')
- version="$major_version.$minor_version.0-M$milestone_version"
+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
- current_version=$(getProjectVersionFromPom)
- major_version=$(expr $current_version : '\(.*\)\..*\..*\-.*')
- minor_version=$(expr $current_version : '.*\.\(.*\)\..*\-.*')
- bugfix_version=$(expr $current_version : '.*\..*\.\(.*\)-.*')
- version="$major_version.$minor_version.0"
next_version="$major_version.$(expr $minor_version + 1).0-SNAPSHOT"
previous_minor_version=$(expr $minor_version - 1)
if [ $previous_minor_version -lt 0 ] ; then
[7/9] wicket git commit: Upgraded versions of plugins
Posted by da...@apache.org.
Upgraded versions of plugins
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7957658e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7957658e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7957658e
Branch: refs/heads/master
Commit: 7957658ee85a17b1e5d226efdbec44eba19dcbdd
Parents: 9c377b8
Author: Martijn Dashorst <da...@apache.org>
Authored: Tue Jun 16 16:18:16 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Tue Jun 16 16:18:16 2015 +0200
----------------------------------------------------------------------
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7957658e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 83f40c6..a89af95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,7 @@
<junit.version>4.12</junit.version>
<spring.version>4.1.6.RELEASE</spring.version>
<servlet-api.version>3.0.1</servlet-api.version>
- <maven.javadoc.version>2.10.2</maven.javadoc.version>
+ <maven.javadoc.version>2.10.3</maven.javadoc.version>
<maven.surefire.version>2.18</maven.surefire.version>
<mockito.version>1.10.16</mockito.version>
<slf4j.version>1.7.12</slf4j.version>
@@ -690,7 +690,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.8.2</version>
<configuration>
<retryFailedDeploymentCount>10</retryFailedDeploymentCount>
</configuration>
@@ -807,7 +807,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.5</version>
+ <version>2.5.2</version>
<inherited>true</inherited>
<configuration>
<pushChanges>false</pushChanges>
[2/9] wicket git commit: Added 7.0.0-M6 release notes
Posted by da...@apache.org.
Added 7.0.0-M6 release notes
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7756ff89
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7756ff89
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7756ff89
Branch: refs/heads/master
Commit: 7756ff89fa0923a996d4f70b49ed090b2762c160
Parents: 3a9785f
Author: Martijn Dashorst <da...@apache.org>
Authored: Fri Jun 12 18:19:44 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Fri Jun 12 18:19:44 2015 +0200
----------------------------------------------------------------------
CHANGELOG-7.x | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 94 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7756ff89/CHANGELOG-7.x
----------------------------------------------------------------------
diff --git a/CHANGELOG-7.x b/CHANGELOG-7.x
index 9cf92c3..af4d3a4 100644
--- a/CHANGELOG-7.x
+++ b/CHANGELOG-7.x
@@ -1,4 +1,97 @@
-This file contains all changes done in releases for Apache Wicket 7. x.
+This file contains all changes done in releases for Apache Wicket 7.x.
+
+=======================================================================
+
+Release Notes - Wicket - Version 7.0.0-M6
+
+** Bug
+
+ * [WICKET-5790] - VariableInterpolator & #getThrowExceptionOnMissingResource
+ * [WICKET-5814] - CryptoMapper clears feedback messages
+ * [WICKET-5816] - Apps can't use Application.setName instead of WicketFilter for e.g. JMX names
+ * [WICKET-5822] - AjaxSelfUpdatingTimer stops working after ajax download
+ * [WICKET-5825] - Deployment of wicket-examples.war fails in Tomcat
+ * [WICKET-5828] - PageProvider not serializable
+ * [WICKET-5834] - NPE in DefaultPropertyResolver
+ * [WICKET-5835] - InlineEnclosure doesn't call child.configure() before updating its visilbity
+ * [WICKET-5837] - JUnit tests may fail because of AbstractDefaultAjaxBehavior
+ * [WICKET-5838] - Last-modified header of external markup is ignored
+ * [WICKET-5841] - continueToOriginalDestination() discards new cookies
+ * [WICKET-5843] - CryptoMapper doesn't work with context relative UrlResourceReferences
+ * [WICKET-5845] - AuthenticatedWebSession.get() returns a new session with signedIn false
+ * [WICKET-5850] - LazyInitProxyFactory causes NoClassDefFound org/apache/wicket/proxy/ILazyInitProxy in case of multimodule deployment
+ * [WICKET-5851] - PackageResourceTest#packageResourceGuard test fails under Windows
+ * [WICKET-5853] - LongConverter converts some values greater than Long.MAX_VALUE
+ * [WICKET-5855] - RememberMe functionality seems to be broken after the change of the default crypt factory
+ * [WICKET-5856] - StackOverFlowError when working with transparent containers
+ * [WICKET-5857] - PagingNavigator invalid HTML (rel attribute on span tag)
+ * [WICKET-5858] - AjaxRequestTarget.focusComponent does not work in modal window
+ * [WICKET-5861] - BigDecimalConverter does not allow parsing of values great than Double.MAX_VALUE
+ * [WICKET-5862] - Wicket Container visibility bug
+ * [WICKET-5864] - Multipart Ajax form submit does not release the channel in case of connection failure
+ * [WICKET-5869] - Kittencaptcha doesn't calculate click y-coordinate correctly
+ * [WICKET-5870] - wicket-event-jquery.js: Wicket.Browser.isIE11() does not return boolean
+ * [WICKET-5874] - WicketTester TagTester does not work as expected when using non self closing tags
+ * [WICKET-5879] - Using an AjaxSubmitLink to hide its form results in an exception
+ * [WICKET-5881] - NPE in FormComponent#updateCollectionModel in case of no converted input and unmodifiable collection
+ * [WICKET-5883] - Feedback messages not cleared for invisible/disabled form components on submit.
+ * [WICKET-5887] - wicket.xsd refers to non-existing xhtml.label:attlist
+ * [WICKET-5891] - Parsing of ChinUnionPay credit card should use the first 6 characters
+ * [WICKET-5893] - CookieUtils should use the original response when saving a cookie
+ * [WICKET-5895] - validateHeaders fails to detect missing head/body (regression)
+ * [WICKET-5898] - StackOverflowError after form submit with a validation error
+ * [WICKET-5900] - Add WicketTester support for IAjaxLink
+ * [WICKET-5903] - Regression in mount resolution when using optional parameters
+ * [WICKET-5904] - NPE after editing a markup file in debug mode
+ * [WICKET-5906] - Use default on missing resource does not work
+ * [WICKET-5908] - A new HtmlHeaderContainer is added each time a page instance is rendered
+ * [WICKET-5910] - CGLib proxy should not intercept protected methods
+ * [WICKET-5911] - Re-rendering page after exception in render phase does not call onBeforeRender()
+ * [WICKET-5912] - NPE in Page#hasInvisibleTransparentChild
+ * [WICKET-5915] - The application can not find /META-INF/wicket/**.properties on Windows systems
+ * [WICKET-5916] - StackOverflowError when calling getObject() from load() in LDM
+ * [WICKET-5917] - Do not use jQuery's $ in String snippets in Java code
+
+** Improvement
+
+ * [WICKET-5314] - AbstractAutoCompleteBehavior does not support AjaxChannels
+ * [WICKET-5749] - Wicket-auth-roles should deal with resource authorization
+ * [WICKET-5789] - Make org.apache.wicket.protocol.ws.javax.WicketServerEndpointConfig publicly visible
+ * [WICKET-5801] - Responsive Images
+ * [WICKET-5823] - DefaultAuthenticationStrategy should be modified to reduce copy/paste while extending it's functionality
+ * [WICKET-5829] - rename PageSettings#recreateMountedPagesAfterExpiry
+ * [WICKET-5831] - Improve unsafe Id reporting in the AbstractRepeater
+ * [WICKET-5832] - Do not fail at CDI's ConversationPropagator when running in non-http thread
+ * [WICKET-5833] - Add a way to get all opened web socket connections per user session
+ * [WICKET-5840] - WicketTester doesn't support #clickLink() for ExternalLink component
+ * [WICKET-5859] - Add Hebrew and Arabic translations
+ * [WICKET-5860] - Cross-Site Websocket Hijacking protection
+ * [WICKET-5863] - Overiding disableCaching in ServletWebResponse is ignored when responce is buffered
+ * [WICKET-5865] - AjaxEditableLabel should implement IGenericComponent
+ * [WICKET-5872] - wicket extensions initializer.properties for greek language
+ * [WICKET-5875] - ComponentRenderer.renderComponent() unexpectedly produces a WicketRuntimeException when called with a nested Component which contains a nested wicket:message
+ * [WICKET-5889] - Ability to not submit a nested form
+ * [WICKET-5892] - add ClientProperties#isJavaScriptEnabled()
+ * [WICKET-5894] - Support *.woff2 webfonts in SecurePackageResourceGuard as well
+ * [WICKET-5901] - Leaving veil when ajax processing ends with redirect
+ * [WICKET-5905] - allow listening to Ajax calls before scheduling
+ * [WICKET-5921] - Provide a default implementation of IModelComparator that always returns false
+
+** New Feature
+
+ * [WICKET-5819] - Support for HTML 5 media tags (audio / video)
+ * [WICKET-5827] - Allow to apply multiple Javascript / CSS compressors
+ * [WICKET-5897] - Use the #isEnabled() method with validators
+ * [WICKET-5918] - Create an Image component that uses the new data: protocol (an InlineImage)
+ * [WICKET-5919] - Add support for CSRF prevention
+
+** Task
+
+ * [WICKET-5896] - Upgrade jQuery to latest stable versions (1.11.4 & 2.1.3)
+
+** Wish
+
+ * [WICKET-5848] - Remove .settings folders of projects
=======================================================================
[9/9] wicket git commit: Merge remote-tracking branch 'origin/master'
Posted by da...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/08f6c9ef
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/08f6c9ef
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/08f6c9ef
Branch: refs/heads/master
Commit: 08f6c9ef553527121680bd4c142f04acda0ed53c
Parents: 73119c6 0b6a46f
Author: Martijn Dashorst <da...@apache.org>
Authored: Mon Jun 22 10:23:37 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Mon Jun 22 10:23:37 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
.../java/org/apache/wicket/Application.java | 2 +-
.../mapper/AbstractResourceReferenceMapper.java | 156 --------------
.../mapper/BasicResourceReferenceMapper.java | 6 +-
.../core/request/mapper/ResourceMapper.java | 4 +-
.../apache/wicket/markup/html/MarkupUtil.java | 6 -
.../apache/wicket/markup/html/media/Source.java | 2 +-
.../apache/wicket/pageStore/DiskDataStore.java | 11 +-
.../wicket/pageStore/PerSessionPageStore.java | 2 +-
.../protocol/http/AbstractRequestLogger.java | 34 ++--
.../CsrfPreventionRequestCycleListener.java | 4 +-
.../wicket/protocol/http/IRequestLogger.java | 46 ++++-
.../http/mock/MockHttpServletRequest.java | 5 +-
.../protocol/http/mock/MockServletContext.java | 30 +--
.../request/handler/render/WebPageRenderer.java | 2 +-
.../request/resource/PackageResource.java | 18 +-
.../resource/PackageResourceReference.java | 74 ++++++-
.../apache/wicket/resource/ResourceUtil.java | 194 +++++++++++++++++-
.../org/apache/wicket/util/image/ImageUtil.java | 2 +-
.../wicket/util/tester/WicketTestCase.java | 202 +++++++++++++++++++
.../wicket/AttributeModifierComponentTest.java | 2 +-
.../org/apache/wicket/AuthorizationTest.java | 1 +
.../org/apache/wicket/BehaviorRequestTest.java | 1 +
.../java/org/apache/wicket/BehaviorUrlTest.java | 1 +
...entBehaviorOverComponentTagBehaviorTest.java | 1 +
.../wicket/ComponentConfigurationTest.java | 1 +
.../ComponentInitializationIntegrationTest.java | 1 +
.../wicket/ComponentInitializationTest.java | 1 +
.../apache/wicket/ComponentOnConfigureTest.java | 1 +
.../java/org/apache/wicket/ComponentTest.java | 1 +
.../ComponentWithLazyModelCreationTest.java | 1 +
...ceptionMapperResourceBlockedDevModeTest.java | 1 +
...eptionMapperResourceBlockedProdModeTest.java | 1 +
.../wicket/DefaultExceptionMapperTest.java | 1 +
.../apache/wicket/DisabledComponentTest.java | 1 +
.../org/apache/wicket/EventDispatcherTest.java | 1 +
.../org/apache/wicket/ExceptionMapperTest.java | 1 +
.../org/apache/wicket/FeedbackMessagesTest.java | 2 +-
.../apache/wicket/FormDispatchEventTest.java | 1 +
.../org/apache/wicket/MarkupContainerTest.java | 1 +
.../apache/wicket/MarkupIdGeneratorTest.java | 1 +
.../java/org/apache/wicket/PageFactoryTest.java | 1 +
.../apache/wicket/PageMarkupLoadingTest.java | 1 +
.../wicket/ParentResourceEscapePathTest.java | 1 +
.../org/apache/wicket/PlaceholderTagIdTest.java | 1 +
.../test/java/org/apache/wicket/RemoveTest.java | 1 +
.../org/apache/wicket/RequestEncodingTest.java | 1 +
.../java/org/apache/wicket/ResourceTest.java | 1 +
...ponseAtInterceptPageExceptionInAjaxTest.java | 1 +
...artResponseAtInterceptPageExceptionTest.java | 1 +
.../wicket/RestartResponseExceptionTest.java | 1 +
.../wicket/RestartWithMountedPageTest.java | 1 +
.../org/apache/wicket/SetResponsePageTest.java | 1 +
.../apache/wicket/SharedResourceUrlTest.java | 1 +
.../test/java/org/apache/wicket/TesterTest.java | 1 +
.../java/org/apache/wicket/VisitorTest.java | 2 +-
.../java/org/apache/wicket/WicketTestCase.java | 201 ------------------
.../ajax/AjaxBehaviorAndMetaDataTest.java | 2 +-
.../wicket/ajax/AjaxBehaviorEnabledTest.java | 2 +-
.../wicket/ajax/AjaxCallbackFunctionTest.java | 2 +-
.../org/apache/wicket/ajax/AjaxChannelTest.java | 2 +-
.../ajax/AjaxComponentVisibilityTest.java | 2 +-
.../wicket/ajax/AjaxEventBehaviorTest.java | 2 +-
.../wicket/ajax/AjaxHeaderContributionTest.java | 2 +-
.../wicket/ajax/AjaxRequestHandlerTest.java | 2 +-
.../wicket/ajax/AjaxTimerBehaviorTest.java | 2 +-
.../apache/wicket/ajax/DomReadyOrderTest.java | 2 +-
.../ajax/GlobalUpdateAjaxAttributesTest.java | 2 +-
.../InternalErrorCallsAjaxOnFailureTest.java | 2 +-
...FormChoiceComponentUpdatingBehaviorTest.java | 2 +-
.../ajax/form/AjaxFormSubmitBehaviorTest.java | 2 +-
.../wicket/ajax/form/AjaxFormSubmitTest.java | 2 +-
.../ajax/form/OnChangeAjaxBehaviorTest.java | 2 +-
.../ajax/markup/html/AjaxFallbackLinkTest.java | 2 +-
.../ajax/markup/html/ajaxLink/AjaxLinkTest.java | 2 +-
.../html/componentMap/SimpleTestPanelTest.java | 2 +-
.../ajax/markup/html/form/AjaxButtonTest.java | 2 +-
.../ComponentIsRenderedAllowedTest.java | 2 +-
.../behavior/ImmutableBehaviorIdsTest.java | 2 +-
.../wicket/behavior/SharedBehaviorTest.java | 2 +-
.../component/replacewith/ReplaceWithTest.java | 2 +-
.../ListenerInterfaceRequestHandlerTest.java | 2 +-
.../mapper/AbstractBookmarkableMapperTest.java | 2 +-
.../AbstractResourceReferenceMapperOwnTest.java | 5 +-
.../core/request/mapper/ResourceMapperTest.java | 2 +-
.../checker/DifferentPageCheckerTest.java | 2 +-
.../checker/OrphanComponentCheckerTest.java | 2 +-
.../objects/checker/SessionCheckerTest.java | 2 +-
.../resource/ClassPathResourceFinderTest.java | 2 +-
.../ComponentRendererTest.java | 2 +-
.../DontStoreNotRenderedPageTestCase.java | 2 +-
.../wicket/feedback/FeedbackRenderTest.java | 2 +-
.../InterceptDataCleanedAfterReadTest.java | 2 +-
.../ComponentTagAttributeEscapingTest.java | 2 +-
.../DefaultMarkupCacheKeyProviderTest.java | 2 +-
.../wicket/markup/HtmlProblemFinderTest.java | 2 +-
.../apache/wicket/markup/MarkupCacheTest.java | 2 +-
.../wicket/markup/MarkupFragmentTest.java | 2 +-
.../wicket/markup/MarkupInheritanceTest.java | 2 +-
.../apache/wicket/markup/MarkupParserTest.java | 2 +-
.../org/apache/wicket/markup/MarkupTest.java | 2 +-
.../wicket/markup/MarkupVariationTest.java | 2 +-
.../markup/RefreshingViewOnRemoveTest.java | 2 +-
.../wicket/markup/WicketNamespaceTest.java | 2 +-
.../wicket/markup/head/HeaderResponseTest.java | 2 +-
.../filter/FilteringHeaderResponseTest.java | 2 +-
.../markup/html/ComponentMarkupIdTest.java | 3 +-
.../html/DecoratingHeaderResponseTest.java | 2 +-
.../markup/html/HeaderContributorTest.java | 2 +-
.../wicket/markup/html/MarkupHeadFirstTest.java | 2 +-
.../markup/html/PackageResourceGuardTest.java | 2 +-
.../wicket/markup/html/PackageResourceTest.java | 2 +-
.../html/SecurePackageResourceGuardTest.java | 2 +-
.../html/TransparentWebMarkupContainerTest.java | 2 +-
.../apache/wicket/markup/html/WebPageTest.java | 2 +-
.../wicket/markup/html/XmlDeclResponseTest.java | 2 +-
.../AutocomponetsGenerationTest.java | 2 +-
.../html/autolink/AutoLinkInPanelsTest.java | 2 +-
.../markup/html/autolink/AutolinkTest.java | 2 +-
.../markup/html/basic/HomePageRedirectTest.java | 2 +-
.../wicket/markup/html/basic/LabelTest.java | 2 +-
.../markup/html/basic/SimplePageTest.java | 2 +-
.../html/basic/SimpleResponsePageClassTest.java | 2 +-
.../wicket/markup/html/basic/XmlPageTest.java | 2 +-
.../markup/html/border/ComponentBorderTest.java | 2 +-
.../html/debug/WicketComponentTreeTest.java | 2 +-
...tComponentConvertEmptyStringsToNullTest.java | 2 +-
.../html/form/AutoFormLabelPickupTest.java | 2 +-
.../wicket/markup/html/form/AutoLabelTest.java | 2 +-
.../html/form/AutoLabelWithContentTest.java | 2 +-
.../html/form/AutoLabelWithinEnclosureTest.java | 2 +-
.../wicket/markup/html/form/ButtonTest.java | 2 +-
.../html/form/CheckBoxMultipleChoiceTest.java | 2 +-
.../wicket/markup/html/form/CheckGroupTest.java | 2 +-
.../html/form/CollectionFormComponentTest.java | 2 +-
.../form/DisabledItemRetainingCheckBoxTest.java | 2 +-
.../markup/html/form/DropDownChoiceTest.java | 2 +-
.../form/FormComponentPanelProcessingTest.java | 2 +-
.../markup/html/form/FormComponentTest.java | 3 +-
.../form/FormParentDisabledRawInputTest.java | 2 +-
.../markup/html/form/FormSubmitOrderTest.java | 2 +-
.../wicket/markup/html/form/FormSubmitTest.java | 2 +-
.../wicket/markup/html/form/FormTest.java | 2 +-
...FormValidationDisabledFormComponentTest.java | 2 +-
.../html/form/FormWithMultipleButtonsTest.java | 2 +-
.../html/form/ListMultipleChoiceTest.java | 2 +-
.../html/form/LocalizedErrorMessageTest.java | 2 +-
.../markup/html/form/NestedFormSubmitTest.java | 2 +-
.../markup/html/form/NestedFormsTest.java | 2 +-
.../markup/html/form/NumberTextFieldTest.java | 2 +-
.../html/form/OnValidateModelObjectsTest.java | 2 +-
.../html/form/PrimitiveTypeRequiredTest.java | 2 +-
.../markup/html/form/RadioChoiceTest.java | 2 +-
.../wicket/markup/html/form/RadioGroupTest.java | 2 +-
.../markup/html/form/TestFormHasError.java | 2 +-
.../wicket/markup/html/form/TextAreaTest.java | 2 +-
.../wicket/markup/html/form/TextFieldTest.java | 2 +-
.../html/form/ValidatorPropertiesTest.java | 2 +-
.../markup/html/form/border/TestHomePage.java | 2 +-
.../html/form/border/TestHomePage_2134.java | 2 +-
.../markup/html/form/encryption/CryptTest.java | 2 +-
.../html/form/feedback/FormFeedbackTest.java | 2 +-
.../form/formComponentPanel/SimplePageTest.java | 2 +-
.../html/form/imagebutton/ImageButtonTest.java | 2 +-
.../imagebutton/InvalidImageButtonTest.java | 2 +-
.../markup/html/form/login/InterceptTest.java | 2 +-
.../html/form/panelBorder/TestHomePage.java | 2 +-
.../form/panelBorder/TestHomePage_2134.java | 2 +-
.../html/form/submitlink/TestHomePage.java | 2 +-
.../html/form/upload/FileUploadErrorTest.java | 2 +-
.../html/form/upload/FileUploadFieldTest.java | 2 +-
.../markup/html/form/upload/FileUploadTest.java | 2 +-
.../form/upload/MultiFileUploadFieldTest.java | 2 +-
.../validation/FormValidatorBehaviorTest.java | 2 +-
.../html/form/validation/HomePageTest.java | 2 +-
.../innerfeedback/InnerFeedbackTest.java | 2 +-
.../markup/html/header/HeaderScopingTest.java | 2 +-
.../header/inheritance/InheritanceHeadTest.java | 2 +-
.../markup/html/header/testing/HeaderTest.java | 2 +-
.../markup/html/header/testing2/HeaderTest.java | 2 +-
.../markup/html/header/testing3/HeaderTest.java | 2 +-
.../header/threelayers/InheritanceHeadTest.java | 2 +-
.../threelayers2/InheritanceHeadTest.java | 2 +-
.../markup/html/image/AjaxUpdatedImageTest.java | 2 +-
.../wicket/markup/html/image/ImageTest.java | 2 +-
.../markup/html/image/InlineImageTest.java | 2 +-
.../markup/html/image/InvalidImageTest.java | 2 +-
.../markup/html/image/NonCachingImageTest.java | 2 +-
.../markup/html/image/ResponsiveImageTest.java | 2 +-
.../markup/html/internal/AjaxEnclosureTest.java | 2 +-
.../markup/html/internal/EnclosureTest.java | 2 +-
.../html/internal/HtmlHeaderContainerTest.java | 2 +-
.../html/internal/InlineEnclosureTest.java | 2 +-
.../markup/html/internal/TogglePageTest.java | 2 +-
.../HtmlHeaderItemsContainerTest.java | 2 +-
.../markup/html/link/AbstractLinkTest.java | 2 +-
.../wicket/markup/html/link/AutolinkTest.java | 2 +-
.../link/BookmarkableHomePageLinksTest.java | 2 +-
.../html/link/BookmarkablePageLinkTest.java | 2 +-
.../html/link/ClientSideImageMapTest.java | 2 +-
.../markup/html/link/DownloadLinkTest.java | 2 +-
.../markup/html/link/ExternalLinkTest.java | 2 +-
.../wicket/markup/html/link/HrefTest.java | 2 +-
.../markup/html/link/MountedPageLinkTest.java | 2 +-
.../html/link/submitLink/FormPage2Test.java | 3 +-
.../html/link/submitLink/FormPageTest.java | 3 +-
.../list/IncrementalTableNavigationTest.java | 2 +-
.../wicket/markup/html/list/ListViewTest.java | 2 +-
.../html/list/PagedTableNavigatorTest.java | 2 +-
...agedTableNavigatorWithLabelProviderTest.java | 2 +-
.../list/PagedTableNavigatorWithMarginTest.java | 2 +-
.../wicket/markup/html/list/PagedTableTest.java | 2 +-
.../markup/html/list/SimpleTableTest.java | 2 +-
.../wicket/markup/html/list/TableTest.java | 2 +-
.../markup/html/markupId/TestHomePage.java | 2 +-
.../wicket/markup/html/media/MediaTagsTest.java | 2 +-
.../paging/AbstractPagingNavigationTest.java | 2 +-
.../wicket/markup/html/page/TestHomePage.java | 2 +-
.../markup/html/panel/FeedbackPanelTest.java | 2 +-
.../wicket/markup/html/panel/FragmentTest.java | 2 +-
.../wicket/markup/html/panel/PanelTest.java | 2 +-
.../markup/html/tags/InputTagNotClosedTest.java | 2 +-
.../OutputTransformerContainerTest.java | 2 +-
.../wicket/markup/parser/MergedMarkupTest.java | 2 +-
.../parser/RelativePathPrefixHandlerTest.java | 2 +-
.../wicket/markup/parser/TestHomePage.java | 2 +-
.../parser/filter/DoubleHeaderPartPageTest.java | 2 +-
.../markup/parser/filter/HeaderSectionTest.java | 2 +-
.../markup/parser/filter/HtmlHandlerTest.java | 2 +-
.../filter/HtmlHeaderSectionHandlerTest.java | 2 +-
.../parser/filter/OpenCloseTagExpanderTest.java | 2 +-
.../filter/StyleAndScriptIdentifierTest.java | 2 +-
.../ChildFirstHeaderRenderStrategyTest.java | 2 +-
.../wicket/markup/resolver/TestHomePage.java | 2 +-
.../resolver/WicketContainerResolverTest.java | 2 +-
.../resolver/WicketMessageResolverTest.java | 2 +-
.../border/WicketMessageResolverTest.java | 2 +-
.../AutoLinkResolveInParentsMarkupTest.java | 2 +-
.../markup/resolver/issue3559/MyTest.java | 2 +-
.../resolver/issue5569/Issue5569Test.java | 2 +-
.../AbstractTransformerBehaviorTest.java | 2 +-
.../markupFragments/MarkupFragmentTest.java | 16 +-
.../wicket/model/CompoundPropertyModelTest.java | 2 +-
.../org/apache/wicket/model/DetachableTest.java | 2 +-
.../apache/wicket/model/InheritedModelTest.java | 2 +-
.../model/LoadableDetachableModelTest.java | 2 +-
.../apache/wicket/model/ModelToStringTest.java | 2 +-
.../apache/wicket/model/PropertyModelTest.java | 2 +-
.../apache/wicket/model/ResourceModelTest.java | 2 +-
.../wicket/model/StringResourceModelTest.java | 2 +-
.../org/apache/wicket/model/TestHomePage.java | 2 +-
.../wicket/noheadnobody/NoHeadNoBodyTest.java | 2 +-
.../PageExpirationRecoveryTest.java | 2 +-
.../memory/HttpSessionDataStoreTest.java | 2 +-
.../wicket/properties/PropertiesTest.java | 2 +-
.../http/AbstractRequestLoggerTest.java | 6 +-
.../protocol/http/BufferedWebResponseTest.java | 2 +-
.../CsrfPreventionRequestCycleListenerTest.java | 2 +-
.../protocol/http/ModifyCookiePageTest.java | 2 +-
.../protocol/http/WebApplicationTest.java | 3 +-
.../http/WebResponseExceptionsTest.java | 2 +-
.../protocol/http/WicketTagPanelTest.java | 2 +-
.../http/mock/MockHttpServletRequestTest.java | 2 +-
.../CryptedUrlWebRequestCodingStrategyTest.java | 2 +-
...dRemoteAddressRequestWrapperFactoryTest.java | 2 +-
.../http/servlet/WicketSessionFilterTest.java | 2 +-
.../servlet/XForwardedRequestWrapperTest.java | 2 +-
.../ComponentQueueingPerformanceTest.java | 2 +-
.../wicket/queueing/ComponentQueueingTest.java | 2 +-
...eueingTransparentWebMarkupContainerTest.java | 2 +-
.../redirect/RestartWithMountedPageTest.java | 2 +-
.../redirect/abort/AbortExceptionTest.java | 2 +-
.../redirect/intercept/InterceptTest.java | 2 +-
.../MultiRequestCycleListenerCallOrderTest.java | 2 +-
.../cycle/PageRequestHandlerTrackerTest.java | 2 +-
.../request/handler/PageProviderTest.java | 2 +-
.../SkipRenderWithSetResponsePageTest.java | 2 +-
...elessPageManipulatingPageParametersTest.java | 2 +-
.../resource/ResourceAuthorizationTest.java | 2 +-
.../request/resource/ByteArrayResourceTest.java | 2 +-
.../ContextRelativeResourceReferenceTest.java | 2 +-
.../resource/CssPackageResourceTest.java | 7 +-
.../resource/DynamicImageResourceTest.java | 2 +-
.../resource/JavaScriptPackageResourceTest.java | 7 +-
.../resource/LessResourceReferenceTest.java | 2 +-
.../MinifiedAwareResourceReferenceTest.java | 2 +-
.../resource/PackageResourceReferenceTest.java | 2 +-
.../request/resource/ResouceBundleTest.java | 2 +-
.../resource/ResourceReferenceRegistryTest.java | 2 +-
.../resource/UrlResourceReferenceTest.java | 2 +-
.../ContextRelativeResourceCachingTest.java | 2 +-
.../wicket/resource/CssUrlReplacerTest.java | 2 +-
.../wicket/resource/ResourceUtilTest.java | 137 +++++++++++++
.../TextTemplateResourceReferenceTest.java | 2 +-
.../UtfPropertiesFilePropertiesLoaderTest.java | 2 +-
.../resource/XmlFilePropertiesLoaderTest.java | 2 +-
.../ResourceAggregatorRenderTest.java | 2 +-
.../aggregator/ResourceAggregatorTest.java | 2 +-
.../resource/bundles/CompressBundlesTest.java | 2 +-
.../loader/ClassStringResourceLoaderTest.java | 2 +-
.../ComponentStringResourceLoaderTest.java | 2 +-
.../loader/PackageStringResourceLoaderTest.java | 2 +-
.../ValidatorStringResourceLoaderTest.java | 2 +-
.../PreserveCookieForTheNextHandlerTest.java | 2 +-
.../response/filter/ResponseFilterTest.java | 2 +-
.../serialize/java/JavaSerializerTest.java | 2 +-
.../session/BindSessionOnRedirectTest.java | 2 +-
.../wicket/session/DefaultPageFactoryTest.java | 2 +-
.../wicket/settings/DebugSettingsTest.java | 2 +-
.../wicket/settings/ISecuritySettingsTest.java | 2 +-
.../def/SetCustomResourceSettingsTest.java | 2 +-
.../wicket/stateless/ImageStatelessTest.java | 2 +-
.../stateless/StatelessComponentTest.java | 2 +-
.../stateless/StatelessDynmicLinksTest.java | 2 +-
.../wicket/stateless/StatelessFormTest.java | 2 +-
.../wicket/stateless/StatelessFormUrlTest.java | 2 +-
.../wicket/stateless/TemporarySessionTest.java | 2 +-
.../pages/RefreshStatelessPageTest.java | 2 +-
.../stateless/pages/StatelessFormTest.java | 2 +-
.../wicket/util/cookies/CookieUtilsTest.java | 2 +-
...PreserveRequestCookieAfterLinkClickTest.java | 2 +-
.../util/cookies/SetCookieAndRedirectTest.java | 2 +-
.../iterator/AbstractHierarchyIteratorTest.java | 2 +-
.../util/iterator/ComponentIteratorTest.java | 2 +-
.../wicket/util/lang/PropertyResolverTest.java | 2 +-
.../wicket/util/lang/WicketObjectsTest.java | 2 +-
.../apache/wicket/util/resource/PathTest.java | 2 +-
.../resource/ResourceStreamLocatorTest.java | 2 +-
.../locator/ResourceNameIteratorTest.java | 2 +-
.../util/tester/FormTesterSubmitLinkTest.java | 1 -
.../wicket/util/tester/FormTesterTest.java | 1 -
...tartComponentInPageRedirectToRenderTest.java | 1 -
.../WicketTesterClickExternalLinkTest.java | 1 -
.../util/tester/WicketTesterCookieTest.java | 1 -
.../WicketTesterLazyIsPageStatelessBase.java | 1 -
.../tester/WicketTesterSessionCreationTest.java | 1 -
.../WicketTesterSessionInvalidateTest.java | 1 -
.../wicket/util/tester/WicketTesterTest.java | 1 -
.../apache/wicket/util/tester/apps_2/Test.java | 2 +-
.../util/tester/apps_3/FormTesterTest.java | 2 +-
.../util/tester/apps_4/FormTesterTest.java | 2 +-
.../util/tester/apps_5/AjaxLinkClickTest.java | 2 +-
.../tester/apps_5/AjaxSubmitLinkClickTest.java | 2 +-
.../wicket/util/tester/apps_7/TestHomePage.java | 2 +-
.../validation/ValidatorBehaviorTest.java | 2 +-
.../java/org/apache/wicket/WicketTestCase.java | 146 --------------
.../extensions/yui/calendar/DatePickerTest.java | 10 +-
.../yui/calendar/DateTimeFieldTest.java | 2 +-
.../main/webapp/META-INF/velocity.properties | 167 +++++++++++++++
wicket-examples/src/main/webapp/WEB-INF/web.xml | 5 +
.../apache/wicket/examples/WicketTestCase.java | 51 -----
.../examples/ajax/prototype/AjaxTest.java | 2 +-
.../wicket/examples/compref/ComprefTest.java | 2 +-
.../wicket/examples/encodings/EncodingTest.java | 2 +-
.../examples/forminput/FormInputTest.java | 2 +-
.../examples/guestbook/GuestbookTest.java | 2 +-
.../examples/hangman/WordGeneratorTest.java | 2 +-
.../examples/helloworld/HelloWorldTest.java | 2 +-
.../examples/linkomatic/LinkomaticTest.java | 2 +-
.../java/org/apache/wicket/WicketTestCase.java | 166 ---------------
.../ajax/markup/html/AjaxEditableTest.java | 2 +-
.../html/autocomplete/AutoCompleteTest.java | 2 +-
.../html/AjaxLazyLoadPanelTesterTest.java | 2 +-
.../markup/html/form/DateTextFieldTest.java | 2 +-
.../markup/html/form/palette/PaletteTest.java | 2 +-
.../markup/html/form/select/SelectTest.java | 2 +-
.../resource/ThumbnailImageResourceTest.java | 2 +-
.../html/repeater/data/table/DataTableTest.java | 2 +-
.../markup/html/tabs/TabbedPanelTest.java | 2 +-
.../html/tabs/TabbedPanelVisibilityTest.java | 2 +-
.../upload/UploadFormWithProgressBarTest.java | 2 +-
.../extensions/wizard/WizardModelTest.java | 2 +-
.../protocol/ws/AbstractUpgradeFilter.java | 23 ++-
.../protocol/ws/javax/JavaxWebSocketFilter.java | 19 +-
.../ws/jetty/Jetty7WebSocketFilter.java | 19 +-
.../ws/jetty9/Jetty9WebSocketFilter.java | 25 ++-
.../ws/tomcat7/Tomcat7WebSocketFilter.java | 22 +-
.../src/docs/guide/resources/resources_6.gdoc | 6 +
.../src/docs/guide/resources/resources_9.gdoc | 2 +-
.../java/org/apache/wicket/util/io/IOUtils.java | 1 -
.../org/apache/wicket/util/lang/Objects.java | 16 ++
.../org/apache/wicket/util/string/Strings.java | 15 ++
382 files changed, 1363 insertions(+), 1152 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/08f6c9ef/pom.xml
----------------------------------------------------------------------
[5/9] wicket git commit: Added toolchain support to wicket 7
Posted by da...@apache.org.
Added toolchain support to wicket 7
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4b582cc7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4b582cc7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4b582cc7
Branch: refs/heads/master
Commit: 4b582cc73d7724e2c9f2ba65b092e0dd537d3036
Parents: f069fc5
Author: Martijn Dashorst <da...@apache.org>
Authored: Tue Jun 16 13:33:55 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Tue Jun 16 13:33:55 2015 +0200
----------------------------------------------------------------------
pom.xml | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4b582cc7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 643d8d3..83f40c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -885,6 +885,25 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>toolchain</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <toolchains>
+ <jdk>
+ <version>${maven.compiler.source}</version>
+ </jdk>
+ </toolchains>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration>
@@ -1022,6 +1041,10 @@
<aggregate>true</aggregate>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ </plugin>
</plugins>
</build>
<distributionManagement>
[8/9] wicket git commit: New development versions
Posted by da...@apache.org.
New development versions
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/73119c61
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/73119c61
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/73119c61
Branch: refs/heads/master
Commit: 73119c61498925eb6b5af320e42f21df3687b348
Parents: 7957658
Author: Martijn Dashorst <da...@apache.org>
Authored: Mon Jun 22 10:23:24 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Mon Jun 22 10:23:24 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
wicket-experimental/wicket-atmosphere/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/73119c61/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a89af95..ad600b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,7 +393,7 @@
<dependency>
<groupId>org.apache.wicket.experimental.wicket7</groupId>
<artifactId>wicket-atmosphere</artifactId>
- <version>0.22-SNAPSHOT</version>
+ <version>0.23-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/73119c61/wicket-experimental/wicket-atmosphere/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/pom.xml b/wicket-experimental/wicket-atmosphere/pom.xml
index 62c6e37..c2683b4 100644
--- a/wicket-experimental/wicket-atmosphere/pom.xml
+++ b/wicket-experimental/wicket-atmosphere/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-atmosphere</artifactId>
- <version>0.22-SNAPSHOT</version>
+ <version>0.23-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Wicket-Atmosphere</name>
<description>Wicket-Atmosphere provides integration of the Atmosphere Framework in Wicket.</description>
[3/9] wicket git commit: Add the correct changelog to vote mail
Posted by da...@apache.org.
Add the correct changelog to vote mail
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/847634e3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/847634e3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/847634e3
Branch: refs/heads/master
Commit: 847634e32e7eaf06811ae9e143200bde1d73f945
Parents: 7756ff8
Author: Martijn Dashorst <da...@apache.org>
Authored: Fri Jun 12 18:49:31 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Fri Jun 12 18:49:31 2015 +0200
----------------------------------------------------------------------
release-dashorst.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/847634e3/release-dashorst.sh
----------------------------------------------------------------------
diff --git a/release-dashorst.sh b/release-dashorst.sh
index e5ff22d..80dac3c 100755
--- a/release-dashorst.sh
+++ b/release-dashorst.sh
@@ -299,13 +299,16 @@ $(cat $i.asc)
done
popd > /dev/null
-echo "========================================================================
+ 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
-
+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
echo "Generating Vote email"