You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ba...@apache.org on 2008/03/14 07:41:20 UTC
svn commit: r637007 - in /commons/proper: betwixt/trunk/src/assembly/
chain/trunk/src/assembly/ cli/trunk/src/assembly/ codec/trunk/src/assembly/
collections/branches/collections_jdk5_branch/src/assembly/
collections/trunk/src/assembly/ configuration/t...
Author: bayard
Date: Thu Mar 13 23:41:17 2008
New Revision: 637007
URL: http://svn.apache.org/viewvc?rev=637007&view=rev
Log:
Fixing the assemblies to say project.version instead of version to stop '2.4.1' leaking through from the JVM properties. Also making it project.artifactId while I'm doing this.
Modified:
commons/proper/betwixt/trunk/src/assembly/src.xml
commons/proper/chain/trunk/src/assembly/src.xml
commons/proper/cli/trunk/src/assembly/src.xml
commons/proper/codec/trunk/src/assembly/src.xml
commons/proper/collections/branches/collections_jdk5_branch/src/assembly/src.xml
commons/proper/collections/trunk/src/assembly/src.xml
commons/proper/configuration/trunk/src/assembly/src.xml
commons/proper/daemon/trunk/src/assembly/src.xml
commons/proper/dbcp/trunk/src/assembly/src.xml
commons/proper/dbutils/trunk/src/assembly/src.xml
commons/proper/digester/trunk/src/assembly/src.xml
commons/proper/discovery/trunk/src/assembly/src.xml
commons/proper/el/trunk/src/assembly/src.xml
commons/proper/jexl/trunk/src/assembly/src.xml
commons/proper/jxpath/trunk/src/assembly/src.xml
commons/proper/lang/trunk/src/assembly/src.xml
commons/proper/launcher/trunk/src/assembly/src.xml
commons/proper/logging/trunk/src/assembly/src.xml
commons/proper/math/trunk/src/assembly/src.xml
commons/proper/modeler/trunk/src/assembly/src.xml
commons/proper/net/trunk/src/assembly/src.xml
commons/proper/pool/trunk/src/assembly/src.xml
commons/proper/primitives/trunk/src/assembly/src.xml
commons/proper/scxml/trunk/src/assembly/src.xml
commons/proper/transaction/trunk/src/assembly/src.xml
Modified: commons/proper/betwixt/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/betwixt/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/betwixt/trunk/src/assembly/src.xml (original)
+++ commons/proper/betwixt/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/chain/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/assembly/src.xml (original)
+++ commons/proper/chain/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/cli/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/assembly/src.xml (original)
+++ commons/proper/cli/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/codec/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/assembly/src.xml (original)
+++ commons/proper/codec/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/collections/branches/collections_jdk5_branch/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/collections/branches/collections_jdk5_branch/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/collections/branches/collections_jdk5_branch/src/assembly/src.xml (original)
+++ commons/proper/collections/branches/collections_jdk5_branch/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/collections/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/assembly/src.xml (original)
+++ commons/proper/collections/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/configuration/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/assembly/src.xml (original)
+++ commons/proper/configuration/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/daemon/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/assembly/src.xml (original)
+++ commons/proper/daemon/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/dbcp/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/assembly/src.xml (original)
+++ commons/proper/dbcp/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/dbutils/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/dbutils/trunk/src/assembly/src.xml (original)
+++ commons/proper/dbutils/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/digester/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/assembly/src.xml (original)
+++ commons/proper/digester/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -21,7 +21,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/discovery/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/assembly/src.xml (original)
+++ commons/proper/discovery/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/el/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/el/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/el/trunk/src/assembly/src.xml (original)
+++ commons/proper/el/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/jexl/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/assembly/src.xml (original)
+++ commons/proper/jexl/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/jxpath/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/assembly/src.xml (original)
+++ commons/proper/jxpath/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/lang/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/assembly/src.xml (original)
+++ commons/proper/lang/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/launcher/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/launcher/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/launcher/trunk/src/assembly/src.xml (original)
+++ commons/proper/launcher/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/logging/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/logging/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/logging/trunk/src/assembly/src.xml (original)
+++ commons/proper/logging/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -23,7 +23,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<directory>.</directory>
Modified: commons/proper/math/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/math/trunk/src/assembly/src.xml (original)
+++ commons/proper/math/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -22,7 +22,7 @@
<format>zip</format>
</formats>
<baseDirectory>
- ${artifactId}-${version}-src
+ ${project.artifactId}-${project.version}-src
</baseDirectory>
<fileSets>
<fileSet>
Modified: commons/proper/modeler/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/modeler/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/modeler/trunk/src/assembly/src.xml (original)
+++ commons/proper/modeler/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/net/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/net/trunk/src/assembly/src.xml (original)
+++ commons/proper/net/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/pool/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/assembly/src.xml (original)
+++ commons/proper/pool/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/primitives/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/primitives/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/primitives/trunk/src/assembly/src.xml (original)
+++ commons/proper/primitives/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/scxml/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/assembly/src.xml (original)
+++ commons/proper/scxml/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/transaction/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/transaction/trunk/src/assembly/src.xml?rev=637007&r1=637006&r2=637007&view=diff
==============================================================================
--- commons/proper/transaction/trunk/src/assembly/src.xml (original)
+++ commons/proper/transaction/trunk/src/assembly/src.xml Thu Mar 13 23:41:17 2008
@@ -20,7 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>