You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2013/03/13 21:59:58 UTC
svn commit: r1456126 - in /commons/proper/logging/trunk: pom.xml
src/main/assembly/bin.xml
Author: tn
Date: Wed Mar 13 20:59:58 2013
New Revision: 1456126
URL: http://svn.apache.org/r1456126
Log:
Fix assembly attachement during deployment.
Modified:
commons/proper/logging/trunk/pom.xml
commons/proper/logging/trunk/src/main/assembly/bin.xml
Modified: commons/proper/logging/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/logging/trunk/pom.xml?rev=1456126&r1=1456125&r2=1456126&view=diff
==============================================================================
--- commons/proper/logging/trunk/pom.xml (original)
+++ commons/proper/logging/trunk/pom.xml Wed Mar 13 20:59:58 2013
@@ -323,18 +323,6 @@ under the License.
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <!--
- - The site needs to be built prior to deploy,
- - because it is included in the assembly.
- -->
- <goals>site deploy</goals>
- </configuration>
- </plugin>
-
- <plugin>
<!--
- Many of JCL's tests use tricky techniques to place the generated
- JCL jarfiles on the classpath in various configurations. This means
@@ -378,7 +366,6 @@ under the License.
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${commons.surefire.version}</version>
<executions>
<execution>
<id>integration-test</id>
@@ -410,9 +397,8 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
<configuration>
- <!-- Do not deploy the assemblies to the repository. -->
- <attach>false</attach>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
<descriptor>src/main/assembly/src.xml</descriptor>
@@ -518,13 +504,11 @@ under the License.
<maven.compile.source>1.2</maven.compile.source>
<maven.compile.target>1.1</maven.compile.target>
<commons.componentid>logging</commons.componentid>
- <commons.release.version>1.1.1</commons.release.version>
- <commons.binary.suffix>-bin</commons.binary.suffix>
+ <commons.release.version>1.1.2</commons.release.version>
<commons.jira.id>LOGGING</commons.jira.id>
<commons.jira.pid>12310484</commons.jira.pid>
<!-- The RC version used in the staging repository URL. -->
<commons.rc.version>RC1</commons.rc.version>
- <commons.surefire.version>2.12</commons.surefire.version>
<skipSurefireReport>true</skipSurefireReport>
<commons.osgi.symbolicName>${project.artifactId}</commons.osgi.symbolicName>
Modified: commons/proper/logging/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/main/assembly/bin.xml?rev=1456126&r1=1456125&r2=1456126&view=diff
==============================================================================
--- commons/proper/logging/trunk/src/main/assembly/bin.xml (original)
+++ commons/proper/logging/trunk/src/main/assembly/bin.xml Wed Mar 13 20:59:58 2013
@@ -23,7 +23,7 @@ under the License.
<format>tar.gz</format>
<format>zip</format>
</formats>
- <includeSiteDirectory>true</includeSiteDirectory>
+ <includeSiteDirectory>false</includeSiteDirectory>
<fileSets>
<fileSet>
<includes>
@@ -39,5 +39,9 @@ under the License.
<include>*.jar</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>target/site/apidocs</directory>
+ <outputDirectory>apidocs</outputDirectory>
+ </fileSet>
</fileSets>
</assembly>
\ No newline at end of file