diff options
| author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-08 03:46:56 +0000 |
|---|---|---|
| committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-08 03:46:56 +0000 |
| commit | be8783a18993f9fa694bc67974b6396168308357 (patch) | |
| tree | 88656b6dba64411d8f9d845870c60342759964c7 /java/sca/itest/validation | |
| parent | fe36d8178fdfa3467466ba3ce43c5e4f2b8752de (diff) | |
Fixing JAXB mismatch (from openEJB/javaee-api) to avoid issues in continuum build environment
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@683830 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/itest/validation')
| -rw-r--r-- | java/sca/itest/validation/pom.xml | 71 |
1 files changed, 66 insertions, 5 deletions
diff --git a/java/sca/itest/validation/pom.xml b/java/sca/itest/validation/pom.xml index f71bed0957..30083b2de1 100644 --- a/java/sca/itest/validation/pom.xml +++ b/java/sca/itest/validation/pom.xml @@ -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 |