Author: carnold
Date: Thu Oct 28 05:18:36 2010
New Revision: 1028186
URL: http://svn.apache.org/viewvc?rev=1028186&view=rev
Log:
Fix apparent build rot in release process
Modified:
logging/log4j/companions/extras/trunk/pom.xml
Modified: logging/log4j/companions/extras/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/pom.xml?rev=1028186&r1=1028185&r2=1028186&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/pom.xml (original)
+++ logging/log4j/companions/extras/trunk/pom.xml Thu Oct 28 05:18:36 2010
@@ -20,7 +20,7 @@
<groupId>log4j</groupId>
<artifactId>apache-log4j-extras</artifactId>
<packaging>bundle</packaging>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
<name>Apache Extras Companion for log4j 1.2.</name>
<description>This companion provides additional appenders, filters and
other capabilities for log4j 1.2. Several of these were backported from
@@ -66,9 +66,9 @@
</license>
</licenses>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/companions/extras/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/companions/extras/trunk</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/logging/log4j/companions/extras/trunk</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/companions/extras/tags/apache-log4j-extras-1.1</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/companions/extras/tags/apache-log4j-extras-1.1</developerConnection>
+
<url>http://svn.apache.org/viewcvs.cgi/logging/log4j/companions/extras/tags/apache-log4j-extras-1.1</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
@@ -127,10 +127,10 @@
<configuration>
<tasks>
<taskdef name="replaceregexp"
classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp" />
- <replaceregexp file="target/site/source-repository.html"
match="/tags/[^ "'<]*" replace="/trunk" flags="g"/>
- <replaceregexp match="-- Generated by (.*) on .*--"
replace="-- Generated by \1 --" flags="g">
- <fileset dir="target/site/apidocs"
includes="**/*.html" />
- </replaceregexp>
+ <replaceregexp file="target/site/source-repository.html"
match="/tags/[^ "'<]*" replace="/trunk" flags="g" />
+ <replaceregexp match="-- Generated by (.*) on .*--"
replace="-- Generated by \1 --" flags="g">
+ <fileset dir="target/site/apidocs"
includes="**/*.html" />
+ </replaceregexp>
</tasks>
</configuration>
<goals>
@@ -204,6 +204,7 @@
<descriptor>src/assembly/bin.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
+ <goals>site:site</goals>
</configuration>
<executions>
<execution>
@@ -215,6 +216,17 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
@@ -327,9 +339,9 @@
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <!-- attempt to work-around MRELEASE-273, see bug 42099 for
release build notes -->
+ <version>2.0-beta-9</version>
<configuration>
- <goals>package site-depl oy assembly:attached deploy</goals>
+ <goals>package site-deploy assembly:attached deploy</goals>
</configuration>
</plugin>
<plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
