You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by si...@apache.org on 2012/07/05 20:56:28 UTC
svn commit: r1357803 - in /incubator/any23/trunk: ./ core/src/main/assembly/
plugins/basic-crawler/src/main/assembly/
plugins/html-scraper/src/main/assembly/
plugins/office-scraper/src/main/assembly/ service/src/main/assembly/
sources-dist/ sources-dis...
Author: simonetripodi
Date: Thu Jul 5 18:56:27 2012
New Revision: 1357803
URL: http://svn.apache.org/viewvc?rev=1357803&view=rev
Log:
no more assembly.finalName, since the deploy plugin will rename produced artifacts
Modified:
incubator/any23/trunk/core/src/main/assembly/bin.xml
incubator/any23/trunk/plugins/basic-crawler/src/main/assembly/bin.xml
incubator/any23/trunk/plugins/html-scraper/src/main/assembly/bin.xml
incubator/any23/trunk/plugins/office-scraper/src/main/assembly/bin.xml
incubator/any23/trunk/pom.xml
incubator/any23/trunk/service/src/main/assembly/server-embedded.xml
incubator/any23/trunk/service/src/main/assembly/with-deps.xml
incubator/any23/trunk/service/src/main/assembly/without-deps.xml
incubator/any23/trunk/sources-dist/pom.xml
incubator/any23/trunk/sources-dist/src/main/assembly/src.xml
Modified: incubator/any23/trunk/core/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/assembly/bin.xml?rev=1357803&r1=1357802&r2=1357803&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/assembly/bin.xml (original)
+++ incubator/any23/trunk/core/src/main/assembly/bin.xml Thu Jul 5 18:56:27 2012
@@ -24,7 +24,7 @@
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${assembly.finalName}</baseDirectory>
+ <baseDirectory>${project.build.finalName}</baseDirectory>
<files>
<file>
Modified: incubator/any23/trunk/plugins/basic-crawler/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/basic-crawler/src/main/assembly/bin.xml?rev=1357803&r1=1357802&r2=1357803&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/basic-crawler/src/main/assembly/bin.xml (original)
+++ incubator/any23/trunk/plugins/basic-crawler/src/main/assembly/bin.xml Thu Jul 5 18:56:27 2012
@@ -24,7 +24,7 @@
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${assembly.finalName}</baseDirectory>
+ <baseDirectory>${project.build.finalName}</baseDirectory>
<!-- Use the N&L files which apply to the included dependencies -->
<files>
Modified: incubator/any23/trunk/plugins/html-scraper/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/html-scraper/src/main/assembly/bin.xml?rev=1357803&r1=1357802&r2=1357803&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/html-scraper/src/main/assembly/bin.xml (original)
+++ incubator/any23/trunk/plugins/html-scraper/src/main/assembly/bin.xml Thu Jul 5 18:56:27 2012
@@ -24,7 +24,7 @@
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${assembly.finalName}</baseDirectory>
+ <baseDirectory>${project.build.finalName}</baseDirectory>
<!-- Use the N&L files which apply to the included dependencies -->
<files>
Modified: incubator/any23/trunk/plugins/office-scraper/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/office-scraper/src/main/assembly/bin.xml?rev=1357803&r1=1357802&r2=1357803&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/office-scraper/src/main/assembly/bin.xml (original)
+++ incubator/any23/trunk/plugins/office-scraper/src/main/assembly/bin.xml Thu Jul 5 18:56:27 2012
@@ -24,7 +24,7 @@
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${assembly.finalName}</baseDirectory>
+ <baseDirectory>${project.build.finalName}</baseDirectory>
<!-- Use the N&L files which apply to the included dependencies -->
<files>
Modified: incubator/any23/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/pom.xml?rev=1357803&r1=1357802&r2=1357803&view=diff
==============================================================================
--- incubator/any23/trunk/pom.xml (original)
+++ incubator/any23/trunk/pom.xml Thu Jul 5 18:56:27 2012
@@ -250,7 +250,6 @@
| mvn site-deploy -Dsite.deploymentBaseUrl=file://path/to/checked/out/site -P site
-->
<site.deploymentBaseUrl>svn:https://svn.apache.org/repos/asf/incubator/any23/site</site.deploymentBaseUrl>
- <assembly.finalName>apache-${project.build.finalName}</assembly.finalName>
<assembly.skip>false</assembly.skip>
</properties>
@@ -519,7 +518,6 @@
<attach>true</attach>
<skipAssembly>${assembly.skip}</skipAssembly>
<tarLongFileMode>gnu</tarLongFileMode>
- <finalName>${assembly.finalName}</finalName>
</configuration>
</plugin>
Modified: incubator/any23/trunk/service/src/main/assembly/server-embedded.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/main/assembly/server-embedded.xml?rev=1357803&r1=1357802&r2=1357803&view=diff
==============================================================================
--- incubator/any23/trunk/service/src/main/assembly/server-embedded.xml (original)
+++ incubator/any23/trunk/service/src/main/assembly/server-embedded.xml Thu Jul 5 18:56:27 2012
@@ -24,7 +24,7 @@
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${assembly.finalName}-server-embedded</baseDirectory>
+ <baseDirectory>${project.build.finalName}-server-embedded</baseDirectory>
<files>
<file>
Modified: incubator/any23/trunk/service/src/main/assembly/with-deps.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/main/assembly/with-deps.xml?rev=1357803&r1=1357802&r2=1357803&view=diff
==============================================================================
--- incubator/any23/trunk/service/src/main/assembly/with-deps.xml (original)
+++ incubator/any23/trunk/service/src/main/assembly/with-deps.xml Thu Jul 5 18:56:27 2012
@@ -24,7 +24,7 @@
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${assembly.finalName}-with-deps</baseDirectory>
+ <baseDirectory>${project.build.finalName}-with-deps</baseDirectory>
<files>
<!-- with-deps -->
Modified: incubator/any23/trunk/service/src/main/assembly/without-deps.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/main/assembly/without-deps.xml?rev=1357803&r1=1357802&r2=1357803&view=diff
==============================================================================
--- incubator/any23/trunk/service/src/main/assembly/without-deps.xml (original)
+++ incubator/any23/trunk/service/src/main/assembly/without-deps.xml Thu Jul 5 18:56:27 2012
@@ -24,7 +24,7 @@
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${assembly.finalName}-without-deps</baseDirectory>
+ <baseDirectory>${project.build.finalName}-without-deps</baseDirectory>
<files>
<!-- without-deps -->
Modified: incubator/any23/trunk/sources-dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/sources-dist/pom.xml?rev=1357803&r1=1357802&r2=1357803&view=diff
==============================================================================
--- incubator/any23/trunk/sources-dist/pom.xml (original)
+++ incubator/any23/trunk/sources-dist/pom.xml Thu Jul 5 18:56:27 2012
@@ -29,10 +29,6 @@
<name>Apache Any23 :: Sources distribution module</name>
- <properties>
- <assembly.finalName>apache-any23-${project.version}</assembly.finalName>
- </properties>
-
<build>
<plugins>
<!-- Generates the distribution package -->
@@ -40,7 +36,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <finalName>${assembly.finalName}</finalName>
<descriptors>
<descriptor>${basedir}/src/main/assembly/src.xml</descriptor>
</descriptors>
Modified: incubator/any23/trunk/sources-dist/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/sources-dist/src/main/assembly/src.xml?rev=1357803&r1=1357802&r2=1357803&view=diff
==============================================================================
--- incubator/any23/trunk/sources-dist/src/main/assembly/src.xml (original)
+++ incubator/any23/trunk/sources-dist/src/main/assembly/src.xml Thu Jul 5 18:56:27 2012
@@ -24,7 +24,7 @@
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${assembly.finalName}-src</baseDirectory>
+ <baseDirectory>${project.build.finalName}-src</baseDirectory>
<fileSets>
<!--