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 2007/03/25 16:25:58 UTC
svn commit: r522267 - in
/incubator/wicket/releases/wicket-1.3.0-incubating-alpha: NOTICE.txt
pom.xml release.sh wicket-assembly-all.xml
Author: dashorst
Date: Sun Mar 25 07:25:58 2007
New Revision: 522267
URL: http://svn.apache.org/viewvc?view=rev&rev=522267
Log:
New issues fixed in release
Modified:
incubator/wicket/releases/wicket-1.3.0-incubating-alpha/NOTICE.txt
incubator/wicket/releases/wicket-1.3.0-incubating-alpha/pom.xml
incubator/wicket/releases/wicket-1.3.0-incubating-alpha/release.sh
incubator/wicket/releases/wicket-1.3.0-incubating-alpha/wicket-assembly-all.xml
Modified: incubator/wicket/releases/wicket-1.3.0-incubating-alpha/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.3.0-incubating-alpha/NOTICE.txt?view=diff&rev=522267&r1=522266&r2=522267
==============================================================================
--- incubator/wicket/releases/wicket-1.3.0-incubating-alpha/NOTICE.txt (original)
+++ incubator/wicket/releases/wicket-1.3.0-incubating-alpha/NOTICE.txt Sun Mar 25 07:25:58 2007
@@ -1,3 +1,4 @@
+jdk-1.4/wicket/NOTICE.txt
Apache Wicket
Copyright 2006 The Apache Software Foundation
@@ -59,3 +60,96 @@
[for duplicate name bug]
'neal'"
[1]: http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/
+
+jdk-1.4/wicket-datetime/NOTICE.txt
+ Apache Wicket
+ Copyright 2007 The 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: 0.12.2),
+ released under the BSD License:
+ http://developer.yahoo.net/yui/license.txt
+ Copyright (c) 2006, Yahoo!
+
+jdk-1.4/wicket-extensions/NOTICE.txt
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Contains software developed in Apache Turbine, released
+ under the Apache Software License, Version 2.0.
+ (c) 2001-2005
+
+jdk-1.4/wicket-quickstart/NOTICE.txt
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+jdk-1.4/wicket-spring/NOTICE.txt
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+jdk-1.5/wicket-auth-roles/NOTICE.txt
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+jdk-1.5/wicket-examples/NOTICE.txt
+ Apache Wicket Examples
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Contains Script.aculo.us javascript library released under a MIT license.
+ Copyright (c) 2005 Thomas Fuchs
+
+ Contains prototype.js javascript library released under a MIT style license.
+ (c) 2005 Sam Stephenson
+
+ Contains behaviour.js javascript library released under BSD license.
+ Behaviour v1.1 by Ben Nolan, June 2005. Based largely on the work
+ of Simon Willison
+
+ com.meterware.httpunit.ParsedHTML is taken from HttpUnit, released
+ under a MIT style license.
+ Copyright (c) 2000-2004, Russell Gold
+
+ Contains software developed by the Dojo foundation.
+ The dojo javascript is dual licensed under the AFL and BSD license.
+ Included in this software under the BSD license.
+ Copyright (c) 2004-2005, The Dojo Foundation
+
+jdk-1.5/wicket-jmx/NOTICE.txt
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+jdk-1.5/wicket-objectssizeof-agent/NOTICE.txt
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+
+jdk-1.5/wicket-spring-annot/NOTICE.txt
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
Modified: incubator/wicket/releases/wicket-1.3.0-incubating-alpha/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.3.0-incubating-alpha/pom.xml?view=diff&rev=522267&r1=522266&r2=522267
==============================================================================
--- incubator/wicket/releases/wicket-1.3.0-incubating-alpha/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.3.0-incubating-alpha/pom.xml Sun Mar 25 07:25:58 2007
@@ -357,7 +357,16 @@
<resources>
<resource>
<filtering>false</filtering>
- <directory>src/main/java</directory>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
<includes>
<include>**/*</include>
</includes>
@@ -367,7 +376,7 @@
</resource>
<resource>
<filtering>false</filtering>
- <directory>src/main/resources</directory>
+ <directory>src/main/java</directory>
<includes>
<include>**/*</include>
</includes>
@@ -412,6 +421,10 @@
<inherited>true</inherited>
</plugin>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<inherited>true</inherited>
@@ -438,6 +451,7 @@
<appendAssemblyId>false</appendAssemblyId>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptors>
+ <finalName>apache-wicket-${project.version}</finalName>
<descriptor>wicket-assembly-all.xml</descriptor>
</descriptors>
</configuration>
@@ -528,7 +542,6 @@
</goals>
<configuration>
<resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
<resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
</resourceBundles>
</configuration>
Modified: incubator/wicket/releases/wicket-1.3.0-incubating-alpha/release.sh
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.3.0-incubating-alpha/release.sh?view=diff&rev=522267&r1=522266&r2=522267
==============================================================================
--- incubator/wicket/releases/wicket-1.3.0-incubating-alpha/release.sh (original)
+++ incubator/wicket/releases/wicket-1.3.0-incubating-alpha/release.sh Sun Mar 25 07:25:58 2007
@@ -13,6 +13,17 @@
read passphrase
stty $stty_orig
+# Clear the current NOTICE.txt file
+> NOTICE.txt;
+
+# next concatenate all NOTICE files from sub projects to the root file
+for i in `find jdk* -name "NOTICE.txt"`
+do
+ echo $i >> NOTICE.txt
+ cat $i >> NOTICE.txt
+ echo >> NOTICE.txt
+done
+
# clean all projects
mvn clean -Pall
@@ -22,12 +33,12 @@
# package and assemble the release
mvn -Dgpg.passphrase=$passphrase -Prelease deploy assembly:assembly $1
-filename=`ls target/wicket*gz`
+filename=`ls target/apache-wicket*gz`
gpg --print-md SHA1 $filename > $filename.sha
gpg --print-md SHA1 $filename > $filename.sha
echo $passphrase | gpg --passphrase-fd 0 --armor --output $filename.asc --detach-sig $filename
-filename=`ls target/wicket*zip`
+filename=`ls target/apache-wicket*zip`
gpg --print-md SHA1 $filename > $filename.sha
gpg --print-md SHA1 $filename > $filename.sha
echo $passphrase | gpg --passphrase-fd 0 --armor --output $filename.asc --detach-sig $filename
Modified: incubator/wicket/releases/wicket-1.3.0-incubating-alpha/wicket-assembly-all.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.3.0-incubating-alpha/wicket-assembly-all.xml?view=diff&rev=522267&r1=522266&r2=522267
==============================================================================
--- incubator/wicket/releases/wicket-1.3.0-incubating-alpha/wicket-assembly-all.xml (original)
+++ incubator/wicket/releases/wicket-1.3.0-incubating-alpha/wicket-assembly-all.xml Sun Mar 25 07:25:58 2007
@@ -14,9 +14,11 @@
<exclude>**/wicket-sandbox/**</exclude>
<exclude>**/wicket/target/**</exclude>
<exclude>**/wicket-*/target/**</exclude>
- <exclude>**/target/wicket*gz</exclude>
+ <exclude>**/target/*wicket*gz</exclude>
+ <exclude>**/target/*wicket*zip</exclude>
<exclude>**/target/archive-tmp</exclude>
<exclude>**/target/wicket*.pom*</exclude>
+ <exclude>**/sessions/wicket*.pom*</exclude>
<exclude>${project.build.directory}</exclude>
<exclude>**/maven-shared-archive-resources</exclude>
<exclude>${basedir}/target</exclude>