You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/09/10 07:06:45 UTC

svn commit: r995670 - in /wicket/branches/wicket-1.5-M2: ./ archetypes/quickstart/ archetypes/quickstart/src/main/resources/archetype-resources/ testing/wicket-threadtest/ wicket-auth-roles/ wicket-datetime/ wicket-devutils/ wicket-examples/ wicket-ext...

Author: ivaynberg
Date: Fri Sep 10 05:06:44 2010
New Revision: 995670

URL: http://svn.apache.org/viewvc?rev=995670&view=rev
Log:
modified poms

Added:
    wicket/branches/wicket-1.5-M2/release-igor.sh   (with props)
Modified:
    wicket/branches/wicket-1.5-M2/archetypes/quickstart/pom.xml
    wicket/branches/wicket-1.5-M2/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
    wicket/branches/wicket-1.5-M2/pom.xml
    wicket/branches/wicket-1.5-M2/testing/wicket-threadtest/pom.xml
    wicket/branches/wicket-1.5-M2/wicket-auth-roles/pom.xml
    wicket/branches/wicket-1.5-M2/wicket-datetime/pom.xml
    wicket/branches/wicket-1.5-M2/wicket-devutils/pom.xml
    wicket/branches/wicket-1.5-M2/wicket-examples/pom.xml
    wicket/branches/wicket-1.5-M2/wicket-extensions/pom.xml
    wicket/branches/wicket-1.5-M2/wicket-guice/pom.xml
    wicket/branches/wicket-1.5-M2/wicket-ioc/pom.xml
    wicket/branches/wicket-1.5-M2/wicket-jmx/pom.xml
    wicket/branches/wicket-1.5-M2/wicket-objectssizeof-agent/pom.xml
    wicket/branches/wicket-1.5-M2/wicket-request/pom.xml
    wicket/branches/wicket-1.5-M2/wicket-spring/pom.xml
    wicket/branches/wicket-1.5-M2/wicket-util/pom.xml
    wicket/branches/wicket-1.5-M2/wicket-velocity/pom.xml
    wicket/branches/wicket-1.5-M2/wicket/pom.xml

Modified: wicket/branches/wicket-1.5-M2/archetypes/quickstart/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/archetypes/quickstart/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/archetypes/quickstart/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/archetypes/quickstart/pom.xml Fri Sep 10 05:06:44 2010
@@ -3,7 +3,7 @@
   <parent>
 		<groupId>org.apache.wicket</groupId>
 		<artifactId>wicket-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.5-M2</version>
 		<relativePath>../../pom.xml</relativePath>
   </parent>
   

Modified: wicket/branches/wicket-1.5-M2/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml Fri Sep 10 05:06:44 2010
@@ -127,7 +127,7 @@
 		</plugins>
 	</build>
 	<properties>
-		<wicket.version>1.5-SNAPSHOT</wicket.version>
+		<wicket.version>1.5-M2</wicket.version>
 		<jetty.version>6.1.4</jetty.version>
 	</properties>
 	#end

Modified: wicket/branches/wicket-1.5-M2/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/pom.xml Fri Sep 10 05:06:44 2010
@@ -26,7 +26,7 @@
 
 	<groupId>org.apache.wicket</groupId>
 	<artifactId>wicket-parent</artifactId>
-	<version>1.5-SNAPSHOT</version>
+	<version>1.5-M2</version>
 	<packaging>pom</packaging>
 	<name>Wicket Parent</name>
 	<description>Wicket is a Java-based open source component web application framework.</description>
@@ -297,9 +297,9 @@
 		<url>http://wicketstuff.org/bamboo</url>
 	</ciManagement>
 	<scm>
-		<connection>scm:svn:http://svn.apache.org/repos/asf/wicket/trunk</connection>
-		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/wicket/trunk</developerConnection>
-		<url>http://svn.apache.org/viewvc/wicket/trunk</url>
+		<connection>scm:svn:http://svn.apache.org/repos/asf/wicket/releases/1.5-M2</connection>
+		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/wicket/releases/1.5-M2</developerConnection>
+		<url>http://svn.apache.org/viewvc/wicket/releases/1.5-M2</url>
 	</scm>
 	<mailingLists>
 		<mailingList>

Added: wicket/branches/wicket-1.5-M2/release-igor.sh
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/release-igor.sh?rev=995670&view=auto
==============================================================================
--- wicket/branches/wicket-1.5-M2/release-igor.sh (added)
+++ wicket/branches/wicket-1.5-M2/release-igor.sh Fri Sep 10 05:06:44 2010
@@ -0,0 +1,98 @@
+#!/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
+
+echo "modifying poms with the new version: $version"
+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"
+svn commit -m "modified poms"
+
+# Clear the current NOTICE.txt file
+echo "Creating notice file."
+
+NOTICE=NOTICE
+> $NOTICE 
+echo "Apache Wicket" >> $NOTICE
+echo "Copyright 2008 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
+
+# prebuilding to work around javadoc generation problem
+mvn clean install -Dmaven.test.skip=true
+mvn 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 "Uploading release"
+cp ../common/KEYS target/dist
+ssh people.apache.org mkdir ~/public_html/wicket-$version
+scp -r target/dist target/m2-repo people.apache.org:public_html/wicket-$version
+

Propchange: wicket/branches/wicket-1.5-M2/release-igor.sh
------------------------------------------------------------------------------
    svn:executable = *

Modified: wicket/branches/wicket-1.5-M2/testing/wicket-threadtest/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/testing/wicket-threadtest/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/testing/wicket-threadtest/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/testing/wicket-threadtest/pom.xml Fri Sep 10 05:06:44 2010
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.wicket</groupId>
 		<artifactId>wicket-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.5-M2</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

Modified: wicket/branches/wicket-1.5-M2/wicket-auth-roles/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/wicket-auth-roles/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/wicket-auth-roles/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/wicket-auth-roles/pom.xml Fri Sep 10 05:06:44 2010
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.wicket</groupId>
 		<artifactId>wicket-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.5-M2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

Modified: wicket/branches/wicket-1.5-M2/wicket-datetime/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/wicket-datetime/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/wicket-datetime/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/wicket-datetime/pom.xml Fri Sep 10 05:06:44 2010
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.apache.wicket</groupId>
 		<artifactId>wicket-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.5-M2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>wicket-datetime</artifactId>

Modified: wicket/branches/wicket-1.5-M2/wicket-devutils/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/wicket-devutils/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/wicket-devutils/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/wicket-devutils/pom.xml Fri Sep 10 05:06:44 2010
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.wicket</groupId>
 		<artifactId>wicket-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.5-M2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

Modified: wicket/branches/wicket-1.5-M2/wicket-examples/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/wicket-examples/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/wicket-examples/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/wicket-examples/pom.xml Fri Sep 10 05:06:44 2010
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.apache.wicket</groupId>
 		<artifactId>wicket-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.5-M2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>wicket-examples</artifactId>

Modified: wicket/branches/wicket-1.5-M2/wicket-extensions/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/wicket-extensions/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/wicket-extensions/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/wicket-extensions/pom.xml Fri Sep 10 05:06:44 2010
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.wicket</groupId>
 		<artifactId>wicket-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.5-M2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

Modified: wicket/branches/wicket-1.5-M2/wicket-guice/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/wicket-guice/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/wicket-guice/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/wicket-guice/pom.xml Fri Sep 10 05:06:44 2010
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.wicket</groupId>
 		<artifactId>wicket-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.5-M2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

Modified: wicket/branches/wicket-1.5-M2/wicket-ioc/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/wicket-ioc/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/wicket-ioc/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/wicket-ioc/pom.xml Fri Sep 10 05:06:44 2010
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.wicket</groupId>
 		<artifactId>wicket-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.5-M2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

Modified: wicket/branches/wicket-1.5-M2/wicket-jmx/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/wicket-jmx/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/wicket-jmx/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/wicket-jmx/pom.xml Fri Sep 10 05:06:44 2010
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.wicket</groupId>
 		<artifactId>wicket-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.5-M2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

Modified: wicket/branches/wicket-1.5-M2/wicket-objectssizeof-agent/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/wicket-objectssizeof-agent/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/wicket-objectssizeof-agent/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/wicket-objectssizeof-agent/pom.xml Fri Sep 10 05:06:44 2010
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.apache.wicket</groupId>
 		<artifactId>wicket-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.5-M2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

Modified: wicket/branches/wicket-1.5-M2/wicket-request/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/wicket-request/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/wicket-request/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/wicket-request/pom.xml Fri Sep 10 05:06:44 2010
@@ -5,11 +5,11 @@
   <parent>
     <artifactId>wicket-parent</artifactId>
     <groupId>org.apache.wicket</groupId>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.5-M2</version>
   </parent>
   <groupId>org.apache.wicket</groupId>
   <artifactId>wicket-request</artifactId>
-  <version>1.5-SNAPSHOT</version>
+  <version>1.5-M2</version>
   <name>wicket-request</name>
   <url>http://maven.apache.org</url>
   <dependencies>

Modified: wicket/branches/wicket-1.5-M2/wicket-spring/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/wicket-spring/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/wicket-spring/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/wicket-spring/pom.xml Fri Sep 10 05:06:44 2010
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.wicket</groupId>
 		<artifactId>wicket-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.5-M2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

Modified: wicket/branches/wicket-1.5-M2/wicket-util/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/wicket-util/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/wicket-util/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/wicket-util/pom.xml Fri Sep 10 05:06:44 2010
@@ -5,11 +5,11 @@
   <parent>
     <artifactId>wicket-parent</artifactId>
     <groupId>org.apache.wicket</groupId>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.5-M2</version>
   </parent>
   <groupId>org.apache.wicket</groupId>
   <artifactId>wicket-util</artifactId>
-  <version>1.5-SNAPSHOT</version>
+  <version>1.5-M2</version>
   <name>wicket-util</name>
   <url>http://maven.apache.org</url>
   <dependencies>

Modified: wicket/branches/wicket-1.5-M2/wicket-velocity/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/wicket-velocity/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/wicket-velocity/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/wicket-velocity/pom.xml Fri Sep 10 05:06:44 2010
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.wicket</groupId>
 		<artifactId>wicket-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.5-M2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

Modified: wicket/branches/wicket-1.5-M2/wicket/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-M2/wicket/pom.xml?rev=995670&r1=995669&r2=995670&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-M2/wicket/pom.xml (original)
+++ wicket/branches/wicket-1.5-M2/wicket/pom.xml Fri Sep 10 05:06:44 2010
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.wicket</groupId>
 		<artifactId>wicket-parent</artifactId>
-		<version>1.5-SNAPSHOT</version>
+		<version>1.5-M2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>