svn commit: r1595151 - in /tomee/tomee/trunk: pom.xml tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java

[andygumbrecht]

Author: andygumbrecht
Date: Fri May 16 10:43:00 2014
New Revision: 1595151

URL: http://svn.apache.org/r1595151
Log:
https://issues.apache.org/jira/browse/TOMEE-1205

Modified:
    tomee/tomee/trunk/pom.xml
    
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java

Modified: tomee/tomee/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1595151&r1=1595150&r2=1595151&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Fri May 16 10:43:00 2014
@@ -121,7 +121,7 @@
     
<openejb.osgi.symbolic.name>${project.groupId}.${project.artifactId}</openejb.osgi.symbolic.name>
 
     <!-- to change easily the javaee api version -->
-    <javaee-api.version>6.0-5</javaee-api.version>
+    <javaee-api.version>6.0-6-SNAPSHOT</javaee-api.version>
 
     <jaxb.version>2.2.7</jaxb.version>
 

Modified: 
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1595151&r1=1595150&r2=1595151&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
 Fri May 16 10:43:00 2014
@@ -100,7 +100,6 @@ public class Installer implements Instal
         installConfigFiles();
 
         removeTomcatLibJar("annotations-api.jar");
-        removeTomcatLibJar("el-api.jar");
         addJavaeeInEndorsed();
 
         addTomEEAdminConfInTomcatUsers();
@@ -169,7 +168,6 @@ public class Installer implements Instal
         installConfigFiles();
 
         removeTomcatLibJar("annotations-api.jar");
-        removeTomcatLibJar("el-api.jar");
         addJavaeeInEndorsed();
         moveLibs();