Author: dashorst
Date: Sun Mar 25 13:20:02 2007
New Revision: 522342
URL: http://svn.apache.org/viewvc?view=rev&rev=522342
Log:
Fixed the build, hopefully for the last time
Modified:
incubator/wicket/releases/wicket-1.3.0-incubating-alpha/pom.xml
incubator/wicket/releases/wicket-1.3.0-incubating-alpha/release.sh
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=522342&r1=522341&r2=522342
==============================================================================
--- 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
13:20:02 2007
@@ -69,12 +69,12 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-gpg-plugin</artifactId>
+
<artifactId>maven-assembly-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-assembly-plugin</artifactId>
+
<artifactId>maven-gpg-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -366,7 +366,7 @@
</resource>
<resource>
<filtering>false</filtering>
- <directory>src/main/resources</directory>
+ <directory>src/main/java</directory>
<includes>
<include>**/*</include>
</includes>
@@ -376,7 +376,7 @@
</resource>
<resource>
<filtering>false</filtering>
- <directory>src/main/java</directory>
+ <directory>src/main/resources</directory>
<includes>
<include>**/*</include>
</includes>
@@ -402,11 +402,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<inherited>true</inherited>
</plugin>
@@ -421,10 +416,6 @@
<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>
@@ -451,9 +442,9 @@
<appendAssemblyId>false</appendAssemblyId>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptors>
-
<finalName>apache-wicket-${project.version}</finalName>
<descriptor>wicket-assembly-all.xml</descriptor>
</descriptors>
+
<finalName>apache-wicket-${project.version}</finalName>
</configuration>
</plugin>
<plugin>
@@ -489,6 +480,7 @@
<configuration>
<minmemory>128m</minmemory>
<maxmemory>256m</maxmemory>
+ <quiet>true</quiet>
</configuration>
<executions>
<execution>
@@ -542,6 +534,7 @@
</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=522342&r1=522341&r2=522342
==============================================================================
--- 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 13:20:02 2007
@@ -19,7 +19,9 @@
# next concatenate all NOTICE files from sub projects to the root file
for i in `find jdk* -name "NOTICE.txt"`
do
+ echo "-------------------------------------------------------------" >>
NOTICE.txt
echo $i >> NOTICE.txt
+ echo "-------------------------------------------------------------" >>
NOTICE.txt
cat $i >> NOTICE.txt
echo >> NOTICE.txt
done
@@ -31,7 +33,7 @@
mvn4 -Pjdk-1.4 test $1
# package and assemble the release
-mvn -Dgpg.passphrase=$passphrase -Prelease deploy assembly:assembly $1
+mvn -Dgpg.passphrase=$passphrase -Prelease deploy assembly:attached $1
filename=`ls target/apache-wicket*gz`
gpg --print-md SHA1 $filename > $filename.sha
