OESE-90 Remove javaee-api 7 and add API one by one

master
David BRASSELY 2015-05-07 21:34:39 +02:00
parent b311a5750c
commit f4c12a41a6
2 changed files with 45 additions and 19 deletions

View File

@ -88,13 +88,6 @@
<version>${snakeyaml.version}</version>
</dependency>
<!-- JavaEE API -->
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>${javaee-api.version}</version>
</dependency>
<!-- Apache Shiro -->
<dependency>
<groupId>org.apache.shiro</groupId>
@ -133,17 +126,7 @@
<version>${jansi.version}</version>
</dependency>
<!-- OpenESB REST API & Web Console -->
<!--
<dependency>
<groupId>net.open-esb.admin</groupId>
<artifactId>openesb-rest-api-core</artifactId>
<version>${openesb-rest-api.version}</version>
<classifier>distribution</classifier>
<type>zip</type>
</dependency>
-->
<!-- OpenESB REST API & Web Console -->
<dependency>
<groupId>net.open-esb.admin</groupId>
<artifactId>openesb-rest-api-core</artifactId>
@ -219,5 +202,42 @@
<artifactId>jersey-container-grizzly2-servlet</artifactId>
<version>${jersey.version}</version>
</dependency>
<!-- JavaEE dependencies -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.1.0.Final</version>
</dependency>
</dependencies>
</project>

View File

@ -94,7 +94,6 @@
<include>com.atomikos:transactions</include>
<include>com.atomikos:transactions-api</include>
<include>com.atomikos:atomikos-util</include>
<include>javax:javaee-api</include>
<include>org.apache.tomcat:tomcat-jdbc</include>
<include>org.apache.tomcat:tomcat-juli</include>
<include>org.apache.tomcat:tomcat-catalina</include>
@ -110,6 +109,13 @@
<include>com.fasterxml.jackson.*:*</include>
<include>org.jvnet.mimepull:mimepull</include>
<include>org.javassist:javassist</include>
<include>javax.servlet:javax.servlet-api</include>
<include>javax.jms:javax.jms-api</include>
<include>javax.inject:javax.inject</include>
<include>javax.ws.rs:javax.ws.rs-api</include>
<include>javax.transaction:javax.transaction-api</include>
<include>javax.annotation:javax.annotation-api</include>
<include>javax.validation:validation-api</include>
</includes>
<excludes>
<exclude>org.glassfish.hk2.external:javax.inject</exclude>