From 05a48795d58e22ff4760058333cbb95333ad4363 Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Thu, 29 Jun 2023 11:04:14 +0200 Subject: [PATCH] re-import sources as agreed with the maintainer --- .gitignore | 12 ++++++++++- 0001-Port-to-JFlex-1.7.0.patch | 39 ---------------------------------- gating.yaml | 8 ------- generate-tarball.sh | 0 4 files changed, 11 insertions(+), 48 deletions(-) delete mode 100644 0001-Port-to-JFlex-1.7.0.patch delete mode 100644 gating.yaml mode change 100755 => 100644 generate-tarball.sh diff --git a/.gitignore b/.gitignore index 7f18a11..02ce7c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,12 @@ -SOURCES/qdox-2.0-M9.tar.gz +qdox-1.6.1-src.tar.gz +qdox-1.9.2-src.tar.gz +qdox-1.10.1.tar.bz2 +qdox-1.11-project.tar.bz2 +qdox-1.12-project.tar.bz2 +/qdox-1.12.1-project.tar.bz2 +/qdox-2.0-M2-project.tar.gz +/qdox-2.0-M3-project.tar.gz +/qdox-2.0-M5-project.tar.gz +/qdox-2.0-M7-project.tar.gz +/qdox-2.0-M9-project.tar.gz /qdox-2.0-M9.tar.gz diff --git a/0001-Port-to-JFlex-1.7.0.patch b/0001-Port-to-JFlex-1.7.0.patch deleted file mode 100644 index 441858b..0000000 --- a/0001-Port-to-JFlex-1.7.0.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 31f530b26bd4625ffe41aa16c48836455ef81c23 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Fri, 7 Jun 2019 10:39:34 +0200 -Subject: [PATCH] Port to JFlex 1.7.0 - ---- - src/grammar/lexer.flex | 2 +- - .../java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/grammar/lexer.flex b/src/grammar/lexer.flex -index 9b567ff..cd9d5b6 100644 ---- a/src/grammar/lexer.flex -+++ b/src/grammar/lexer.flex -@@ -168,7 +168,7 @@ import java.util.*; - } - - public JFlexLexer( java.io.InputStream stream, java.io.Writer writer ) { -- this( stream ); -+ this( new java.io.InputStreamReader( stream, java.nio.charset.Charset.forName( "UTF-8" ) ) ); - this.writer = writer; - } - -diff --git a/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java b/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java -index c947f9b..5b415c0 100644 ---- a/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java -+++ b/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java -@@ -112,7 +112,7 @@ public class ClassLoaderLibrary - if ( sourceStream != null ) - { - Builder builder = getModelBuilder(); -- JavaLexer lexer = new JFlexLexer( sourceStream ); -+ JavaLexer lexer = new JFlexLexer( new java.io.InputStreamReader( sourceStream, java.nio.charset.Charset.forName( "UTF-8" ) ) ); - Parser parser = new Parser( lexer, builder ); - parser.setDebugLexer( debugLexer ); - parser.setDebugParser( debugParser ); --- -2.21.0 - diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index d6b7694..0000000 --- a/gating.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- !Policy -product_versions: - - rhel-9 -decision_contexts: - - osci_compose_gate -rules: - # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test - - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap} diff --git a/generate-tarball.sh b/generate-tarball.sh old mode 100755 new mode 100644