Version bump. Remove vulnerable version of jackrabbit-webdav. Fix security bug 550122.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

3 files changed, 54 insertions, 46 deletions

diff --git a/dev-java/jackrabbit-webdav/ChangeLog b/dev-java/jackrabbit-webdav/ChangeLog
index 6fbe3c439cac..fefe80fde76e 100644
--- a/dev-java/jackrabbit-webdav/ChangeLog
+++ b/dev-java/jackrabbit-webdav/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/jackrabbit-webdav
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jackrabbit-webdav/ChangeLog,v 1.3 2014/08/10 20:15:33 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jackrabbit-webdav/ChangeLog,v 1.4 2015/05/22 16:02:50 monsieurp Exp $
+
+*jackrabbit-webdav-2.10.1 (22 May 2015)
+
+  22 May 2015; Patrice Clement <monsieurp@gentoo.org>
+  +files/jackrabbit-webdav-2.10.1-build.xml, +jackrabbit-webdav-2.10.1.ebuild,
+  -files/jackrabbit-webdav-2.6.2-build.xml, -jackrabbit-webdav-2.6.2.ebuild:
+  Version bump. Remove vulnerable version of jackrabbit-webdav. Fix security bug
+  550122.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   jackrabbit-webdav-2.6.2.ebuild:
diff --git a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.6.2-build.xml b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-build.xml
index 4814ba3beb55..3c3a41206421 100644
--- a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.6.2-build.xml
+++ b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-build.xml
@@ -10,7 +10,7 @@
 <!--                                                                        -->
 <!-- Any modifications will be overwritten.                                 -->
 <!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/23/13 10:08 AM                      -->
+<!-- Generated by Maven Ant Plugin on 5/22/15 2:49 PM                       -->
 <!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
 <!--                                                                        -->
 <!-- ====================================================================== -->
@@ -24,7 +24,7 @@
   <property file="${user.home}/.m2/maven.properties"/>
   <property file="maven-build.properties"/>
 
-  <property name="maven.build.finalName" value="jackrabbit-webdav-2.6.2"/>
+  <property name="maven.build.finalName" value="jackrabbit-webdav-2.10.1"/>
   <property name="maven.build.dir" value="target"/>
   <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
   <property name="maven.build.srcDir.0" value="src/main/java"/>
@@ -45,23 +45,23 @@
 
   <path id="build.classpath">
     <pathelement location="${maven.repo.local}/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar"/>
     <pathelement location="${maven.repo.local}/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
     <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
     <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar"/>
   </path>
   <path id="build.test.classpath">
     <pathelement location="${maven.repo.local}/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar"/>
     <pathelement location="${maven.repo.local}/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
     <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
     <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar"/>
     <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/>
     <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
-    <pathelement location="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.0/logback-classic-1.0.0.jar"/>
-    <pathelement location="${maven.repo.local}/ch/qos/logback/logback-core/1.0.0/logback-core-1.0.0.jar"/>
+    <pathelement location="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.12/logback-classic-1.0.12.jar"/>
+    <pathelement location="${maven.repo.local}/ch/qos/logback/logback-core/1.0.12/logback-core-1.0.12.jar"/>
   </path>
 
   <!-- ====================================================================== -->
@@ -102,7 +102,6 @@
   <!-- ====================================================================== -->
 
   <target name="compile-tests" 
-          depends="compile" 
           description="Compile the test code" 
           unless="maven.test.skip">
     <mkdir dir="${maven.build.testOutputDir}"/>
@@ -133,7 +132,7 @@
   <!-- ====================================================================== -->
 
   <target name="test" 
-          depends="compile-tests, junit-missing" 
+          depends="compile-tests" 
           unless="junit.skipped" 
           description="Run the test cases">
     <mkdir dir="${maven.test.reports}"/>
@@ -161,6 +160,7 @@
     </junit>
   </target>
 
+  <!--
   <target name="test-junit-present">
     <available classname="junit.framework.Test" property="junit.present"/>
   </target>
@@ -185,9 +185,10 @@
           depends="test-junit-status" 
           if="junit.missing">
     <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
     <echo>===============================================================================</echo>
   </target>
+  -->
 
   <!-- ====================================================================== -->
   <!-- Javadoc target                                                         -->
@@ -224,7 +225,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="compile,test" description="Package the application">
+  <target name="package" depends="compile" description="Package the application">
     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
          compress="true" 
          index="false" 
@@ -259,17 +260,17 @@
          dest="${maven.repo.local}/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar" 
+    <get src="https://repo.maven.apache.org/maven2/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar" 
          dest="${maven.repo.local}/biz/aQute/bndlib/1.43.0/bndlib-1.43.0.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.6.4"/>
-    <get src="http://repository.apache.org/snapshots/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" 
-         dest="${maven.repo.local}/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" 
+    <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.6.6"/>
+    <get src="http://repository.apache.org/snapshots/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar" 
+         dest="${maven.repo.local}/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" 
-         dest="${maven.repo.local}/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" 
+    <get src="https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar" 
+         dest="${maven.repo.local}/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
     <mkdir dir="${maven.repo.local}/javax/servlet/servlet-api/2.3"/>
@@ -277,7 +278,7 @@
          dest="${maven.repo.local}/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" 
+    <get src="https://repo.maven.apache.org/maven2/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" 
          dest="${maven.repo.local}/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
@@ -286,7 +287,7 @@
          dest="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" 
+    <get src="https://repo.maven.apache.org/maven2/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" 
          dest="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
@@ -295,17 +296,17 @@
          dest="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.2/commons-codec-1.2.jar" 
+    <get src="https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.2/commons-codec-1.2.jar" 
          dest="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.6.4"/>
-    <get src="http://repository.apache.org/snapshots/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar" 
-         dest="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar" 
+    <mkdir dir="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.7.4"/>
+    <get src="http://repository.apache.org/snapshots/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar" 
+         dest="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar" 
-         dest="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar" 
+    <get src="https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar" 
+         dest="${maven.repo.local}/org/slf4j/jcl-over-slf4j/1.7.4/jcl-over-slf4j-1.7.4.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
     <mkdir dir="${maven.repo.local}/junit/junit/4.10"/>
@@ -313,7 +314,7 @@
          dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.10/junit-4.10.jar" 
+    <get src="https://repo.maven.apache.org/maven2/junit/junit/4.10/junit-4.10.jar" 
          dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
@@ -322,26 +323,26 @@
          dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+    <get src="https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
          dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.0"/>
-    <get src="http://repository.apache.org/snapshots/ch/qos/logback/logback-classic/1.0.0/logback-classic-1.0.0.jar" 
-         dest="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.0/logback-classic-1.0.0.jar" 
+    <mkdir dir="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.12"/>
+    <get src="http://repository.apache.org/snapshots/ch/qos/logback/logback-classic/1.0.12/logback-classic-1.0.12.jar" 
+         dest="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.12/logback-classic-1.0.12.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/ch/qos/logback/logback-classic/1.0.0/logback-classic-1.0.0.jar" 
-         dest="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.0/logback-classic-1.0.0.jar" 
+    <get src="https://repo.maven.apache.org/maven2/ch/qos/logback/logback-classic/1.0.12/logback-classic-1.0.12.jar" 
+         dest="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.12/logback-classic-1.0.12.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/ch/qos/logback/logback-core/1.0.0"/>
-    <get src="http://repository.apache.org/snapshots/ch/qos/logback/logback-core/1.0.0/logback-core-1.0.0.jar" 
-         dest="${maven.repo.local}/ch/qos/logback/logback-core/1.0.0/logback-core-1.0.0.jar" 
+    <mkdir dir="${maven.repo.local}/ch/qos/logback/logback-core/1.0.12"/>
+    <get src="http://repository.apache.org/snapshots/ch/qos/logback/logback-core/1.0.12/logback-core-1.0.12.jar" 
+         dest="${maven.repo.local}/ch/qos/logback/logback-core/1.0.12/logback-core-1.0.12.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/ch/qos/logback/logback-core/1.0.0/logback-core-1.0.0.jar" 
-         dest="${maven.repo.local}/ch/qos/logback/logback-core/1.0.0/logback-core-1.0.0.jar" 
+    <get src="https://repo.maven.apache.org/maven2/ch/qos/logback/logback-core/1.0.12/logback-core-1.0.12.jar" 
+         dest="${maven.repo.local}/ch/qos/logback/logback-core/1.0.12/logback-core-1.0.12.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
   </target>
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.6.2.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
index c07bee67f7c4..a1a2f755eba5 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.6.2.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.6.2.ebuild,v 1.3 2015/04/02 18:10:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild,v 1.1 2015/05/22 16:02:50 monsieurp Exp $
 
 EAPI="5"
 
@@ -25,16 +25,15 @@ CDEPEND="dev-java/bndlib:0
 	dev-java/slf4j-api:0
 	java-virtuals/servlet-api:2.3"
 
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
 	${CDEPEND}
-	test? ( dev-java/junit:0 )"
+	test? ( dev-java/ant-junit:0 )"
 
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
 	${CDEPEND}"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_GENTOO_CLASSPATH="bndlib,commons-httpclient-3,servlet-api-2.3,slf4j-api"
-EANT_TEST_GENTOO_CLASSPATH="junit"
 
 java_prepare() {
 	cp "${FILESDIR}"/${P}-build.xml build.xml || die