You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2008/08/08 05:46:57 UTC
svn commit: r683830 - /tuscany/java/sca/itest/validation/pom.xml
Author: lresende
Date: Thu Aug 7 20:46:56 2008
New Revision: 683830
URL: http://svn.apache.org/viewvc?rev=683830&view=rev
Log:
Fixing JAXB mismatch (from openEJB/javaee-api) to avoid issues in continuum build environment
Modified:
tuscany/java/sca/itest/validation/pom.xml
Modified: tuscany/java/sca/itest/validation/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/pom.xml?rev=683830&r1=683829&r2=683830&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/pom.xml (original)
+++ tuscany/java/sca/itest/validation/pom.xml Thu Aug 7 20:46:56 2008
@@ -88,6 +88,12 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-ejb</artifactId>
<version>1.4-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
@@ -120,6 +126,12 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ejb-runtime</artifactId>
<version>1.4-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -147,7 +159,7 @@
<scope>test</scope>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-openejb</artifactId>
<version>2.1.1</version>
@@ -189,15 +201,64 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</exclusion>
-
+ <exclusion>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
</exclusions>
-
+ </dependency-->
+
+ <!-- dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
</dependency>
-
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ </dependency-->
</dependencies>
<build>
<finalName>${artifactId}</finalName>
+
+ <!-- plugins>
+ <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.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.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
+ </configuration>
+ </plugin>
+ </plugins-->
</build>
-</project>
+</project>
\ No newline at end of file