gentoo resync : 20.03.2022

7 files changed, 66 insertions, 459 deletions

diff --git a/dev-java/jackrabbit-webdav/Manifest b/dev-java/jackrabbit-webdav/Manifest
index 42d64f03a3d5..e59491573c70 100644
--- a/dev-java/jackrabbit-webdav/Manifest
+++ b/dev-java/jackrabbit-webdav/Manifest
@@ -1,9 +1,6 @@
-AUX jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch 678 BLAKE2B a240957e24b0e0961d680b4868dafe0fc4b337cb96a6eaed9bd0a23099d4e5d47757a846776abee196941514b329de5b08ef42219edbb8f2ae4b26f210efbd04 SHA512 00e7e1e102f3d518a6c0ed088ba286b84ae5991a73fe01bdc353fe0550289a95b69f7fc69b46b1423f6b42ea51e4b38b02d266bd9abb6663881a53223dd6cb9a
-AUX jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch 700 BLAKE2B f3c54de43be927bf53c07bf29af744449864b43684e8e32bc8f6e7c40efd4cd5b6cb09b953d83c02147e96dd4548d2b285b3658f7ec3edeaac62c33e49d40f9c SHA512 f7f26b207be3f9fc19a1226ed01e5774de7411fe440a450459dbfc20b19db77e29e40adb3e5e18f72b637c51774baae4a26d024d43ea785715c0c89b91c1c46e
-AUX jackrabbit-webdav-2.10.1-build.xml 17644 BLAKE2B c878975d2f1ffe74752b36873d0625c73605469e5d8a1287568b461fe402e4a91ea0f2c6334514d526a011dbe4311b0b49439d508c9ea99e127cad49abe6ebee SHA512 5b22661e3d36d227edb618b553671964be14f34dd245f1749caf9b6f3c9981fdc9fad11659ae98cdd5fb3b343b6bc450478d3655054b055f7ffb3663378b7a8a
 DIST jackrabbit-2.10.1-src.zip 13437021 BLAKE2B 3542bbe5f7c8ab8feb585fecdaca028a4908eb664d01cb9fb32156c71756973671969b1141e796fbc165f7f6f305db25f74d36657e4d86dac6766e4d79b888dd SHA512 c371ff941054f3a916f43f7020f0aebd8146422835a75ab2ad9f9f716c4ef0a94b3b962f9b6e4fadef87b9e82e8143b4ece27280714a4eb71a6b0a38c47d48e9
 DIST jackrabbit-2.21.7-src.zip 13532529 BLAKE2B ea3ebf687e29b58e75840d6f5665da8abcb474dbaa353c0caf6a8d1cb1de6c6347830cbe0b6c91259fd496eeff834278874b64306da85a7e0c82ab71dd0b1c34 SHA512 254e151ed7e814ff8b4df985814ace12316a9dc56e87f4ba6236986ac2364936d3b15327f50ebc1b9fa7ac9bbed067924148436cc8ac31a7ef91d11faecb4678
-EBUILD jackrabbit-webdav-2.10.1-r2.ebuild 1340 BLAKE2B 07024d9b55a48a7a57c44f911d1570e188b4968666a000fd336aebf2d7fc2cc846dae4e943d0063c8386c2273b52c5a44a8095d4ed235fe8b3d84e5bdb09deb2 SHA512 5c2d5a1bda66e4e370cf6e7b030c29fff01f2d3d30687d6cdb08ff1b6d2c1069f8adb264d62262053e767039b640804f1bb527b8588c6c99eb862d3b1669a9f1
-EBUILD jackrabbit-webdav-2.10.1.ebuild 1279 BLAKE2B 1d2eb70b66d3ce9f30ab90467af0a78ed6a251559c581a19ce74d4846b8c21eddace72fdb0aba0e1b919563180d040c9b70f16b0c66d7597274fbdcde027f8cf SHA512 09aa64702b82c18b124f7f41eb5de6480dffcfc7e6503877a428c4dbc40ecae72a1d1e41c5b7aeb3cf50185aa918716432128a092929a184af5421253145da00
+EBUILD jackrabbit-webdav-2.10.1-r2.ebuild 1336 BLAKE2B 29fe4d5a86ec6cbd57037c32cd5dcad29df07d323b7805d373671cfffefaea588cea0d1ca37e166acf9db4d085dff0d11c61b6f8ef15075ddd293cda28aee5a1 SHA512 d64d1b4c323cdc147cc5dc171f06bf674a6fb5035147936177698f63c2ed401d3b53e0d96222aa5a34b724af16fa9732c7d786736c73318b227a64db9033b180
+EBUILD jackrabbit-webdav-2.21.7-r1.ebuild 2091 BLAKE2B 2e18caad07fec96b7801460c1db441a357d19fc357344de37718c87b586fcdfc653002c6d0c048674092eb44e04d9f6313dabe10aa2de5ebeb5e242675ccd481 SHA512 1dbced75f1be447f4fd14ed88402fec60d2a30f16cce802a83e6a61c496aef8c77155c86d4ebd95354a107171eec7bab6c4354b29565747c191e9b486a8c50eb
 EBUILD jackrabbit-webdav-2.21.7.ebuild 2082 BLAKE2B 87576a5edaa1ee1a2ba080d5e97663e468425e2be50bae6816eb8a3096f40272541625b805d8d181dd9cdab4101245bd9123cf2ba5c514879fd9ee973e4655d9 SHA512 f6122353276b1f8ef8b754dea98b09dc01b9cf5ddac97c996b2da31dc54329b256972fc29a0cb6534dfb7313d7236b56543b0e3aa0ddd9774ca5042f06a9f2c6
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch
deleted file mode 100644
index 8417f31cfceb..000000000000
--- a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java.orig	2015-07-03 09:36:45.804000000 +0000
-+++ b/src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java	2015-07-03 09:36:59.498000000 +0000
-@@ -281,6 +281,18 @@
-         public void removeAttribute(String name) {
- 
-         }
-+        public int getRemotePort() {
-+            return 0;
-+        }
-+        public String getLocalName() {
-+            return null;
-+        }
-+        public String getLocalAddr() {
-+            return null;
-+        }
-+        public int getLocalPort() {
-+            return 0;
-+        }
-         public Locale getLocale() {
-             return null;
-         }
diff --git a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch
deleted file mode 100644
index 9f132b817a12..000000000000
--- a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java.orig	2015-07-03 09:26:48.578000000 +0000
-+++ b/src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java	2015-07-03 09:27:34.109000000 +0000
-@@ -40,6 +40,13 @@
-             public void setHeader(String name, String value) {
-                 assertTrue(Long.parseLong(value) > Integer.MAX_VALUE);
-             }
-+            @Override
-+            public void setCharacterEncoding(String name) {
-+            }
-+            @Override
-+            public String getContentType() {
-+                return null;
-+            }
-         };
- 
-         OutputContext ctx = new OutputContextImpl(response, null);
diff --git a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-build.xml b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-build.xml
deleted file mode 100644
index 3c3a41206421..000000000000
--- a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-build.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/22/15 2:49 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jackrabbit-webdav-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <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"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <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.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.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.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.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.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>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/*TestAll.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <!--
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</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                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             source="1.6" 
-             linksource="false" 
-             breakiterator="false">
-      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
-      <link href="http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0/"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/biz/aQute/bndlib/1.43.0"/>
-    <get src="http://repository.apache.org/snapshots/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"/>
-    <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.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="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"/>
-    <get src="http://repository.apache.org/snapshots/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"/>
-    <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"/>
-    <mkdir dir="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1"/>
-    <get src="http://repository.apache.org/snapshots/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"/>
-    <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"/>
-    <mkdir dir="${maven.repo.local}/commons-codec/commons-codec/1.2"/>
-    <get src="http://repository.apache.org/snapshots/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"/>
-    <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.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="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"/>
-    <get src="http://repository.apache.org/snapshots/junit/junit/4.10/junit-4.10.jar" 
-         dest="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <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"/>
-    <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1"/>
-    <get src="http://repository.apache.org/snapshots/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"/>
-    <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.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="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.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="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>
-
-</project>
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild
index 108db165b5f0..de5e7d799a3f 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
 
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
deleted file mode 100644
index 2f95946aa570..000000000000
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="${PN/-*/}"
-
-DESCRIPTION="Fully conforming implementation of the JRC API (specified in JSR 170 and 283)"
-HOMEPAGE="http://jackrabbit.apache.org/"
-SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
-
-CDEPEND="dev-java/bndlib:0
-	dev-java/slf4j-api:0
-	dev-java/slf4j-nop:0
-	dev-java/commons-httpclient:3
-	java-virtuals/servlet-api:2.3"
-
-DEPEND="app-arch/unzip
-	>=virtual/jdk-1.6
-	${CDEPEND}
-	test? ( dev-java/ant-junit:0 )"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-	bndlib
-	commons-httpclient-3
-	servlet-api-2.3
-	slf4j-api
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-OutputContextImplTest.java.patch
-	"${FILESDIR}"/${P}-CSRFUtilTest.java.patch
-)
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-	epatch "${PATCHES[@]}"
-}
-
-EANT_TEST_GENTOO_CLASSPATH="
-	${EANT_GENTOO_CLASSPATH}
-	slf4j-nop
-"
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-}
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
new file mode 100644
index 000000000000..9a02a05c7708
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.halifax.rwth-aachen.de/gentoo/distfiles/3b/jackrabbit-2.21.7-src.zip --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jackrabbit-webdav-2.21.7.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.jackrabbit:jackrabbit-webdav:2.21.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Generic WebDAV Library"
+HOMEPAGE="http://jackrabbit.apache.org/jackrabbit-webdav/"
+SRC_URI="mirror://apache/jackrabbit/${PV}/jackrabbit-${PV}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.apache.httpcomponents:httpclient:4.5.13 -> >=dev-java/commons-httpclient-4.5.13:4
+# org.apache.httpcomponents:httpcore:4.4.14 -> >=dev-java/httpcore-4.4.14:0
+# org.slf4j:jcl-over-slf4j:1.7.30 -> !!!artifactId-not-found!!!
+# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+
+CDEPEND="
+	dev-java/httpcomponents-client:4
+	dev-java/httpcore:0
+	dev-java/osgi-annotation-versioning:0
+	dev-java/slf4j-api:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!!
+# org.osgi:org.osgi.annotation:6.0.0 -> !!!groupId-not-found!!!
+# POM: pom.xml
+# test? ch.qos.logback:logback-classic:1.2.3 -> !!!groupId-not-found!!!
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/osgi-annotation-versioning:0
+	java-virtuals/servlet-api:3.1"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/jackrabbit-${PV}/${PN}"
+
+JAVA_GENTOO_CLASSPATH="httpcomponents-client-4,httpcore,osgi-annotation-versioning,servlet-api-3.1,slf4j-api"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS=( "src/main/resources" "src/main/appended-resources" )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"