diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-05 13:42:26 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-05 13:42:26 +0000 |
| commit | 161c5c34e4a3c6999578c833add2f60e2494dbb3 (patch) | |
| tree | cb4aa65ce8c8ec56129f22cd8e4c3fc642072619 /sca-java-2.x/trunk/testing/itest/bpel | |
| parent | 5b1513570240501b58a1a43a28c46cba5ab2dac9 (diff) | |
Fix lots of depricated maven variable warnings for Maven v3
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1067440 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/testing/itest/bpel')
3 files changed, 4 insertions, 42 deletions
diff --git a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml index cc2ea3676f..efef84de17 100644 --- a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml @@ -90,7 +90,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-ws/pom.xml b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-ws/pom.xml index dffbb4f9a9..7cc80fa468 100644 --- a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-ws/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-ws/pom.xml @@ -81,7 +81,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml b/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml index ad5b69ec69..dcca2ebec9 100644 --- a/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml @@ -54,7 +54,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -65,6 +65,7 @@ <useFile>false</useFile> <trimStackTrace>false</trimStackTrace> <useSystemClassLoader>true</useSystemClassLoader> + <argLine>-Djava.endorsed.dirs=target/endorsed</argLine> </configuration> </plugin> <plugin> @@ -93,45 +94,6 @@ </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Djava.endorsed.dirs=target/endorsed</argLine> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>generate-sources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - <version>2.1</version> - <type>jar</type> - </artifactItem> - <artifactItem> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - <type>jar</type> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> |