From f4c12a41a6c81fce0f5d18f7fda272a00d72e80d Mon Sep 17 00:00:00 2001
From: David BRASSELY <brasseld@gmail.com>
Date: Thu, 7 May 2015 21:34:39 +0200
Subject: [PATCH] OESE-90 Remove javaee-api 7 and add API one by one

---
 openesb-standalone-packaging/pom.xml          | 56 +++++++++++++------
 .../src/main/assembly/distribution.xml        |  8 ++-
 2 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/openesb-standalone-packaging/pom.xml b/openesb-standalone-packaging/pom.xml
index 8790570..76832c5 100644
--- a/openesb-standalone-packaging/pom.xml
+++ b/openesb-standalone-packaging/pom.xml
@@ -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>
diff --git a/openesb-standalone-packaging/src/main/assembly/distribution.xml b/openesb-standalone-packaging/src/main/assembly/distribution.xml
index 768fd1c..b7c701e 100644
--- a/openesb-standalone-packaging/src/main/assembly/distribution.xml
+++ b/openesb-standalone-packaging/src/main/assembly/distribution.xml
@@ -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>