rpms/javaparser
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'maven' into stream-javapackages-tools-202501-rhel-9.6.0

Browse Source
This commit is contained in:
Johnny Hughes 2025-01-15 13:02:58 -06:00
commit 8294bcc709
8 changed files with 362 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

12
.gitignore vendored
View File

@ -0,0 +1,12 @@
/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
/javaparser-parent-3.25.8.tar.gz
/javaparser-parent-3.26.3.tar.gz

78
0001-Port-to-OpenJDK-21.patch Normal file
View File

@ -0,0 +1,78 @@
From 229820ea9a9fccbe9ba91a0678411a878b4c070b Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Tue, 20 Feb 2024 17:39:06 +0100
Subject: [PATCH] Port to OpenJDK 21
---
.../com/github/javaparser/ast/NodeList.java | 18 ++++++++----------
.../ast/body/CallableDeclaration.java | 2 +-
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java b/javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java
index d78ed2a..8a77597 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java
@@ -186,17 +186,15 @@ public class NodeList<N extends Node> implements List<N>, Iterable<N>, HasParent
/**
* Inserts the node before all other nodes.
*/
- public NodeList<N> addFirst(N node) {
+ public void addFirst(N node) {
add(0, node);
- return this;
}
/**
* Inserts the node after all other nodes. (This is simply an alias for add.)
*/
- public NodeList<N> addLast(N node) {
+ public void addLast(N node) {
add(node);
- return this;
}
/**
@@ -230,21 +228,21 @@ public class NodeList<N extends Node> implements List<N>, Iterable<N>, HasParent
/**
* @return the first node, or empty if the list is empty.
*/
- public Optional<N> getFirst() {
+ public N getFirst() {
if (isEmpty()) {
- return Optional.empty();
+ throw new NoSuchElementException();
}
- return Optional.of(get(0));
+ return get(0);
}
/**
* @return the last node, or empty if the list is empty.
*/
- public Optional<N> getLast() {
+ public N getLast() {
if (isEmpty()) {
- return Optional.empty();
+ throw new NoSuchElementException();
}
- return Optional.of(get(size() - 1));
+ return get(size() - 1);
}
@Override
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java
index 9d5d5c6..782eb11 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java
@@ -445,7 +445,7 @@ public abstract class CallableDeclaration<T extends CallableDeclaration<?>> exte
* Returns true if the method has a variable number of arguments
*/
public boolean isVariableArityMethod() {
- return getParameters().size() > 0 && getParameters().getLast().get().isVarArgs();
+ return getParameters().size() > 0 && getParameters().getLast().isVarArgs();
}
/*
--
2.43.0

1
ci.fmf Normal file
View File

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

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./plans/javapackages.functional}

255
javaparser.spec Normal file
View File

@ -0,0 +1,255 @@
%bcond_with bootstrap
%if !0%{?rhel} && %{without bootstrap}
%bcond_without bnd_maven_plugin
%else
%bcond_with bnd_maven_plugin
%endif
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
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(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
%description
This package contains a Java 1 to 13 Parser with AST generation and
visitor support. The AST records the source code structure, javadoc
and comments. It is also possible to change the AST nodes or create new
ones to modify the source code.
%package javadoc
Summary: API documentation for %{name}
%description javadoc
API documentation for %{name}.
%prep
%autosetup -p1 -n %{name}-%{name}-parent-%{version}
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
%if %{without bnd_maven_plugin}
%pom_remove_plugin :bnd-maven-plugin javaparser-core
mkdir -p javaparser-core/target/classes/META-INF/
touch javaparser-core/target/classes/META-INF/MANIFEST.MF
%endif
# Compatibility alias
%mvn_alias :javaparser-core com.google.code.javaparser:javaparser
# Fix javacc plugin name
sed -i \
-e 's/ph-javacc-maven-plugin/javacc-maven-plugin/' \
-e 's/com.helger.maven/org.codehaus.mojo/' \
javaparser-core/pom.xml
# This plugin is not in Fedora, so use maven-resources-plugin to accomplish the same thing
%pom_remove_plugin :templating-maven-plugin javaparser-core
%pom_xpath_inject "pom:build" "
<resources>
<resource>
<directory>src/main/java-templates</directory>
<filtering>true</filtering>
<targetPath>\${basedir}/src/main/java</targetPath>
</resource>
</resources>" javaparser-core
# Missing dep on jbehave for testing
%pom_disable_module javaparser-core-testing
%pom_disable_module javaparser-core-testing-bdd
# Don't build the symbol solver
%pom_disable_module javaparser-symbol-solver-core
#%pom_disable_module javaparser-symbol-solver-logic
#%pom_disable_module javaparser-symbol-solver-model
%pom_disable_module javaparser-symbol-solver-testing
# Only need to ship the core module
%pom_disable_module javaparser-core-generators
%pom_disable_module javaparser-core-metamodel-generator
%pom_disable_module javaparser-core-serialization
%build
%mvn_build
%install
%mvn_install
%files -f .mfiles
%doc readme.md changelog.md
%license LICENSE LICENSE.APACHE LICENSE.GPL LICENSE.LGPL
%files javadoc -f .mfiles-javadoc
%license LICENSE LICENSE.APACHE LICENSE.GPL LICENSE.LGPL
%changelog
* Thu Jan 02 2025 Markku Korkeala <markku.korkeala@haidion.com> - 3.26.3-1
- Update to 3.26.3, closes rhbz#2267732
* Fri Nov 29 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.25.8-10
- Update javapackages test plan to f42
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 3.25.8-3
- Rebuilt for java-21-openjdk as system jdk
* Thu Feb 22 2024 Marian Koncek <mkoncek@redhat.com> - 3.25.8-2
- Port to OpenJDK 21
* Wed Feb 21 2024 Markku Korkeala <markku.korkeala@iki.fi> - 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 <releng@fedoraproject.org> - 3.25.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 04 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.25.6-2
- Implement bootstrap mode
* Sat Nov 11 2023 Markku Korkeala <markku.korkeala@iki.fi> - 3.25.6-1
- Update to upstream version 3.25.6, resolves rhbz#2192489
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Apr 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.2-1
- Update to upstream version 3.25.2, closes #2115138
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.24.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.24.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 3.24.2-2
- Rebuilt for Drop i686 JDKs
* Sat Apr 09 2022 Markku Korkeala <markku.korkeala@iki.fi> - 3.24.2-1
- Update to upstream version 3.24.2
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.22.0-3
- Rebuilt for java-17-openjdk as system jdk
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.22.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Sat Dec 04 2021 Markku Korkeala <markku.korkeala@iki.fi> - 3.22.0-1
- Update to 3.22.0, comment out removed modules, add junit dependency.
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.16-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.16-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Mat Booth <mat.booth@redhat.com> - 3.14.16-1
- Update to 3.14.x to get Java up to 13 support
* Tue Jul 28 2020 Mat Booth <mat.booth@redhat.com> - 3.5.20-1
- Update to 3.5.x to get Java 10 support
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 22 2020 Markku Korkeala <markku.korkeala@iki.fi> - 3.3.5-5
- Add dependency for javax.annotation.
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.3.5-4
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Feb 13 2019 Mat Booth <mat.booth@redhat.com> - 3.3.5-1
- Update to javaparser 3.3.5 for Java 9 support
- Correct license field to dual license: LGPLv3+ OR ASL 2.0
* Wed Feb 13 2019 Mat Booth <mat.booth@redhat.com> - 2.5.1-1
- Update to javaparser 2.5.1 for Java 1.8 support
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.11-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.11-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.11-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.11-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jul 31 2015 gil cattaneo <puntogil@libero.it> 1.0.11-1
- update to 1.0.11
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.8-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun Mar 15 2015 gil cattaneo <puntogil@libero.it> 1.0.8-9
- fix Url tag
* Fri Feb 06 2015 gil cattaneo <puntogil@libero.it> 1.0.8-8
- introduce license macro
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.8-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 1.0.8-6
- Use Requires: java-headless rebuild (#1067528)
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Mon Jul 08 2013 gil cattaneo <puntogil@libero.it> 1.0.8-4
- switch to XMvn
- minor changes to adapt to current guideline
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.0.8-2
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
- Replace maven BuildRequires with maven-local
* Thu Jul 26 2012 gil cattaneo <puntogil@libero.it> 1.0.8-1
- initial rpm

7
plans/javapackages.fmf Normal file
View File

@ -0,0 +1,7 @@
summary: Run javapackages-specific tests
discover:
how: fmf
url: https://src.fedoraproject.org/tests/javapackages
ref: c9s
execute:
how: tmt

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (javaparser-parent-3.26.3.tar.gz) = 8e109eec868e5aeceb2c91e09f04286f4e9944601359febe80bc29074b6eb306fd058a93e41cf7824ce88a392026321cca637a8cf601e6100b74b06a4fe39b80