You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/10/26 15:31:31 UTC
svn commit: r1027546 - in /tuscany/sca-java-1.x/trunk/distribution/bundle:
./ src/ src/main/ src/main/java/ src/main/java/org/
src/main/java/org/apache/ src/main/java/org/apache/tuscany/
src/main/java/org/apache/tuscany/sca/ src/main/java/org/apache/tu...
Author: nash
Date: Tue Oct 26 13:31:30 2010
New Revision: 1027546
URL: http://svn.apache.org/viewvc?rev=1027546&view=rev
Log:
Merge r1022436 TUSCANY-3722: Check for correct versions of jaxws-api jar and pom in local maven repository
Added:
tuscany/sca-java-1.x/trunk/distribution/bundle/src/
- copied from r1022436, tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/src/
tuscany/sca-java-1.x/trunk/distribution/bundle/src/main/
- copied from r1022436, tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/src/main/
tuscany/sca-java-1.x/trunk/distribution/bundle/src/main/java/
- copied from r1022436, tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/src/main/java/
tuscany/sca-java-1.x/trunk/distribution/bundle/src/main/java/org/
- copied from r1022436, tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/src/main/java/org/
tuscany/sca-java-1.x/trunk/distribution/bundle/src/main/java/org/apache/
- copied from r1022436, tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/src/main/java/org/apache/
tuscany/sca-java-1.x/trunk/distribution/bundle/src/main/java/org/apache/tuscany/
- copied from r1022436, tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/src/main/java/org/apache/tuscany/
tuscany/sca-java-1.x/trunk/distribution/bundle/src/main/java/org/apache/tuscany/sca/
- copied from r1022436, tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/src/main/java/org/apache/tuscany/sca/
tuscany/sca-java-1.x/trunk/distribution/bundle/src/main/java/org/apache/tuscany/sca/distribution/
- copied from r1022436, tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/src/main/java/org/apache/tuscany/sca/distribution/
tuscany/sca-java-1.x/trunk/distribution/bundle/src/main/java/org/apache/tuscany/sca/distribution/CheckLocalRepository.java
- copied unchanged from r1022436, tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/src/main/java/org/apache/tuscany/sca/distribution/CheckLocalRepository.java
Modified:
tuscany/sca-java-1.x/trunk/distribution/bundle/pom.xml
Modified: tuscany/sca-java-1.x/trunk/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/distribution/bundle/pom.xml?rev=1027546&r1=1027545&r2=1027546&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/distribution/bundle/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/distribution/bundle/pom.xml Tue Oct 26 13:31:30 2010
@@ -36,6 +36,20 @@
<tuscany.version>${pom.version}</tuscany.version>
</properties>
+ <repositories>
+ <!-- search this repository first because it contains the correct version
+ of jaxws-api-2.1.jar -->
+ <repository>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>java.net</id>
+ <name>java.net Maven 1.x Repository</name>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -654,6 +668,29 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>check-local-repository</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>java</executable>
+ <arguments>
+ <argument>-cp</argument>
+ <argument>${basedir}/target/classes</argument>
+ <argument>org.apache.tuscany.sca.distribution.CheckLocalRepository</argument>
+ <argument>${settings.localRepository}</argument>
+ </arguments>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>shade-maven-plugin</artifactId>
<version>1.0-alpha-7</version>
<executions>