Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46344

Put the org.apache classes in a separate jar
Maven changes need validating.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@729688 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 5ef7fb1..bebd8b4 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -73,6 +73,7 @@
   <property name="catalina-ha.jar" value="${tomcat.build}/lib/catalina-ha.jar"/>
   <property name="catalina-ant.jar" value="${tomcat.build}/lib/catalina-ant.jar"/>
   <property name="tomcat-coyote.jar" value="${tomcat.build}/lib/tomcat-coyote.jar"/>
+  <property name="tomcat-api.jar" value="${tomcat.build}/lib/tomcat-api.jar"/>
 
   <property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/>
   <property name="jasper-el.jar" value="${tomcat.build}/lib/jasper-el.jar"/>
@@ -198,8 +199,11 @@
     <include name="org/apache/juli/**" />
   </patternset>
 
-  <patternset id="files.catalina">
+  <patternset id="files.tomcat-api">
     <include name="org/apache/*" />
+  </patternset>
+       
+  <patternset id="files.catalina">
     <include name="org/apache/catalina/**" />
     <include name="org/apache/naming/**" />
     <!-- Modules -->
@@ -235,7 +239,6 @@
   </patternset>
 
   <patternset id="files.jasper">
-    <include name="org/apache/*" />
     <include name="org/apache/jasper/**" />
   </patternset>
   
@@ -335,12 +338,15 @@
     <!-- Catalina GroupCom/Tribes JAR File -->
     <jarIt jarfile="${catalina-tribes.jar}" filesId="files.catalina-tribes"/>
 
-  <!-- Catalina Cluster/HA JAR File -->
+    <!-- Catalina Cluster/HA JAR File -->
     <jarIt jarfile="${catalina-ha.jar}" filesId="files.catalina-ha"/>
 
     <!-- Catalina Ant Tasks JAR File -->
     <jarIt jarfile="${catalina-ant.jar}" filesId="files.catalina-ant"/>
 
+    <!-- Tomcat API JAR File -->
+    <jarIt jarfile="${tomcat-api.jar}" filesId="files.tomcat-api"/>
+
     <!-- Protocol handlers - Coyote -->
     <jarIt jarfile="${tomcat-coyote.jar}" filesId="files.tomcat-coyote"/>
 

diff --git a/res/maven/catalina.pom b/res/maven/catalina.pom
index 0c945e4..0bb7361 100644 (file)
--- a/res/maven/catalina.pom
+++ b/res/maven/catalina.pom
@@ -48,5 +48,11 @@
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-api</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>

diff --git a/res/maven/jasper.pom b/res/maven/jasper.pom
index dfd22f2..a25081d 100644 (file)
--- a/res/maven/jasper.pom
+++ b/res/maven/jasper.pom
@@ -64,5 +64,11 @@
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-api</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 9635de0..eb89029 100644 (file)
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -135,6 +135,7 @@
     <doMavenDeploy artifactId="servlet-api"/> <!--Deploy Servlet api-->
     <doMavenDeploy artifactId="el-api"/> <!--Deploy expression lanaguage api-->
     <doMavenDeploy artifactId="jsp-api"/> <!--Deploy JSP api-->
+    <doMavenDeploy artifactId="tomcat-api" /> <!--Deploy Tomcat api-->
     <doMavenDeploy artifactId="juli" jarFileName="tomcat-juli.jar"/> <!--Deploy JULI-->
     <doMavenDeploy artifactId="tribes" jarFileName="catalina-tribes.jar"/> <!--Deploy Tribes-->
     <doMavenDeploy artifactId="jasper-el"/> <!--Deploy Jasper EL-->