Compare commits

...

No commits in common. "c8-beta-stream-2" and "c9s" have entirely different histories.

10 changed files with 87 additions and 7 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

29
.gitignore vendored
View File

@ -1 +1,28 @@
SOURCES/log4j-2.17.2.tar.gz
/results_*
/*.src.rpm
/apache-log4j-1.2.16.tar.gz
/log4j-1.2.17.tar.gz
/apache-log4j-2.0-rc1-src.tar.gz
/apache-log4j-2.0-src.tar.gz
/apache-log4j-2.2-src.tar.gz
/apache-log4j-2.3-src.tar.gz
/apache-log4j-2.5-src.tar.gz
/apache-log4j-2.6.1-src.tar.gz
/apache-log4j-2.7-src.tar.gz
/apache-log4j-2.8.1-src.tar.gz
/apache-log4j-2.8.2-src.tar.gz
/apache-log4j-2.9.0-src.tar.gz
/apache-log4j-2.9.1-src.tar.gz
/apache-log4j-2.11.1-src.tar.gz
/apache-log4j-2.12.1-src.tar.gz
/apache-log4j-2.13.0-src.tar.gz
/apache-log4j-2.13.1-src.tar.gz
/apache-log4j-2.13.3-src.tar.gz
/apache-log4j-2.14.1-src.tar.gz
/apache-log4j-2.15.0-src.tar.gz
/apache-log4j-2.16.0-src.tar.gz
/apache-log4j-2.17.0-src.tar.gz
/apache-log4j-2.17.1-src.tar.gz
/log4j-2.17.1.tar.gz
/log4j-2.17.2.tar.gz

View File

@ -1 +0,0 @@
9e778b8991a3719661d5660a1964c0ec5c5eeace SOURCES/log4j-2.17.2.tar.gz

7
gating.yaml Normal file
View File

@ -0,0 +1,7 @@
--- !Policy
product_versions:
- rhel-9
decision_contexts:
- osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

29
generate-tarball.sh Executable file
View File

@ -0,0 +1,29 @@
#!/bin/bash
set -e
name=log4j
version="$(sed -n 's/Version:\s*//p' *.spec)"
# RETRIEVE
wget "https://archive.apache.org/dist/logging/log4j/${version}/apache-log4j-${version}-src.tar.gz" -O "${name}-${version}.orig.tar.gz"
wget "https://archive.apache.org/dist/logging/log4j/${version}/apache-log4j-${version}-src.tar.gz.asc" -O "${name}-${version}.orig.tar.gz.asc"
wget "https://www.apache.org/dist/logging/KEYS" -O "${name}-${version}.keyring"
# VERIFY
$(rpm -E '%{gpgverify}') --keyring="${name}-${version}.keyring" --signature="${name}-${version}.orig.tar.gz.asc" --data="${name}-${version}.orig.tar.gz"
rm -rf tarball-tmp
mkdir tarball-tmp
pushd tarball-tmp
tar -xf "../${name}-${version}.orig.tar.gz"
# CLEAN TARBALL
find -name '*.jar' -delete
find -name '*.class' -delete
find -name '*.zip' -delete
find -name '*.dll' -delete
rm -rf "apache-log4j-${version}-src/src/site"
tar -czf "../${name}-${version}.tar.gz" *
popd
rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

View File

@ -160,7 +160,7 @@ rm -rf docs/api
%pom_disable_module %{name}-perf
# add dependency for javax.activation package (no longer part of OpenJDK)
%pom_add_dep com.sun.activation:jakarta.activation::provided
%pom_add_dep com.sun.activation:jakarta.activation
# unavailable com.conversantmedia:disruptor
rm log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java
@ -293,12 +293,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms
- Update to upstream version 2.17.2
- Re-add log4j-web subpackage
* Thu Oct 20 2022 Marián Konček <mkoncek@redhat.com> - 2.17.1-5
* Tue Oct 18 2022 Marián Konček <mkoncek@redhat.com> - 2.17.1-4
- Remove glyphicons resources from source package
* Tue Mar 29 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.17.1-4
- Fix dependency scope of jakarta-activation
* Wed Feb 23 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.17.1-3
- Fix compatibility with OpenJDK 8

11
plans/Smoke.java Normal file
View File

@ -0,0 +1,11 @@
import org.apache.logging.log4j.*;
public class Smoke
{
public static void main(String[] args)
{
Logger log = LogManager.getLogger(Smoke.class);
log.error("Hello from Log4J");
System.out.println("SMOKE TEST COMPLETE");
}
}

8
plans/smoke.fmf Normal file
View File

@ -0,0 +1,8 @@
summary: Basic smoke test
prepare:
how: install
package: java-1.8.0-openjdk-devel
execute:
script:
- /usr/lib/jvm/java-1.8.0-openjdk/bin/javac -cp /usr/share/java/log4j/log4j-api.jar plans/Smoke.java
- /usr/lib/jvm/java-1.8.0-openjdk/bin/java -cp /usr/share/java/log4j/log4j-api.jar:/usr/share/java/log4j/log4j-core.jar:plans Smoke

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (log4j-2.17.2.tar.gz) = fd76960224f3441cdbe43a4326bbcf2007d4680e1a29438c00a056376c140d827ed4923df2c97fee4fb567687b93e79f7745403d32dd071c91cd347112f2f303