From 0be7f64ecaa2b90126d68b248d1866b4e0b7990e Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 13 Mar 2025 13:56:33 +0000 Subject: [PATCH] import CS javaparser-3.26.3-1.module_el9+1171+eb38a622 --- .fmf/version | 1 - .gitignore | 11 +-- .javaparser.metadata | 1 + .../0001-Port-to-OpenJDK-21.patch | 0 javaparser.spec => SPECS/javaparser.spec | 68 ++++++++++--------- ci.fmf | 1 - gating.yaml | 7 -- plans/javapackages.fmf | 7 -- sources | 1 - 9 files changed, 37 insertions(+), 60 deletions(-) delete mode 100644 .fmf/version create mode 100644 .javaparser.metadata rename 0001-Port-to-OpenJDK-21.patch => SOURCES/0001-Port-to-OpenJDK-21.patch (100%) rename javaparser.spec => SPECS/javaparser.spec (86%) delete mode 100644 ci.fmf delete mode 100644 gating.yaml delete mode 100644 plans/javapackages.fmf delete mode 100644 sources diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 6882a32..dd5c602 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1 @@ -/javaparser-1.0.8-src.zip -/javaparser-1.0.11.tar.gz -/javaparser-parent-2.5.1.tar.gz -/javaparser-parent-3.3.5.tar.gz -/javaparser-parent-3.5.20.tar.gz -/javaparser-parent-3.14.16.tar.gz -/javaparser-parent-3.22.0.tar.gz -/javaparser-parent-3.24.2.tar.gz -/javaparser-parent-3.25.2.tar.gz -/javaparser-parent-3.25.6.tar.gz +SOURCES/javaparser-parent-3.26.3.tar.gz diff --git a/.javaparser.metadata b/.javaparser.metadata new file mode 100644 index 0000000..1634fa1 --- /dev/null +++ b/.javaparser.metadata @@ -0,0 +1 @@ +9c27bb2c4c0f0b7db66b3cad48b8d024936151ae SOURCES/javaparser-parent-3.26.3.tar.gz diff --git a/0001-Port-to-OpenJDK-21.patch b/SOURCES/0001-Port-to-OpenJDK-21.patch similarity index 100% rename from 0001-Port-to-OpenJDK-21.patch rename to SOURCES/0001-Port-to-OpenJDK-21.patch diff --git a/javaparser.spec b/SPECS/javaparser.spec similarity index 86% rename from javaparser.spec rename to SPECS/javaparser.spec index a4c787e..0a1b405 100644 --- a/javaparser.spec +++ b/SPECS/javaparser.spec @@ -1,37 +1,36 @@ %bcond_with bootstrap - %if !0%{?rhel} && %{without bootstrap} %bcond_without bnd_maven_plugin %else %bcond_with bnd_maven_plugin %endif -Name: javaparser -Version: 3.25.6 -Release: 7%{?dist} -Summary: Java 1 to 13 Parser and Abstract Syntax Tree for Java -License: LGPL-2.0-or-later OR Apache-2.0 -URL: https://javaparser.org -Source0: https://github.com/javaparser/javaparser/archive/%{name}-parent-%{version}.tar.gz +Name: javaparser +Version: 3.26.3 +Release: 1%{?dist} +Summary: Java 1 to 13 Parser and Abstract Syntax Tree for Java +License: LGPL-2.0-or-later OR Apache-2.0 +URL: https://javaparser.org +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -Patch1: 0001-Port-to-OpenJDK-21.patch +Source0: https://github.com/javaparser/javaparser/archive/%{name}-parent-%{version}.tar.gz +Patch: 0001-Port-to-OpenJDK-21.patch + +%if %{with bnd_maven_plugin} +BuildRequires: mvn(biz.aQute.bnd:bnd-maven-plugin) +%endif %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local -BuildRequires: mvn(net.java.dev.javacc:javacc) -BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(javax.annotation:javax.annotation-api) BuildRequires: mvn(junit:junit) +BuildRequires: mvn(net.java.dev.javacc:javacc) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin) %endif -%if %{with bnd_maven_plugin} -BuildRequires: mvn(biz.aQute.bnd:bnd-maven-plugin) -%endif - -BuildArch: noarch -ExclusiveArch: %{java_arches} noarch %description This package contains a Java 1 to 13 Parser with AST generation and @@ -40,22 +39,20 @@ and comments. It is also possible to change the AST nodes or create new ones to modify the source code. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -This package contains API documentation for %{name}. +API documentation for %{name}. %prep -%setup -q -n %{name}-%{name}-parent-%{version} +%autosetup -p1 -n %{name}-%{name}-parent-%{version} -%patch 1 -p1 sed -i 's/\r//' readme.md # Remove plugins unnecessary for RPM builds %pom_remove_plugin -r :jacoco-maven-plugin %pom_remove_plugin :maven-source-plugin -%pom_remove_plugin :coveralls-maven-plugin %if %{without bnd_maven_plugin} %pom_remove_plugin :bnd-maven-plugin javaparser-core @@ -112,19 +109,24 @@ sed -i \ %license LICENSE LICENSE.APACHE LICENSE.GPL LICENSE.LGPL %changelog -* Tue Oct 29 2024 Troy Dawson - 3.25.6-7 -- Bump release for October 2024 mass rebuild: - Resolves: RHEL-64018 +* Thu Jan 02 2025 Markku Korkeala - 3.26.3-1 +- Update to 3.26.3, closes rhbz#2267732 -* Mon Aug 05 2024 Mikolaj Izdebski - 3.25.6-6 +* Fri Nov 29 2024 Mikolaj Izdebski - 3.25.8-10 +- Update javapackages test plan to f42 + +* Thu Jul 18 2024 Fedora Release Engineering - 3.25.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 3.25.8-3 +- Rebuilt for java-21-openjdk as system jdk + +* Thu Feb 22 2024 Marian Koncek - 3.25.8-2 - Port to OpenJDK 21 -- Resolves: RHEL-52805 -* Thu Aug 01 2024 Troy Dawson - 3.25.6-6 -- Bump release for Aug 2024 java mass rebuild - -* Mon Jun 24 2024 Troy Dawson - 3.25.6-5 -- Bump release for June 2024 mass rebuild +* Wed Feb 21 2024 Markku Korkeala - 3.25.8-1 +- Update to upstream version 3.25.8, closes rhbz#2252668 +- Upstream removed plugin coveralls-maven-plugin * Wed Jan 24 2024 Fedora Release Engineering - 3.25.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 9512778..0000000 --- a/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- !Policy -product_versions: - - rhel-10 -decision_contexts: - - osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf deleted file mode 100644 index f37b73f..0000000 --- a/plans/javapackages.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Run javapackages-specific tests -discover: - how: fmf - url: https://src.fedoraproject.org/tests/javapackages - ref: c10s -execute: - how: tmt diff --git a/sources b/sources deleted file mode 100644 index b04680a..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (javaparser-parent-3.25.6.tar.gz) = 60caf64ac32561a8941a2dae49aae1529d7f107dbabdb8b586dba92c6ae566e94338b53e48a7528b4b7e0ffa6efaaacbf61963f007573a515ac3b0b026423e18