You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by zo...@apache.org on 2011/03/25 10:14:19 UTC
svn commit: r1085297 - in /aries/trunk/samples/blueprint:
helloworld/helloworld-assembly/ helloworld/helloworld-client/
helloworld/helloworld-eba/ helloworld/helloworld-server/ idverifier/
idverifier/idverifier-api/ idverifier/idverifier-client/ idveri...
Author: zoe
Date: Fri Mar 25 09:14:16 2011
New Revision: 1085297
URL: http://svn.apache.org/viewvc?rev=1085297&view=rev
Log:
ARIES-610 fixing build warnings in samples
Modified:
aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml
aries/trunk/samples/blueprint/helloworld/helloworld-client/pom.xml
aries/trunk/samples/blueprint/helloworld/helloworld-eba/pom.xml
aries/trunk/samples/blueprint/helloworld/helloworld-server/pom.xml
aries/trunk/samples/blueprint/idverifier/idverifier-api/pom.xml
aries/trunk/samples/blueprint/idverifier/idverifier-client/pom.xml
aries/trunk/samples/blueprint/idverifier/idverifier-server/pom.xml
aries/trunk/samples/blueprint/idverifier/pom.xml
Modified: aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml?rev=1085297&r1=1085296&r2=1085297&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml (original)
+++ aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml Fri Mar 25 09:14:16 2011
@@ -18,11 +18,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <groupId>org.apache.aries.samples</groupId>
<artifactId>helloworld</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
<artifactId>org.apache.aries.samples.blueprint.helloworld.assembly</artifactId>
<name>Apache Aries Blueprint HelloWorld Assembly</name>
<packaging>pom</packaging>
@@ -94,40 +95,6 @@
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <id>filter</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>resources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <id>filter</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>resources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
Modified: aries/trunk/samples/blueprint/helloworld/helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/helloworld/helloworld-client/pom.xml?rev=1085297&r1=1085296&r2=1085297&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/helloworld/helloworld-client/pom.xml (original)
+++ aries/trunk/samples/blueprint/helloworld/helloworld-client/pom.xml Fri Mar 25 09:14:16 2011
@@ -36,7 +36,7 @@
</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
Modified: aries/trunk/samples/blueprint/helloworld/helloworld-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/helloworld/helloworld-eba/pom.xml?rev=1085297&r1=1085296&r2=1085297&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/helloworld/helloworld-eba/pom.xml (original)
+++ aries/trunk/samples/blueprint/helloworld/helloworld-eba/pom.xml Fri Mar 25 09:14:16 2011
@@ -24,12 +24,13 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <groupId>org.apache.aries.samples</groupId>
<artifactId>helloworld</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <artifactId>org.apache.aries.samples.blueprint.helloworld</artifactId>
+ <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.eba</artifactId>
<name>Apache Aries Blueprint HelloWorld EBA</name>
<description>This is the module that constructs the Hello World application</description>
<packaging>eba</packaging>
@@ -58,7 +59,7 @@ under the License.
<configuration>
<generateManifest>true</generateManifest>
<instructions>
- <Application-SymbolicName>${pom.artifactId}</Application-SymbolicName>
+ <Application-SymbolicName>${project.artifactId}</Application-SymbolicName>
</instructions>
</configuration>
</plugin>
Modified: aries/trunk/samples/blueprint/helloworld/helloworld-server/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/helloworld/helloworld-server/pom.xml?rev=1085297&r1=1085296&r2=1085297&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/helloworld/helloworld-server/pom.xml (original)
+++ aries/trunk/samples/blueprint/helloworld/helloworld-server/pom.xml Fri Mar 25 09:14:16 2011
@@ -39,7 +39,7 @@
</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
Modified: aries/trunk/samples/blueprint/idverifier/idverifier-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/idverifier/idverifier-api/pom.xml?rev=1085297&r1=1085296&r2=1085297&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/idverifier/idverifier-api/pom.xml (original)
+++ aries/trunk/samples/blueprint/idverifier/idverifier-api/pom.xml Fri Mar 25 09:14:16 2011
@@ -37,7 +37,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
Modified: aries/trunk/samples/blueprint/idverifier/idverifier-client/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/idverifier/idverifier-client/pom.xml?rev=1085297&r1=1085296&r2=1085297&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/idverifier/idverifier-client/pom.xml (original)
+++ aries/trunk/samples/blueprint/idverifier/idverifier-client/pom.xml Fri Mar 25 09:14:16 2011
@@ -58,7 +58,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId};blueprint.graceperiod:=true;blueprint.timeout:= 60000</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId};blueprint.graceperiod:=true;blueprint.timeout:= 60000</Bundle-SymbolicName>
<Bundle-Activator>org.apache.aries.samples.blueprint.idverifier.client.IDVerifierClientActivator</Bundle-Activator>
</instructions>
</configuration>
Modified: aries/trunk/samples/blueprint/idverifier/idverifier-server/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/idverifier/idverifier-server/pom.xml?rev=1085297&r1=1085296&r2=1085297&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/idverifier/idverifier-server/pom.xml (original)
+++ aries/trunk/samples/blueprint/idverifier/idverifier-server/pom.xml Fri Mar 25 09:14:16 2011
@@ -36,7 +36,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.aries.samples.blueprint.idverifier</groupId>
<artifactId>org.apache.aries.samples.blueprint.idverifier.api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
Modified: aries/trunk/samples/blueprint/idverifier/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/idverifier/pom.xml?rev=1085297&r1=1085296&r2=1085297&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/idverifier/pom.xml (original)
+++ aries/trunk/samples/blueprint/idverifier/pom.xml Fri Mar 25 09:14:16 2011
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.samples.blueprint</groupId>
+ <groupId>org.apache.aries.samples</groupId>
<artifactId>blueprint</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>