You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/10/05 11:18:42 UTC
svn commit: r1004583 - in /tuscany/otest/newlayout:
tuscany-policy-test-runner/pom.xml tuscany-test-runner/pom.xml
Author: slaws
Date: Tue Oct 5 09:18:40 2010
New Revision: 1004583
URL: http://svn.apache.org/viewvc?rev=1004583&view=rev
Log:
Disable dependency on org.oasis-open.sca as these artifacts are not published in maven so cause the main compliance test build to fail
Modified:
tuscany/otest/newlayout/tuscany-policy-test-runner/pom.xml
tuscany/otest/newlayout/tuscany-test-runner/pom.xml
Modified: tuscany/otest/newlayout/tuscany-policy-test-runner/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/otest/newlayout/tuscany-policy-test-runner/pom.xml?rev=1004583&r1=1004582&r2=1004583&view=diff
==============================================================================
--- tuscany/otest/newlayout/tuscany-policy-test-runner/pom.xml (original)
+++ tuscany/otest/newlayout/tuscany-policy-test-runner/pom.xml Tue Oct 5 09:18:40 2010
@@ -82,11 +82,15 @@
<version>2.0-SNAPSHOT</version>
</dependency>
+<!-- This dependency causes a problem on systems that haven't compiled the
+ OASIS contributions independently and hence haven't dded them to their
+ Local repo.
<dependency>
<groupId>org.oasis-open.sca.assembly</groupId>
<artifactId>General_Java</artifactId>
<version>1.0</version>
</dependency>
+-->
<dependency>
<groupId>javax.servlet</groupId>
@@ -251,6 +255,45 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.oasis-open.sca.assembly</groupId>
+ <artifactId>General_Java</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.oasis-open.sca.policy</groupId>
+ <artifactId>Policy_General</artifactId>
+ <version>1.0</version>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.oasis-open.sca.policy</groupId>
+ <artifactId>Policy_General_Java</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ <stripVersion>true</stripVersion>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: tuscany/otest/newlayout/tuscany-test-runner/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/otest/newlayout/tuscany-test-runner/pom.xml?rev=1004583&r1=1004582&r2=1004583&view=diff
==============================================================================
--- tuscany/otest/newlayout/tuscany-test-runner/pom.xml (original)
+++ tuscany/otest/newlayout/tuscany-test-runner/pom.xml Tue Oct 5 09:18:40 2010
@@ -76,11 +76,15 @@
<version>2.0-SNAPSHOT</version>
</dependency>
+<!-- This dependency causes a problem on systems that haven't compiled the
+ OASIS contributions independently and hence haven't dded them to their
+ Local repo.
<dependency>
<groupId>org.oasis-open.sca.assembly</groupId>
<artifactId>General_Java</artifactId>
<version>1.0</version>
</dependency>
+-->
<dependency>
<groupId>javax.servlet</groupId>