Author: lindner
Date: Wed Jun 2 23:27:24 2010
New Revision: 950819
URL: http://svn.apache.org/viewvc?rev=950819&view=rev
Log:
maven 3.0 nits
Modified:
shindig/trunk/assembly/src/main/assembly/java.xml
shindig/trunk/assembly/src/main/assembly/php.xml
shindig/trunk/pom.xml
Modified: shindig/trunk/assembly/src/main/assembly/java.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/assembly/src/main/assembly/java.xml?rev=950819&r1=950818&r2=950819&view=diff
==============================================================================
--- shindig/trunk/assembly/src/main/assembly/java.xml (original)
+++ shindig/trunk/assembly/src/main/assembly/java.xml Wed Jun 2 23:27:24 2010
@@ -26,7 +26,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
- <outputDirectory>shindig-${pom.version}-java</outputDirectory>
+ <outputDirectory>shindig-${project.version}-java</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
@@ -39,7 +39,7 @@
</dependencySets>
<fileSets>
<fileSet>
- <outputDirectory>shindig-${pom.version}-java</outputDirectory>
+ <outputDirectory>shindig-${project.version}-java</outputDirectory>
<directory>../</directory>
<includes>
<include>UPGRADING</include>
@@ -51,7 +51,7 @@
</excludes>
</fileSet>
<fileSet>
- <outputDirectory>shindig-${pom.version}-java</outputDirectory>
+ <outputDirectory>shindig-${project.version}-java</outputDirectory>
<directory>../java</directory>
<includes>
<include>LICENSE</include>
@@ -61,12 +61,12 @@
<files>
<file>
<source>../java/README</source>
- <outputDirectory>shindig-${pom.version}-java</outputDirectory>
+ <outputDirectory>shindig-${project.version}-java</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>../java/NOTICE</source>
- <outputDirectory>shindig-${pom.version}-java</outputDirectory>
+ <outputDirectory>shindig-${projet.version}-java</outputDirectory>
<filtered>true</filtered>
</file>
</files>
Modified: shindig/trunk/assembly/src/main/assembly/php.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/assembly/src/main/assembly/php.xml?rev=950819&r1=950818&r2=950819&view=diff
==============================================================================
--- shindig/trunk/assembly/src/main/assembly/php.xml (original)
+++ shindig/trunk/assembly/src/main/assembly/php.xml Wed Jun 2 23:27:24 2010
@@ -26,7 +26,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <outputDirectory>shindig-${pom.version}-php</outputDirectory>
+ <outputDirectory>shindig-${project.version}-php</outputDirectory>
<directory>../</directory>
<includes>
<include>features/**</include>
@@ -65,7 +65,7 @@
</excludes>
</fileSet>
<fileSet>
- <outputDirectory>shindig-${pom.version}-php</outputDirectory>
+ <outputDirectory>shindig-${project.version}-php</outputDirectory>
<directory>../php</directory>
<excludes>
<exclude>config/**</exclude>
@@ -104,7 +104,7 @@
<!-- Using the temp container.php created by Maven using Antrun plugin to
rewrite
default configuration to release structure -->
<fileSet>
- <outputDirectory>shindig-${pom.version}-php/config</outputDirectory>
+ <outputDirectory>shindig-${project.version}-php/config</outputDirectory>
<directory>target/php/config</directory>
<excludes>
<!-- scm -->
@@ -116,12 +116,12 @@
<files>
<file>
<source>../php/README</source>
- <outputDirectory>shindig-${pom.version}-php</outputDirectory>
+ <outputDirectory>shindig-${project.version}-php</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>../php/NOTICE</source>
- <outputDirectory>shindig-${pom.version}-php</outputDirectory>
+ <outputDirectory>shindig-${project.version}-php</outputDirectory>
<filtered>true</filtered>
</file>
</files>
Modified: shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=950819&r1=950818&r2=950819&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Wed Jun 2 23:27:24 2010
@@ -490,7 +490,7 @@
<artifactId>maven-jetty-plugin</artifactId>
<configuration>
<tempDirectory>${basedir}/java/server/target/work</tempDirectory>
-
<webApp>${basedir}/java/server/target/shindig-server-${pom.version}.war</webApp>
+
<webApp>${basedir}/java/server/target/shindig-server-${project.version}.war</webApp>
<contextPath>/</contextPath>
</configuration>
</plugin>
@@ -554,7 +554,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
-
<stagingSiteURL>scp://people.apache.org/www/shindig.apache.org/shindig-1.1.x/${pom.version}</stagingSiteURL>
+
<stagingSiteURL>scp://people.apache.org/www/shindig.apache.org/shindig-1.1.x/${project.version}</stagingSiteURL>
</configuration>
</plugin>
<plugin>
@@ -901,7 +901,7 @@
<xslFile>${basedir}/etc/to-committers.xsl</xslFile>
<srcIncludes>pom.xml</srcIncludes>
<srcDir>${basedir}</srcDir>
- <destDir>${build.directory}</destDir>
+ <destDir>${project.build.directory}</destDir>
<fileNameRegex>pom.xml</fileNameRegex>
<fileNameReplacement>COMMITTERS</fileNameReplacement>
</configuration>
