re-import sources as agreed with the maintainer

This commit is contained in:
Adam Samalik 2023-06-29 11:25:10 +02:00
parent 11110bc42e
commit 52551b882b
9 changed files with 24 additions and 45 deletions

13
.gitignore vendored
View File

@ -1,2 +1,13 @@
SOURCES/jansi-2.4.0.tar.gz
/results_*
/*.src.rpm
/jansi-1.6.tar.xz
/jansi-1.9.tar.xz
/jansi-1.11.tar.xz
/jansi-project-1.16.tar.gz
/jansi-project-1.17.tar.gz
/jansi-project-1.17.1.tar.gz
/jansi-project-1.18.tar.gz
/jansi-2.1.1.tar.gz
/jansi-2.3.3.tar.gz
/jansi-2.4.0.tar.gz

View File

@ -1,26 +0,0 @@
From d94c5832e14504d44abeba47866dfa7dac5992b5 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Fri, 23 Jul 2021 09:22:19 +0200
Subject: [PATCH] Avoid possible NPE, fixes #214
---
src/main/java/org/fusesource/jansi/AnsiPrintStream.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/fusesource/jansi/AnsiPrintStream.java b/src/main/java/org/fusesource/jansi/AnsiPrintStream.java
index e153c43..df6e5a6 100644
--- a/src/main/java/org/fusesource/jansi/AnsiPrintStream.java
+++ b/src/main/java/org/fusesource/jansi/AnsiPrintStream.java
@@ -76,7 +76,11 @@ public void install() throws IOException {
}
public void uninstall() throws IOException {
- getOut().uninstall();
+ // If the system output stream has been closed, out should be null, so avoid a NPE
+ AnsiOutputStream out = getOut();
+ if (out != null) {
+ out.uninstall();
+ }
}
@Override

1
ci.fmf Normal file
View File

@ -0,0 +1 @@
resultsdb-testcase: separate

View File

@ -1,9 +1,8 @@
--- !Policy
product_versions:
- rhel-9
- fedora-*
decision_contexts:
- osci_compose_gate
- bodhi_update_push_testing
- bodhi_update_push_stable
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
# https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test
- !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}

0
generate-tarball.sh Executable file → Normal file
View File

Binary file not shown.

View File

@ -1,8 +0,0 @@
// Compile with:
// $ javac -cp /usr/lib/java/jansi/jansi.jar JansiLoadLibrary.java
class JansiLoadLibrary {
public static void main(String[] args) {
org.fusesource.jansi.internal.JansiLoader.initialize();
}
}

7
plans/javapackages.fmf Normal file
View File

@ -0,0 +1,7 @@
summary:
Run javapackages-specific tests
discover:
how: fmf
url: https://pagure.io/javapackages-validator-tests
execute:
how: tmt

View File

@ -1,5 +0,0 @@
summary: Basic smoke test
execute:
script:
- dnf -y install java-11-openjdk-headless
- /usr/lib/jvm/jre-11-openjdk/bin/java -cp /usr/lib/java/jansi/jansi.jar:plans JansiLoadLibrary