diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-04-19 12:05:02 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-04-19 12:05:02 +0100 |
commit | b6cfc0c19effe2d9f7b8ab303cd00636f16da253 (patch) | |
tree | a0158050dac0a7ebfb9df4f667ec6ad2dd185538 /dev-java | |
parent | 2d01b3d133c0fbf17de8d7b47905585af88bd6e4 (diff) |
gentoo auto-resync : 19:04:2024 - 12:05:02
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/Manifest.gz | bin | 55805 -> 55810 bytes | |||
-rw-r--r-- | dev-java/commons-logging/Manifest | 3 | ||||
-rw-r--r-- | dev-java/commons-logging/commons-logging-1.3.1.ebuild | 153 | ||||
-rw-r--r-- | dev-java/java-dep-check/Manifest | 2 | ||||
-rw-r--r-- | dev-java/java-dep-check/java-dep-check-0.5-r3.ebuild (renamed from dev-java/java-dep-check/java-dep-check-0.5-r2.ebuild) | 4 |
5 files changed, 159 insertions, 3 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz Binary files differindex 977965c93871..18e83534329f 100644 --- a/dev-java/Manifest.gz +++ b/dev-java/Manifest.gz diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest index f8d66b902dba..fbec7f593c38 100644 --- a/dev-java/commons-logging/Manifest +++ b/dev-java/commons-logging/Manifest @@ -1,3 +1,6 @@ DIST commons-logging-1.3.0_pre20230319.tar.gz 184984 BLAKE2B 01b46bdb657dfaf3ffb55b3440b416d61a419a3358e4d240cc7e25794f38e0061e14ee77e5578aedf1b50006d6ec65016c9e837bd13c4dab9a2182604fe85c72 SHA512 b586be5dd891572aa55c3066c3fb7d57ba5f31c0bfaa768b80cd8c1c5c659a8c718b4cb42e6c65332b52f073462432c0f81e4aaf1535afb781da9a7884cdc07e +DIST commons-logging-1.3.1-src.tar.gz 189156 BLAKE2B 23308b2bff6ea67620b0f07f49a63ffdbd07833fc0d9a6654386f4c17c9125abef5ad2afb6d8c798dcb98bc3e99bd8d94d35b9deec569c3aec1dde20f69e1a1d SHA512 ffda970d086601df4b476caf8bd01d1bdc22dd7f8846a22287036f7f000ce6cf0a757d16621910f041f8d90aa6066819454b3977dd005ca66817bec59e91e91f +DIST commons-logging-1.3.1-src.tar.gz.asc 488 BLAKE2B 3225a62f6269224f1b52907631be03d97cde65d1c7a76c06b6a23b9e30b1cee08b048eb4fdaa41b0a6b5bcf090b54c9dc54307fb1629b039b786fd426572a4d1 SHA512 6f13f85a5aeab1099ebfca38a6173384050b1f1c2e7eac93d978587c92751ddd24d583e39bc5a949f0caec66ca141d265147e63e9e2afea2094bda4667936a86 EBUILD commons-logging-1.3.0_pre20230319.ebuild 4184 BLAKE2B 3ece0c8ce0d4be3b106d3986bdd935f9e302287993816989965bfe32fe9880eae6770666071917d95d4b9ba4f1b16f5e5ddbaa19ed1e7b98feb74eac53f61f2f SHA512 a96e5f06f4b990f76761a0d6a3e64f58f1ae021a312bbaea0ca66a1a095fb3a808f231bd042636227454ca2692d67fc432d52d49ec962e6a7c803a70ed0e740a +EBUILD commons-logging-1.3.1.ebuild 5395 BLAKE2B bb812ae1c825b4333c6c6f2ffde10fe7551a3a442e0c42d828dda929930aaf260d5af08fe38dd61bc895a774d1b6591e7b3eaf5c91546f1dcc6ede9672f07645 SHA512 a5ec0177149301d45d46c03be6c4066606df02024e6650171d981220c6e20a6528f1632bafdf32428f84d31006738a8eaed424a27a6fb789db53194cfedc7de8 MISC metadata.xml 549 BLAKE2B b20c8451a73329dbdb8aa88120543b948014115d754a84e8a77a8f61b9134277a7849fc10e35323c028a32d69f6e45702200e06af4481bf5238f5d848b3ccc03 SHA512 105c2bdf3eed380f11be1b8987a08fbcf1b6e6cbbb00c0e38e4813875865abd65c9be85267d5b49486913fdb0635b7329b5c4e84a86d9f93f9dcdad74c336ff0 diff --git a/dev-java/commons-logging/commons-logging-1.3.1.ebuild b/dev-java/commons-logging/commons-logging-1.3.1.ebuild new file mode 100644 index 000000000000..1f9180268241 --- /dev/null +++ b/dev-java/commons-logging/commons-logging-1.3.1.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="commons-logging:commons-logging:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems" +HOMEPAGE="https://commons.apache.org/proper/commons-logging/" +SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz + verify-sig? ( https://downloads.apache.org/commons/logging/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/${P}-src" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="log4j" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" +COMMON_DEPEND=" + dev-java/jakarta-servlet-api:4 + dev-java/slf4j-api:0 + log4j? ( + dev-java/log4j-12-api:2 + dev-java/log4j-api:2 + )" + +DEPEND="${COMMON_DEPEND} + >=virtual/jdk-11:*" + +RDEPEND="${COMMON_DEPEND} + >=virtual/jre-1.8:*" + +DOCS=( NOTICE.txt src/changes/changes.xml ) +HTML_DOCS=( PROPOSAL.html ) + +JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.logging" +JAVA_ENCODING="iso-8859-1" +JAVA_GENTOO_CLASSPATH=" + jakarta-servlet-api-4 + slf4j-api +" +JAVA_SRC_DIR="src/main/java" + +src_prepare() { + java-pkg-2_src_prepare + + # javax-servlet-api and log4j* do not presently provide module-info + cat > src/main/java/module-info.java <<-EOF || die + module org.apache.commons.logging { + // requires static org.apache.logging.log4j; + requires static org.slf4j; + requires static java.logging; + // requires static log4j; + // requires static servlet.api; + // requires static org.apache.log4j; + requires java.base; + exports org.apache.commons.logging; + exports org.apache.commons.logging.impl; + uses org.apache.commons.logging.LogFactory; + } + EOF + + # https://avalon.apache.org/closed.html Apache Avalon has closed. + rm src/main/java/org/apache/commons/logging/impl/{Avalon,LogKit}Logger.java || die + rm src/test/java/org/apache/commons/logging/{avalon/AvalonLogger,logkit/Standard}TestCase.java || die + + if use !log4j; then + rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die + rm src/main/java/org/apache/commons/logging/impl/Log4jApiLogFactory.java || die + else + JAVA_GENTOO_CLASSPATH+=" + log4j-12-api-2 + log4j-api-2 + " + fi +} + +src_compile() { + java-pkg-simple_src_compile + + pushd target/classes > /dev/null || die + + # Need Automatic-Module-Name also for the other JAR files + jar xvf ../../commons-logging.jar META-INF/MANIFEST.MF || die + + # pom.xml, lines 81-103 + jar -cvfm ../../commons-logging-api.jar META-INF/MANIFEST.MF \ + $(find . -type f -name '*.class' \ + ! -name 'Jdk13LumberjackLogger.class' \ + ! -name 'ServletContextCleaner.class' \ + ) || die + + # pom.xml, lines 205-124 + jar -cvfm ../../commons-logging-adapters.jar META-INF/MANIFEST.MF \ + $(find . -type f -path './org/apache/commons/logging/impl/**.class' \ + ! -name 'WeakHashtable*.class' \ + ! -name 'LogFactoryImpl*.class' \ + ) || die + + popd > /dev/null || die +} + +src_test() { + # Do not run Log4j tests because these tests use an Appender to verify + # logging correctness. The log4j-12-api bridge no longer supports using an + # Appender for verifications since the methods for adding an Appender in + # the bridge "are largely no-ops". This means an Appender's state would + # never be changed by log4j-12-api after new messages are logged. The test + # cases, however, expect changes to the Appender's state in such an event, + # so they would fail with log4j-12-api. + # https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html + rm src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java || die # Log4JLogger + rm src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java || die # Log4JLogger + rm -r src/test/java/org/apache/commons/logging/log4j || die + rm src/test/java/org/apache/commons/logging/log4j2/CallerInformationTestCase.java || die + # error: package ch.qos.logback.classic does not exist + rm src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java || die + + JAVA_TEST_EXCLUDES=( + org.apache.commons.logging.jdk14.TestHandler # No runnable methods + # junit.framework.AssertionFailedError: Wrong factory retrieved through + # ServiceLoader: org.apache.commons.logging.impl.Slf4jLogFactory + org.apache.commons.logging.serviceloader.ServiceLoaderTestCase + # junit.framework.ComparisonFailure: Log class expected:<...ommons.logging.impl.[NoOp]Log> + # but was:<...ommons.logging.impl.[Slf4jLogFactory$Slf4j]Log> + org.apache.commons.logging.noop.NoOpLogTestCase + ) + JAVA_TEST_EXTRA_ARGS=( + -Dservlet-api="$(java-pkg_getjars jakarta-servlet-api-4)" + -Dcommons-logging="commons-logging.jar" + -Dcommons-logging-api="commons-logging-api.jar" + -Dcommons-logging-adapters="commons-logging-adapters.jar" + -Dtestclasses="target/test-classes" + ) + if use log4j; then + JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)" + fi + JAVA_TEST_GENTOO_CLASSPATH="junit-4" + JAVA_TEST_RESOURCE_DIRS="src/test/resources" + JAVA_TEST_SRC_DIR="src/test/java" + java-pkg-simple_src_test +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dojar commons-logging-api.jar commons-logging-adapters.jar +} diff --git a/dev-java/java-dep-check/Manifest b/dev-java/java-dep-check/Manifest index add9f6c76c0a..9b9c1fb96028 100644 --- a/dev-java/java-dep-check/Manifest +++ b/dev-java/java-dep-check/Manifest @@ -1,3 +1,3 @@ AUX Main-0.5.java 14974 BLAKE2B 9bf245b17dfd26ce7f67b299eeefea0006c33af0ce8fb86a2145627980f1db7feb71253e4405aea9fd743a75f43203162b93e6e500612b0af1d595bc9f09db6b SHA512 de0ac9be9c7ac231f71758dff985a4f79e03ba59b74decf20c32d2c53fab762923970d62ebca3076627c45fe3b53ad0b0fc180f3e9cc389f5f6defc3426aaba5 -EBUILD java-dep-check-0.5-r2.ebuild 567 BLAKE2B 55606a39097bd6b123189c87ae5c5f1850ea3bca6d154f2221a77b0152ebe2ef98999df49d3c5c4357feeb5cf54375b135041d2dce6418a0ce3406190167a753 SHA512 a8689eeee1917923469e07d7a9bcb1faa5b11faed008482fbb93ee8d4b9615c647221d55a2005eb05b90d1f5366a7abb718b24d30514f8115cee5aa6d5b09048 +EBUILD java-dep-check-0.5-r3.ebuild 569 BLAKE2B 5d4f8ee886f5b65c1d4dbffc03bfe437d8df2146b5fe8a183d7364e98899f410c3fdf56e53f5d9860b01b3a85986d830935336ac8b845901ab55b2097008e48e SHA512 14ebbff6df3b46296d165c50585d603dd982dc2855f1de5ec346b373db89e805f717714dac300095e1f8b1a64e8f7f0e9a95db8a712597a80c1aebd4104ca894 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559 diff --git a/dev-java/java-dep-check/java-dep-check-0.5-r2.ebuild b/dev-java/java-dep-check/java-dep-check-0.5-r3.ebuild index 39cd7d500a85..0ab6c71728ef 100644 --- a/dev-java/java-dep-check/java-dep-check-0.5-r2.ebuild +++ b/dev-java/java-dep-check/java-dep-check-0.5-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016-2023 Gentoo Authors +# Copyright 2016-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,8 +19,8 @@ RDEPEND=">=virtual/jre-1.8:* ${CP_DEPEND}" DEPEND=">=virtual/jdk-1.8:* ${CP_DEPEND}" +PDEPEND="dev-java/javatoolkit:0" -JAVA_LAUNCHER_FILENAME="${PN}" JAVA_MAIN_CLASS="javadepchecker.Main" src_unpack() { |