summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
authorLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2022-02-23 13:41:38 +0000
committerLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2022-02-23 13:41:38 +0000
commit3c3115cb27f413fef1c645e08f80390858db55b1 (patch)
tree933bc4b85bde41ab877eec6257725b5b12ddd5dc /dev-java
parent87200ae85c39b37cc66a5c0fa5682cf2ae94df0a (diff)
downloadbaldeagleos-repo-3c3115cb27f413fef1c645e08f80390858db55b1.tar.gz
baldeagleos-repo-3c3115cb27f413fef1c645e08f80390858db55b1.tar.xz
baldeagleos-repo-3c3115cb27f413fef1c645e08f80390858db55b1.zip
Adding metadata
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/cglib/cglib-3.3.0-r1.ebuild2
-rw-r--r--dev-java/felix-gogo-runtime/Manifest1
-rw-r--r--dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild42
-rw-r--r--dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-build.xml294
-rw-r--r--dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch22
-rw-r--r--dev-java/felix-gogo-runtime/metadata.xml10
-rw-r--r--dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild2
-rw-r--r--dev-java/leiningen-bin/Manifest6
-rw-r--r--dev-java/leiningen-bin/leiningen-bin-2.8.0.ebuild62
-rw-r--r--dev-java/leiningen-bin/leiningen-bin-2.8.1.ebuild62
-rw-r--r--dev-java/leiningen-bin/leiningen-bin-2.8.3.ebuild62
-rw-r--r--dev-java/log4j-api-java9/Manifest2
-rw-r--r--dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild (renamed from dev-java/log4j-api-java9/log4j-api-java9-2.15.0.ebuild)8
-rw-r--r--dev-java/spin/spin-1.5-r2.ebuild93
-rw-r--r--dev-java/xp/Manifest1
-rw-r--r--dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch30
-rw-r--r--dev-java/xp/metadata.xml10
-rw-r--r--dev-java/xp/xp-0.5-r4.ebuild31
18 files changed, 100 insertions, 640 deletions
diff --git a/dev-java/cglib/cglib-3.3.0-r1.ebuild b/dev-java/cglib/cglib-3.3.0-r1.ebuild
index d82a7f3a7d4a..26ae3e989c16 100644
--- a/dev-java/cglib/cglib-3.3.0-r1.ebuild
+++ b/dev-java/cglib/cglib-3.3.0-r1.ebuild
@@ -57,7 +57,7 @@ src_test() {
# throws java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @42bb2aee
local vm_version="$(java-config -g PROVIDES_VERSION)"
- if [[ "${vm_version}" -ge "17" ]] ; then
+ if ver_test "${vm_version}" -ge "17" ; then
JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
fi
diff --git a/dev-java/felix-gogo-runtime/Manifest b/dev-java/felix-gogo-runtime/Manifest
deleted file mode 100644
index 43680c468573..000000000000
--- a/dev-java/felix-gogo-runtime/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST org.apache.felix.gogo.runtime-0.10.0-project.tar.gz 69837 BLAKE2B 3ffd6cc308b3125ee8cd467945ca58a9fcf3125d32b23f68065fa7a9266210d186ebf3aba354f64a9d2c38a176ac7a5767e4349707a56dcbd77831eb24df928c SHA512 a71100796e400103cf9d46fcdb7bf45b5d1d180328db27900915c1771650297c9135589dc91e4c2194634b4312ea7c064b71496a7e11e9a3393bdc6eeb70e03d
diff --git a/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild b/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild
deleted file mode 100644
index 83da8b38fd5b..000000000000
--- a/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="Felix Gogo Runtime"
-HOMEPAGE="https://felix.apache.org/site/apache-felix-gogo.html"
-LICENSE="Apache-2.0"
-
-MY_PN="org.apache.felix.gogo.runtime"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://apache/felix/${MY_P}-project.tar.gz"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND=">=virtual/jdk-1.6
- dev-java/osgi-compendium:0
- dev-java/osgi-core-api:0"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
- cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
- epatch "${FILESDIR}"/${P}-event-properties-to-map.patch
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_compile() {
- EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only osgi-core-api osgi-core-api.jar):$(java-pkg_getjar --build-only osgi-compendium osgi-compendium.jar)"
-
- java-pkg-2_src_compile
-}
-
-src_install() {
- java-osgi_newjar "${S}"/target/${MY_P}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
-}
diff --git a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-build.xml b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-build.xml
deleted file mode 100644
index 4bcd4c42ad62..000000000000
--- a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-build.xml
+++ /dev/null
@@ -1,294 +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/13/13 1:33 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="org.apache.felix.gogo.runtime-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="org.apache.felix.gogo.runtime-0.10.0"/>
- <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.resourceDir.1" value="."/>
- <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}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"/>
- <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
- </path>
- <path id="build.test.classpath">
- <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"/>
- <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
- <pathelement location="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"/>
- <pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
- <pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.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.5"
- verbose="false"
- fork="false"
- source="1.5">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- <mkdir dir="${maven.build.outputDir}/META-INF"/>
- <copy todir="${maven.build.outputDir}/META-INF">
- <fileset dir="${maven.build.resourceDir.1}">
- <include name="LICENSE*"/>
- <include name="NOTICE*"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- 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.5"
- verbose="false"
- fork="false"
- source="1.5">
- <src>
- <pathelement location="${maven.build.testDir.0}"/>
- </src>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- </classpath>
- </javac>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- 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="**/Test*.java"/>
- <include name="**/*Test.java"/>
- <include name="**/*TestCase.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 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"
- linksource="false"
- breakiterator="false"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html"/>
- </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}/org/osgi/org.osgi.core/4.0.0"/>
- <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"
- dest="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"
- dest="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0"/>
- <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
- dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
- dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/junit/junit/4.5"/>
- <get src="http://repository.apache.org/snapshots/junit/junit/4.5/junit-4.5.jar"
- dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/junit/junit/4.5/junit-4.5.jar"
- dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
- <get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar"
- dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar"
- dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
- <get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
- dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
- dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- </target>
-
-</project>
diff --git a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch
deleted file mode 100644
index ae2e67cf3abe..000000000000
--- a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java 2013-05-13 13:40:57.071766332 +0200
-+++ src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java.2 2013-05-13 13:41:30.725096685 +0200
-@@ -18,7 +18,7 @@
- */
- package org.apache.felix.gogo.runtime.activator;
-
--import java.util.Properties;
-+import java.util.HashMap;
-
- import org.apache.felix.gogo.api.CommandSessionListener;
- import org.apache.felix.service.command.CommandSession;
-@@ -43,8 +43,8 @@
- public void beforeExecute(CommandSession session, CharSequence command) {
- EventAdmin admin = (EventAdmin) tracker.getService();
- if (admin != null) {
-- Properties props = new Properties();
-- props.setProperty("command", command.toString());
-+ HashMap<String, String> props = new HashMap<String, String>();
-+ props.put(new String("command"), command.toString());
- Event event = new Event("org/apache/felix/service/command/EXECUTING", props);
- admin.postEvent(event);
- }
diff --git a/dev-java/felix-gogo-runtime/metadata.xml b/dev-java/felix-gogo-runtime/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/felix-gogo-runtime/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
-
- <origin>gentoo-staging</origin>
-</pkgmetadata> \ No newline at end of file
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild
index 15d216b6bcdc..00527219be1e 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.0.ebuild
@@ -103,7 +103,7 @@ src_test() {
# java.util.LinkedList.first accessible: module java.base does not "opens java.util" to unnamed module @42bb2aee
local vm_version="$(java-config -g PROVIDES_VERSION)"
- if [[ "${vm_version}" -ge "17" ]] ; then
+ if ver_test "${vm_version}" -ge "17" ; then
JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
fi
diff --git a/dev-java/leiningen-bin/Manifest b/dev-java/leiningen-bin/Manifest
index 75202b393bb9..cd1269617f4f 100644
--- a/dev-java/leiningen-bin/Manifest
+++ b/dev-java/leiningen-bin/Manifest
@@ -1,8 +1,2 @@
-DIST leiningen-2.8.0-standalone.jar 13541842 BLAKE2B 79697751b9da90a3f61bd4b8722436d1af1ce9f8db5c0e3a68d15d006f2afcb9518ab2034554b9b8a8e5f8bb991b304d51b8f45fb9a77d7337718035dc271e7d SHA512 e16359b2d211f9a72eeb9b672a94155f49531cbb731df11451b76ec30ad83be4a22e0b2ecc582bb01fdadd6822f56f27d42fa214df222f6c95e0fde64cb305ed
-DIST leiningen-2.8.0.sh 4335 BLAKE2B 951cc9b69e726bbb84c88b8b6407386c878cb1521c5cd79c7ce39ed48805cd24e9af0102f21cd7e852a024830b151751d42e7524f729bcca40f0e7de013ceb8b SHA512 08a5e2fc68ac3bd34dc32558088bd2ff79c9d72c54a610cfcd8c79fa5dcb98ad28d6950cb91b88081d024d5be881a168c2f9235c7888aa36c0f0e7e1f124169f
-DIST leiningen-2.8.1-standalone.jar 13541128 BLAKE2B f38c5d9e8e0088af352f915c2e3290bbbd97fd791607e1553109084a302c6c58d37f1d712b68b31d16d5de83239a9908bcf69aad0eaf1d2dc2e358090665fab8 SHA512 7c585d25f7089dbd718d84711b202b087ec4987f2e1a448fc00cb789a12da88967c048f2de1d087c9e81c6fcfd8b82825117220ba729096b4c946ae25504c716
-DIST leiningen-2.8.1.sh 4461 BLAKE2B ed3fe5421bfdf4fc3a0a8d09bba7c3ca4de4571bd2dcd26251af338dcff0baaa71208c83317b62067f2fcde4a70aef5593cc7c31742eed6ce5db8c3ce8a80b9b SHA512 77ef29885a87e7c23b972d519cdb052b94a74d63f8a455935c199f5f7c04ab30ed06503792ea5a21ac047c7abdcf7e4e72e54114b96f984e4bcb9790e97909de
-DIST leiningen-2.8.3-standalone.jar 13598124 BLAKE2B 1810acb75adb25985b660d14d5be429a82b81480d38a6325ddb99a34ae6d44fed0b19243135c673001ff958935d1bb8e912940e22b25b3aed7982a80fbbd3fb3 SHA512 f9ed3604dbf0498524b3a137a872576de7cb5b8df6d4841cf6d552adc0b8cf2186244805cd53228d57c4285803069ed8a67a8dd33a326369cb468dcc773444f7
-DIST leiningen-2.8.3.sh 4509 BLAKE2B b5291c5596dea00c2043ae7c791f2a79077e545eec667a99e584400af5351258fb5041037fe060a12033115dd0fbc63a8e9ad83f1d6c926c231d49ad331adb51 SHA512 d62a5e9bbf10d940763ca988f900900413e80bf9d0e2d8c668f897f178dbc64daf7b828e8dcd1c72aa0794e266814491122b8d8acd47c5561feec177595cabdd
DIST leiningen-2.9.1-standalone.jar 14621704 BLAKE2B 51d3aca27c56dcdf1560271509e6c4868e387255af5f4e75f42755243b14949ef994cbee81f796a5a533089433fff59e9aff65d7e4e93df02e86fccfd47cf7f9 SHA512 4364aa2a071117049f97f95e020f75bfd0875c88475591d4e04100ac1b228137360a8b24c09877cd3400b7854bf9392b4e5d07ed7f7972e10e4ef5396d0db574
DIST leiningen-2.9.1.sh 4511 BLAKE2B 66fd656c20ed9b109982840315951b062b1a3fbf0b2b76fc1b6ca612d4daa5d07480838f3f58ec1f1193ff29318323123b6f58bde390d4fb628566687ed39eab SHA512 044621254d31bee3bcdd3f6bd52e9c233a736e2e780edaa3af1d5a7a90424294efd25590c9d3a0606560b223b9e73c87c258fbbb626d2af1b39a400ba1aea86d
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.8.0.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.8.0.ebuild
deleted file mode 100644
index dd80a3d2fd2f..000000000000
--- a/dev-java/leiningen-bin/leiningen-bin-2.8.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_PNV="${MY_PN}-${PV}"
-
-DESCRIPTION="Automate Clojure projects without setting your hair on fire"
-HOMEPAGE="https://leiningen.org/"
-SRC_URI="
- https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.zip -> ${MY_PNV}-standalone.jar
- https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
-"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-RESTRICT="test"
-
-src_unpack() {
- mkdir -p "${S}" || die "Can't mkdir ${S}"
- cd "${S}" || die "Can't enter ${S}"
- for file in ${A}; do
- einfo "Copying ${file}"
- cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
- done
-}
-
-src_prepare() {
- einfo "Copying leinrc"
- cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
- einfo "Patching leinrc"
- sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
-
- einfo "Renaming lein-pkg"
- # Rename generically to help user patching
- mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
-
- einfo "Patching lein"
- java-pkg_init_paths_
- sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${EPREFIX}/${JAVA_PKG_JARDEST#/}/${PN}.jar|" "${S}/lein" \
- || die "Can't patch LEIN_JAR in lein"
-
- default
-}
-
-src_compile() { :; }
-
-src_install() {
- dobin "${S}/lein"
- java-pkg_newjar "${MY_PNV}-standalone.jar"
- insinto /etc
- doins "${S}/leinrc"
- fperms 0644 "/etc/leinrc"
-}
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.8.1.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.8.1.ebuild
deleted file mode 100644
index c8a23a81510b..000000000000
--- a/dev-java/leiningen-bin/leiningen-bin-2.8.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_PNV="${MY_PN}-${PV}"
-
-DESCRIPTION="Automate Clojure projects without setting your hair on fire"
-HOMEPAGE="https://leiningen.org/"
-SRC_URI="
- https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.zip -> ${MY_PNV}-standalone.jar
- https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
-"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-RESTRICT="test"
-
-src_unpack() {
- mkdir -p "${S}" || die "Can't mkdir ${S}"
- cd "${S}" || die "Can't enter ${S}"
- for file in ${A}; do
- einfo "Copying ${file}"
- cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
- done
-}
-
-src_prepare() {
- einfo "Copying leinrc"
- cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
- einfo "Patching leinrc"
- sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
-
- einfo "Renaming lein-pkg"
- # Rename generically to help user patching
- mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
-
- einfo "Patching lein"
- java-pkg_init_paths_
- sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${EPREFIX}/${JAVA_PKG_JARDEST#/}/${PN}.jar|" "${S}/lein" \
- || die "Can't patch LEIN_JAR in lein"
-
- default
-}
-
-src_compile() { :; }
-
-src_install() {
- dobin "${S}/lein"
- java-pkg_newjar "${MY_PNV}-standalone.jar"
- insinto /etc
- doins "${S}/leinrc"
- fperms 0644 "/etc/leinrc"
-}
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.8.3.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.8.3.ebuild
deleted file mode 100644
index 8025bfa59aba..000000000000
--- a/dev-java/leiningen-bin/leiningen-bin-2.8.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_PNV="${MY_PN}-${PV}"
-
-DESCRIPTION="Automate Clojure projects without setting your hair on fire"
-HOMEPAGE="https://leiningen.org/"
-SRC_URI="
- https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.zip -> ${MY_PNV}-standalone.jar
- https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
-"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8"
-
-RESTRICT="test"
-
-src_unpack() {
- mkdir -p "${S}" || die "Can't mkdir ${S}"
- cd "${S}" || die "Can't enter ${S}"
- for file in ${A}; do
- einfo "Copying ${file}"
- cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
- done
-}
-
-src_prepare() {
- einfo "Copying leinrc"
- cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
- einfo "Patching leinrc"
- sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
-
- einfo "Renaming lein-pkg"
- # Rename generically to help user patching
- mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
-
- einfo "Patching lein"
- java-pkg_init_paths_
- sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${EPREFIX}/${JAVA_PKG_JARDEST#/}/${PN}.jar|" "${S}/lein" \
- || die "Can't patch LEIN_JAR in lein"
-
- default
-}
-
-src_compile() { :; }
-
-src_install() {
- dobin "${S}/lein"
- java-pkg_newjar "${MY_PNV}-standalone.jar"
- insinto /etc
- doins "${S}/leinrc"
- fperms 0644 "/etc/leinrc"
-}
diff --git a/dev-java/log4j-api-java9/Manifest b/dev-java/log4j-api-java9/Manifest
index 50c36844ec0f..c2ad720f37fa 100644
--- a/dev-java/log4j-api-java9/Manifest
+++ b/dev-java/log4j-api-java9/Manifest
@@ -1 +1 @@
-DIST apache-log4j-2.15.0-src.tar.gz 11550453 BLAKE2B 3b7a356714fbff0ad81f633750a45f6b3869df933c89c22b28346e49c6dfb83002ecf6374d04b1ae6a45b5486314654c8a660f3aee7a6b30273439e44db2c610 SHA512 61574722ab0a24bd0301fea57504a645f98f0e5913d1e02e49d25b3dcbf2dcbb3153cfca58fdde632087f94edc8e83820951288ba494234954ab4eeeb6b8be6a
+DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
diff --git a/dev-java/log4j-api-java9/log4j-api-java9-2.15.0.ebuild b/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild
index fc6b19c9ff55..6ebd34f1d05f 100644
--- a/dev-java/log4j-api-java9/log4j-api-java9-2.15.0.ebuild
+++ b/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom log4j-api-java9/pom.xml --download-uri mirror://apache/logging/log4j/2.15.0/apache-log4j-2.15.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-java9-2.15.0.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-api-java9/pom.xml --download-uri mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64" --ebuild log4j-api-java9-2.17.1.ebuild
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-api-java9:2.15.0"
+MAVEN_ID="org.apache.logging.log4j:log4j-api-java9:2.17.1"
JAVA_TESTING_FRAMEWORKS="junit-jupiter"
inherit java-pkg-2 java-pkg-simple
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
# junit-jupiter is not available in ::gentoo
RESTRICT="test"
diff --git a/dev-java/spin/spin-1.5-r2.ebuild b/dev-java/spin/spin-1.5-r2.ebuild
new file mode 100644
index 000000000000..00108804a159
--- /dev/null
+++ b/dev-java/spin/spin-1.5-r2.ebuild
@@ -0,0 +1,93 @@
+# 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 mirror://sourceforge/project/spin/spin/v1.5/spin-1.5-all.zip --slot 0 --keywords "~amd64 ~x86" --ebuild spin-1.5-r2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="spin:spin:1.5"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Transparent threading solution for non-freezing Swing applications."
+HOMEPAGE="http://spin.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/v${PV}/${P}-all.zip"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# cglib:cglib-nodep:2.1_3 -> !!!artifactId-not-found!!!
+
+CP_DEPEND="
+ dev-java/cglib:3
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=( license.txt )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/java"
+
+src_test() {
+ # 1) testEDTNotBlockedDuringInvocation(spin.off.SpinOffTest)java.lang.Error:
+ # Unable to make void java.awt.EventDispatchThread.pumpEvents(java.awt.Conditional) accessible:
+ # module java.desktop does not "opens java.awt" to unnamed module @42bb2aee
+
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge "17" ; then
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.desktop/java.awt=ALL-UNNAMED )
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+ fi
+
+ # There was 1 error:
+ # 1) testNonAccessibleInterface(spin.JDKProxyFactoryTest)java.awt.HeadlessException
+ # at java.desktop/java.awt.GraphicsEnvironment.checkHeadless(GraphicsEnvironment.java:166)
+ # at java.desktop/java.awt.Window.<init>(Window.java:553)
+ # at java.desktop/java.awt.Frame.<init>(Frame.java:428)
+ # at java.desktop/java.awt.Frame.<init>(Frame.java:393)
+ # at java.desktop/javax.swing.JFrame.<init>(JFrame.java:180)
+ # at spin.JDKProxyFactoryTest$1.<init>(JDKProxyFactoryTest.java:44)
+ # at spin.JDKProxyFactoryTest.testNonAccessibleInterface(JDKProxyFactoryTest.java:44)
+ # at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ # at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+ # at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+
+ # JAVA_TEST_RUN_ONLY="spin.JDKProxyFactoryTest"
+ # java-pkg-simple_src_test
+
+ JAVA_TEST_RUN_ONLY="spin.CGLibProxyFactoryTest"
+ java-pkg-simple_src_test
+
+ JAVA_TEST_RUN_ONLY="spin.off.AWTReflectDispatcherTest"
+ java-pkg-simple_src_test
+
+ JAVA_TEST_RUN_ONLY="spin.off.SpinOffTest"
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/xp/Manifest b/dev-java/xp/Manifest
deleted file mode 100644
index 43de144548a2..000000000000
--- a/dev-java/xp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xp-0.5.zip 281324 BLAKE2B c9bf54836b67773f2bcdf34cd0548acc9e2cad039aaae1ff397f63b9f3715742ad9e0494b696415f83ffc50d14e47462c0efcf52e9332f8cf469441094bceb74 SHA512 5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6
diff --git a/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch b/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch
deleted file mode 100644
index d2c11ab3ed59..000000000000
--- a/dev-java/xp/files/xp-0.5-fix-jdk-1.7-enum.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/com/jclark/xml/sax/Driver.java b/com/jclark/xml/sax/Driver.java
-index 2b0d90a..d1efd3e 100644
---- a/com/jclark/xml/sax/Driver.java
-+++ b/com/jclark/xml/sax/Driver.java
-@@ -160,9 +160,9 @@ public class Driver extends ApplicationImpl
-
- DTD dtd = event.getDTD();
-
-- for (Enumeration enum = dtd.entityNames(DTD.NOTATION);
-- enum.hasMoreElements(); ) {
-- String name = (String)enum.nextElement();
-+ for (Enumeration enumx = dtd.entityNames(DTD.NOTATION);
-+ enumx.hasMoreElements(); ) {
-+ String name = (String)enumx.nextElement();
- Entity entity = dtd.getEntity(DTD.NOTATION, name);
- String systemId = entity.getSystemId();
- if (systemId != null) {
-@@ -173,9 +173,9 @@ public class Driver extends ApplicationImpl
- }
- dtdHandler.notationDecl(name, entity.getPublicId(), systemId);
- }
-- for (Enumeration enum = dtd.entityNames(DTD.GENERAL_ENTITY);
-- enum.hasMoreElements();) {
-- String name = (String)enum.nextElement();
-+ for (Enumeration enumx = dtd.entityNames(DTD.GENERAL_ENTITY);
-+ enumx.hasMoreElements();) {
-+ String name = (String)enumx.nextElement();
- Entity entity = dtd.getEntity(DTD.GENERAL_ENTITY, name);
- String notationName = entity.getNotationName();
- if (notationName != null) {
diff --git a/dev-java/xp/metadata.xml b/dev-java/xp/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/xp/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
-
- <origin>gentoo-staging</origin>
-</pkgmetadata> \ No newline at end of file
diff --git a/dev-java/xp/xp-0.5-r4.ebuild b/dev-java/xp/xp-0.5-r4.ebuild
deleted file mode 100644
index ae0095ad000a..000000000000
--- a/dev-java/xp/xp-0.5-r4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="XP is an XML 1.0 parser written in Java"
-HOMEPAGE="http://www.jclark.com/xml/xp"
-SRC_URI="ftp://ftp.jclark.com/pub/xml/${PN}.zip -> ${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND="
- app-arch/unzip
- >=virtual/jdk-1.6
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-jdk-1.7-enum.patch"
-)
-
-src_prepare() {
- default
- java-pkg_clean
-}