[Jpackage-commits] rpms/free/tomcat6 annotations-api-6.0.32.pom, 1.1, NONE annotations-api-6.0.33.pom, NONE, 1.1 catalina-6.0.32.pom, 1.1, NONE catalina-6.0.33.pom, NONE, 1.1 catalina-ha-6.0.32.pom, 1.1, NONE catalina-ha-6.0.33.pom, NONE, 1.1 coyote-6.0.32.pom, 1.1, NONE coyote-6.0.33.pom, NONE, 1.1 dbcp-6.0.32.pom, 1.1, NONE dbcp-6.0.33.pom, NONE, 1.1 el-api-6.0.32.pom, 1.1, NONE el-api-6.0.33.pom, NONE, 1.1 jasper-6.0.32.pom, 1.1, NONE jasper-6.0.33.pom, NONE, 1.1 jasper-el-6.0.32.pom, 1.1, NONE jasper-el-6.0.33.pom, NONE, 1.1 jsp-api-6.0.32.pom, 1.1, NONE jsp-api-6.0.33.pom, NONE, 1.1 juli-6.0.32.pom, 1.1, NONE juli-6.0.33.pom, NONE, 1.1 juli-adapters-6.0.32.pom, 1.1, NONE juli-adapters-6.0.33.pom, NONE, 1.1 juli-extras-6.0.32.pom, 1.1, NONE juli-extras-6.0.33.pom, NONE, 1.1 servlet-api-6.0.32.pom, 1.1, NONE servlet-api-6.0.33.pom, NONE, 1.1 tomcat6.spec, 1.16, 1.17 tribes-6.0.32.pom, 1.1, NONE tribes-6.0.33.pom, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Sat Oct 15 06:23:33 CEST 2011


Update of /home/projects/jpackage/cvs/rpms/free/tomcat6
In directory ryu.zarb.org:/tmp/O3yQFe186V/rpms/free/tomcat6

Modified Files:
	tomcat6.spec 
Added Files:
	annotations-api-6.0.33.pom catalina-6.0.33.pom 
	catalina-ha-6.0.33.pom coyote-6.0.33.pom dbcp-6.0.33.pom 
	el-api-6.0.33.pom jasper-6.0.33.pom jasper-el-6.0.33.pom 
	jsp-api-6.0.33.pom juli-6.0.33.pom juli-adapters-6.0.33.pom 
	juli-extras-6.0.33.pom servlet-api-6.0.33.pom 
	tribes-6.0.33.pom 
Removed Files:
	annotations-api-6.0.32.pom catalina-6.0.32.pom 
	catalina-ha-6.0.32.pom coyote-6.0.32.pom dbcp-6.0.32.pom 
	el-api-6.0.32.pom jasper-6.0.32.pom jasper-el-6.0.32.pom 
	jsp-api-6.0.32.pom juli-6.0.32.pom juli-adapters-6.0.32.pom 
	juli-extras-6.0.32.pom servlet-api-6.0.32.pom 
	tribes-6.0.32.pom 
Log Message:
6.0.33-1.jpp6

--- catalina-ha-6.0.32.pom DELETED ---

--- NEW FILE: servlet-api-6.0.33.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-->
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.tomcat</groupId>
  <artifactId>servlet-api</artifactId>
  <version>6.0.33</version>
  <description>javax.servlet package</description>
</project>

--- NEW FILE: catalina-ha-6.0.33.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-->
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.tomcat</groupId>
  <artifactId>catalina-ha</artifactId>
  <version>6.0.33</version>
  <description>Tomcat High Availability Implementation</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>coyote</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>servlet-api</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>juli</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>tribes</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>catalina</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
</project>

--- jasper-6.0.32.pom DELETED ---

--- dbcp-6.0.32.pom DELETED ---

--- NEW FILE: catalina-6.0.33.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-->
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.tomcat</groupId>
  <artifactId>catalina</artifactId>
  <version>6.0.33</version>
  <description>Tomcat Servlet Engine Core Classes and Standard implementations</description>
  <dependencies>
    <!--
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>coyote</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
    -->
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>servlet-api</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>juli</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>annotations-api</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
</project>

--- NEW FILE: juli-extras-6.0.33.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-->
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.tomcat.extras</groupId>
  <artifactId>juli</artifactId>
  <version>6.0.33</version>
  <description>Replacement for Tomcat Core Logging Package</description>
</project>

--- jsp-api-6.0.32.pom DELETED ---

--- coyote-6.0.32.pom DELETED ---

--- servlet-api-6.0.32.pom DELETED ---

Index: tomcat6.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat6/tomcat6.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -C 2 -d -r1.16 -r1.17
*** tomcat6.spec	23 Jun 2011 18:52:28 -0000	1.16
--- tomcat6.spec	15 Oct 2011 04:23:30 -0000	1.17
***************
*** 1,3 ****
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2011, JPackage Project
  # All rights reserved.
  #
***************
*** 34,38 ****
  %define major_version 6
  %define minor_version 0
! %define micro_version 32
  %define packdname apache-tomcat-%{major_version}.%{minor_version}.%{micro_version}-src
  %define servletspec 2.5
--- 34,38 ----
  %define major_version 6
  %define minor_version 0
! %define micro_version 33
  %define packdname apache-tomcat-%{major_version}.%{minor_version}.%{micro_version}-src
  %define servletspec 2.5
***************
*** 56,60 ****
  Epoch: 0
  Version: %{major_version}.%{minor_version}.%{micro_version}
! Release: 2%{?dist}
  Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
  
--- 56,60 ----
  Epoch: 0
  Version: %{major_version}.%{minor_version}.%{micro_version}
! Release: 1%{?dist}
  Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
  
***************
*** 74,92 ****
  #Source12: http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.20/source/tomcat-native-1.1.20-src.tar.gz
  Source13: commons-logging-1.1.1-src.tar.gz
! Source21: http://repo2.maven.org/maven2/org/apache/tomcat/annotations-api/6.0.32/annotations-api-6.0.32.pom
! Source22: http://repo2.maven.org/maven2/org/apache/tomcat/catalina/6.0.32/catalina-6.0.32.pom
! Source23: http://repo2.maven.org/maven2/org/apache/tomcat/catalina-ha/6.0.32/catalina-ha-6.0.32.pom
! Source24: http://repo2.maven.org/maven2/org/apache/tomcat/coyote/6.0.32/coyote-6.0.32.pom
! Source25: http://repo2.maven.org/maven2/org/apache/tomcat/dbcp/6.0.32/dbcp-6.0.32.pom
! Source26: http://repo2.maven.org/maven2/org/apache/tomcat/el-api/6.0.32/el-api-6.0.32.pom
! #Source27: http://repo2.maven.org/maven2/org/apache/tomcat/extras/juli/6.0.32/juli-6.0.32.pom move it to
! Source27: juli-extras-6.0.32.pom
! Source28: http://repo2.maven.org/maven2/org/apache/tomcat/extras/juli-adapters/6.0.32/juli-adapters-6.0.32.pom
! Source29: http://repo2.maven.org/maven2/org/apache/tomcat/jasper/6.0.32/jasper-6.0.32.pom
! Source30: http://repo2.maven.org/maven2/org/apache/tomcat/jasper-el/6.0.32/jasper-el-6.0.32.pom
! Source31: http://repo2.maven.org/maven2/org/apache/tomcat/jsp-api/6.0.32/jsp-api-6.0.32.pom
! Source32: http://repo2.maven.org/maven2/org/apache/tomcat/juli/6.0.32/juli-6.0.32.pom
! Source33: http://repo2.maven.org/maven2/org/apache/tomcat/servlet-api/6.0.32/servlet-api-6.0.32.pom
! Source34: http://repo2.maven.org/maven2/org/apache/tomcat/tribes/6.0.32/tribes-6.0.32.pom
  
  Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
--- 74,92 ----
  #Source12: http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.20/source/tomcat-native-1.1.20-src.tar.gz
  Source13: commons-logging-1.1.1-src.tar.gz
! Source21: http://repo2.maven.org/maven2/org/apache/tomcat/annotations-api/6.0.33/annotations-api-6.0.33.pom
! Source22: http://repo2.maven.org/maven2/org/apache/tomcat/catalina/6.0.33/catalina-6.0.33.pom
! Source23: http://repo2.maven.org/maven2/org/apache/tomcat/catalina-ha/6.0.33/catalina-ha-6.0.33.pom
! Source24: http://repo2.maven.org/maven2/org/apache/tomcat/coyote/6.0.33/coyote-6.0.33.pom
! Source25: http://repo2.maven.org/maven2/org/apache/tomcat/dbcp/6.0.33/dbcp-6.0.33.pom
! Source26: http://repo2.maven.org/maven2/org/apache/tomcat/el-api/6.0.33/el-api-6.0.33.pom
! #Source27: http://repo2.maven.org/maven2/org/apache/tomcat/extras/juli/6.0.33/juli-6.0.33.pom move it to
! Source27: juli-extras-6.0.33.pom
! Source28: http://repo2.maven.org/maven2/org/apache/tomcat/extras/juli-adapters/6.0.33/juli-adapters-6.0.33.pom
! Source29: http://repo2.maven.org/maven2/org/apache/tomcat/jasper/6.0.33/jasper-6.0.33.pom
! Source30: http://repo2.maven.org/maven2/org/apache/tomcat/jasper-el/6.0.33/jasper-el-6.0.33.pom
! Source31: http://repo2.maven.org/maven2/org/apache/tomcat/jsp-api/6.0.33/jsp-api-6.0.33.pom
! Source32: http://repo2.maven.org/maven2/org/apache/tomcat/juli/6.0.33/juli-6.0.33.pom
! Source33: http://repo2.maven.org/maven2/org/apache/tomcat/servlet-api/6.0.33/servlet-api-6.0.33.pom
! Source34: http://repo2.maven.org/maven2/org/apache/tomcat/tribes/6.0.33/tribes-6.0.33.pom
  
  Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
***************
*** 223,232 ****
      mv $j $j.no
  done
! #BUILD/tomcat6-6.0.32/apache-tomcat-6.0.32-src/geronimo-spec-jaxrpc-1.1-rc4.jar
! #BUILD/tomcat6-6.0.32/apache-tomcat-6.0.32-src/avalon-framework-4.1.3.jar
! #BUILD/tomcat6-6.0.32/apache-tomcat-6.0.32-src/logkit-1.0.1.jar
! #BUILD/tomcat6-6.0.32/apache-tomcat-6.0.32-src/wsdl4j-1.6.1.jar
! #BUILD/tomcat6-6.0.32/apache-tomcat-6.0.32-src/log4j-1.2.12.jar
! #BUILD/tomcat6-6.0.32/apache-tomcat-6.0.32-src/servletapi-2.3.jar
  
  # remove pre-built binaries and windows files
--- 223,232 ----
      mv $j $j.no
  done
! #BUILD/tomcat6-6.0.33/apache-tomcat-6.0.33-src/geronimo-spec-jaxrpc-1.1-rc4.jar
! #BUILD/tomcat6-6.0.33/apache-tomcat-6.0.33-src/avalon-framework-4.1.3.jar
! #BUILD/tomcat6-6.0.33/apache-tomcat-6.0.33-src/logkit-1.0.1.jar
! #BUILD/tomcat6-6.0.33/apache-tomcat-6.0.33-src/wsdl4j-1.6.1.jar
! #BUILD/tomcat6-6.0.33/apache-tomcat-6.0.33-src/log4j-1.2.12.jar
! #BUILD/tomcat6-6.0.33/apache-tomcat-6.0.33-src/servletapi-2.3.jar
  
  # remove pre-built binaries and windows files
***************
*** 248,251 ****
--- 248,252 ----
  export OPT_JAR_LIST="ant/ant-trax"
  pushd %{packdname}
+     ln -s %{SOURCE13} 
      # we don't care about the tarballs and we're going to replace
      # tomcat-dbcp.jar with apache-commons-{collections,dbcp,pool}-tomcat5.jar
***************
*** 428,484 ****
  %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms
  
! #Source21: http://repo2.maven.org/maven2/org/apache/tomcat/annotations-api/6.0.32/annotations-api-6.0.32.pom
  %{__install} -m 0644 %{SOURCE21} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-annotations-api.pom
  %add_to_maven_depmap org.apache.tomcat annotations-api %{version} JPP/%{name} annotations-api
  
! #Source22: http://repo2.maven.org/maven2/org/apache/tomcat/catalina/6.0.32/catalina-6.0.32.pom
  %{__install} -m 0644 %{SOURCE22} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-catalina.pom
  %add_to_maven_depmap org.apache.tomcat catalina %{version} JPP/%{name} catalina
  
! #Source23: http://repo2.maven.org/maven2/org/apache/tomcat/catalina-ha/6.0.32/catalina-ha-6.0.32.pom
  %{__install} -m 0644 %{SOURCE23} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-catalina-ha.pom
  %add_to_maven_depmap org.apache.tomcat catalina-ha %{version} JPP/%{name} catalina-ha
  
! #Source24: http://repo2.maven.org/maven2/org/apache/tomcat/coyote/6.0.32/coyote-6.0.32.pom
  %{__install} -m 0644 %{SOURCE24} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-tomcat-coyote.pom
  %add_to_maven_depmap org.apache.tomcat coyote %{version} JPP/%{name} tomcat-coyote
  
! #Source25: http://repo2.maven.org/maven2/org/apache/tomcat/dbcp/6.0.32/dbcp-6.0.32.pom
  %{__install} -m 0644 %{SOURCE25} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-commons-dbcp-tomcat6.pom
  %add_to_maven_depmap org.apache.tomcat dbcp %{version} JPP/%{name} commons-dbcp-tomcat6
  
! #Source26: http://repo2.maven.org/maven2/org/apache/tomcat/el-api/6.0.32/el-api-6.0.32.pom
  %{__install} -m 0644 %{SOURCE26} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP-tomcat6-el-1.0-api.pom
  %add_to_maven_depmap org.apache.tomcat el-api %{version} JPP %{name}-el-1.0-api
  
! #Source27: http://repo2.maven.org/maven2/org/apache/tomcat/extras/juli/6.0.32/juli-6.0.32.pom
  %{__install} -m 0644 %{SOURCE27} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-tomcat-juli-extras.pom
  %add_to_maven_depmap org.apache.tomcat juli-extras %{version} JPP/%{name} tomcat-juli-extras
  
! #Source28: http://repo2.maven.org/maven2/org/apache/tomcat/extras/juli-adapters/6.0.32/juli-adapters-6.0.32.pom
  %{__install} -m 0644 %{SOURCE28} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-tomcat-juli-adapters.pom
  %add_to_maven_depmap org.apache.tomcat juli-adapters %{version} JPP/%{name} tomcat-juli-adapters
  
! #Source29: http://repo2.maven.org/maven2/org/apache/tomcat/jasper/6.0.32/jasper-6.0.32.pom
  %{__install} -m 0644 %{SOURCE29} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-jasper.pom
  %add_to_maven_depmap org.apache.tomcat jasper %{version} JPP/%{name} jasper
  
! #Source30: http://repo2.maven.org/maven2/org/apache/tomcat/jasper-el/6.0.32/jasper-el-6.0.32.pom
  %{__install} -m 0644 %{SOURCE30} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-jasper-el.pom
  %add_to_maven_depmap org.apache.tomcat jasper-el %{version} JPP/%{name} jasper-el
  
! #Source31: http://repo2.maven.org/maven2/org/apache/tomcat/jsp-api/6.0.32/jsp-api-6.0.32.pom
  %{__install} -m 0644 %{SOURCE31} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP-tomcat6-jsp-2.1-api.pom
  %add_to_maven_depmap org.apache.tomcat jsp-api %{version} JPP %{name}-jsp-2.1-api
  
! #Source32: http://repo2.maven.org/maven2/org/apache/tomcat/juli/6.0.32/juli-6.0.32.pom
  %{__install} -m 0644 %{SOURCE32} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-tomcat-juli.pom
  %add_to_maven_depmap org.apache.tomcat juli %{version} JPP/%{name} tomcat-juli
  
! #Source33: http://repo2.maven.org/maven2/org/apache/tomcat/servlet-api/6.0.32/servlet-api-6.0.32.pom
  %{__install} -m 0644 %{SOURCE33} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP-tomcat6-servlet-2.5-api.pom
  %add_to_maven_depmap org.apache.tomcat servlet-api %{version} JPP %{name}-servlet-2.5-api
  
! #Source34: http://repo2.maven.org/maven2/org/apache/tomcat/tribes/6.0.32/tribes-6.0.32.pom
  %{__install} -m 0644 %{SOURCE34} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-catalina-tribes.pom
  %add_to_maven_depmap org.apache.tomcat tribes %{version} JPP/%{name} catalina-tribes
--- 429,485 ----
  %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms
  
! #Source21: http://repo2.maven.org/maven2/org/apache/tomcat/annotations-api/6.0.33/annotations-api-6.0.33.pom
  %{__install} -m 0644 %{SOURCE21} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-annotations-api.pom
  %add_to_maven_depmap org.apache.tomcat annotations-api %{version} JPP/%{name} annotations-api
  
! #Source22: http://repo2.maven.org/maven2/org/apache/tomcat/catalina/6.0.33/catalina-6.0.33.pom
  %{__install} -m 0644 %{SOURCE22} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-catalina.pom
  %add_to_maven_depmap org.apache.tomcat catalina %{version} JPP/%{name} catalina
  
! #Source23: http://repo2.maven.org/maven2/org/apache/tomcat/catalina-ha/6.0.33/catalina-ha-6.0.33.pom
  %{__install} -m 0644 %{SOURCE23} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-catalina-ha.pom
  %add_to_maven_depmap org.apache.tomcat catalina-ha %{version} JPP/%{name} catalina-ha
  
! #Source24: http://repo2.maven.org/maven2/org/apache/tomcat/coyote/6.0.33/coyote-6.0.33.pom
  %{__install} -m 0644 %{SOURCE24} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-tomcat-coyote.pom
  %add_to_maven_depmap org.apache.tomcat coyote %{version} JPP/%{name} tomcat-coyote
  
! #Source25: http://repo2.maven.org/maven2/org/apache/tomcat/dbcp/6.0.33/dbcp-6.0.33.pom
  %{__install} -m 0644 %{SOURCE25} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-commons-dbcp-tomcat6.pom
  %add_to_maven_depmap org.apache.tomcat dbcp %{version} JPP/%{name} commons-dbcp-tomcat6
  
! #Source26: http://repo2.maven.org/maven2/org/apache/tomcat/el-api/6.0.33/el-api-6.0.33.pom
  %{__install} -m 0644 %{SOURCE26} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP-tomcat6-el-1.0-api.pom
  %add_to_maven_depmap org.apache.tomcat el-api %{version} JPP %{name}-el-1.0-api
  
! #Source27: http://repo2.maven.org/maven2/org/apache/tomcat/extras/juli/6.0.33/juli-6.0.33.pom
  %{__install} -m 0644 %{SOURCE27} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-tomcat-juli-extras.pom
  %add_to_maven_depmap org.apache.tomcat juli-extras %{version} JPP/%{name} tomcat-juli-extras
  
! #Source28: http://repo2.maven.org/maven2/org/apache/tomcat/extras/juli-adapters/6.0.33/juli-adapters-6.0.33.pom
  %{__install} -m 0644 %{SOURCE28} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-tomcat-juli-adapters.pom
  %add_to_maven_depmap org.apache.tomcat juli-adapters %{version} JPP/%{name} tomcat-juli-adapters
  
! #Source29: http://repo2.maven.org/maven2/org/apache/tomcat/jasper/6.0.33/jasper-6.0.33.pom
  %{__install} -m 0644 %{SOURCE29} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-jasper.pom
  %add_to_maven_depmap org.apache.tomcat jasper %{version} JPP/%{name} jasper
  
! #Source30: http://repo2.maven.org/maven2/org/apache/tomcat/jasper-el/6.0.33/jasper-el-6.0.33.pom
  %{__install} -m 0644 %{SOURCE30} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-jasper-el.pom
  %add_to_maven_depmap org.apache.tomcat jasper-el %{version} JPP/%{name} jasper-el
  
! #Source31: http://repo2.maven.org/maven2/org/apache/tomcat/jsp-api/6.0.33/jsp-api-6.0.33.pom
  %{__install} -m 0644 %{SOURCE31} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP-tomcat6-jsp-2.1-api.pom
  %add_to_maven_depmap org.apache.tomcat jsp-api %{version} JPP %{name}-jsp-2.1-api
  
! #Source32: http://repo2.maven.org/maven2/org/apache/tomcat/juli/6.0.33/juli-6.0.33.pom
  %{__install} -m 0644 %{SOURCE32} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-tomcat-juli.pom
  %add_to_maven_depmap org.apache.tomcat juli %{version} JPP/%{name} tomcat-juli
  
! #Source33: http://repo2.maven.org/maven2/org/apache/tomcat/servlet-api/6.0.33/servlet-api-6.0.33.pom
  %{__install} -m 0644 %{SOURCE33} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP-tomcat6-servlet-2.5-api.pom
  %add_to_maven_depmap org.apache.tomcat servlet-api %{version} JPP %{name}-servlet-2.5-api
  
! #Source34: http://repo2.maven.org/maven2/org/apache/tomcat/tribes/6.0.33/tribes-6.0.33.pom
  %{__install} -m 0644 %{SOURCE34} ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms/JPP.tomcat6-catalina-tribes.pom
  %add_to_maven_depmap org.apache.tomcat tribes %{version} JPP/%{name} catalina-tribes
***************
*** 658,661 ****
--- 659,665 ----
  
  %changelog
+ * Thu Oct 13 2011 Ralph Apel <r.apel at r-apel.de> 0:6.0.33-1
+ - 6.0.33
+ 
  * Thu Jun 23 2011 Ralph Apel <r.apel at r-apel.de> 0:6.0.32-2
  - Add missing update_maven_depmap

--- juli-extras-6.0.32.pom DELETED ---

--- jasper-el-6.0.32.pom DELETED ---

--- NEW FILE: dbcp-6.0.33.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-->
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.tomcat</groupId>
  <artifactId>dbcp</artifactId>
  <version>6.0.33</version>
  <description>Tomcat Database Connection Pooling package</description>
</project>

--- NEW FILE: coyote-6.0.33.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-->
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.tomcat</groupId>
  <artifactId>coyote</artifactId>
  <version>6.0.33</version>
  <description>Tomcat Connectors and HTTP parser</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>catalina</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>servlet-api</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>juli</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
</project>

--- tribes-6.0.32.pom DELETED ---

--- NEW FILE: jasper-6.0.33.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-->
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.tomcat</groupId>
  <artifactId>jasper</artifactId>
  <version>6.0.33</version>
  <description>Tomcats JSP Parser</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>servlet-api</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>juli</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>jsp-api</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>catalina</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>el-api</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.eclipse.jdt.core.compiler</groupId>
      <artifactId>ecj</artifactId>
      <version>3.3.1</version>
    </dependency>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>jasper-el</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
</project>

--- NEW FILE: juli-6.0.33.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-->
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.tomcat</groupId>
  <artifactId>juli</artifactId>
  <version>6.0.33</version>
  <description>Tomcat Core Logging Package</description>
</project>

--- NEW FILE: tribes-6.0.33.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-->
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.tomcat</groupId>
  <artifactId>tribes</artifactId>
  <version>6.0.33</version>
  <description>Tomcat Group Communication Package</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>juli</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
</project> 

--- NEW FILE: el-api-6.0.33.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-->
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.tomcat</groupId>
  <artifactId>el-api</artifactId>
  <version>6.0.33</version>
  <description>Expression language package</description>
</project>

--- NEW FILE: juli-adapters-6.0.33.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-->
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.tomcat.extras</groupId>
  <artifactId>juli-adapters</artifactId>
  <version>6.0.33</version>
  <description>Adapters to plug in other logging frameworks in Tomcat</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.tomcat.extras</groupId>
      <artifactId>juli</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>servlet-api</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
      <optional>true</optional>
    </dependency>
  </dependencies>
</project>

--- juli-6.0.32.pom DELETED ---

--- NEW FILE: jasper-el-6.0.33.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-->
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.tomcat</groupId>
  <artifactId>jasper-el</artifactId>
  <version>6.0.33</version>
  <description>Jasper Expression Language Impl</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>el-api</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
</project>


--- catalina-6.0.32.pom DELETED ---

--- juli-adapters-6.0.32.pom DELETED ---

--- NEW FILE: jsp-api-6.0.33.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-->
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.tomcat</groupId>
  <artifactId>jsp-api</artifactId>
  <version>6.0.33</version>
  <description>JSP package</description>
  <dependencies>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>el-api</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>servlet-api</artifactId>
      <version>6.0.33</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
</project>

--- el-api-6.0.32.pom DELETED ---

--- NEW FILE: annotations-api-6.0.33.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-->
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.tomcat</groupId>
  <artifactId>annotations-api</artifactId>
  <version>6.0.33</version>
  <description>Annotations Package</description>
</project>
--- annotations-api-6.0.32.pom DELETED ---




More information about the JPackage-commits mailing list