From 2be5b9f4e114abcd57537d064dbe4b659db4efccd16409d2ec523210274605ae Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 11 Oct 2023 07:32:42 +0000 Subject: [PATCH] Accepting request 1116812 from Java:packages:test OBS-URL: https://build.opensuse.org/request/show/1116812 OBS-URL: https://build.opensuse.org/package/show/Java:packages/parboiled?expand=0&rev=17 --- 1.1.6.tar.gz | 3 -- 1.4.1.tar.gz | 3 ++ parboiled-1.1.6-build.tar.xz | 3 -- parboiled-build.tar.xz | 3 ++ ...core-1.1.6.pom => parboiled-core-1.4.1.pom | 14 ++--- ...java-1.1.6.pom => parboiled-java-1.4.1.pom | 24 ++++----- parboiled-port-to-objectweb-asm-5.0.1.patch | 54 ------------------- parboiled.changes | 7 +++ parboiled.spec | 23 ++++---- 9 files changed, 42 insertions(+), 92 deletions(-) delete mode 100644 1.1.6.tar.gz create mode 100644 1.4.1.tar.gz delete mode 100644 parboiled-1.1.6-build.tar.xz create mode 100644 parboiled-build.tar.xz rename parboiled-core-1.1.6.pom => parboiled-core-1.4.1.pom (83%) rename parboiled-java-1.1.6.pom => parboiled-java-1.4.1.pom (81%) delete mode 100644 parboiled-port-to-objectweb-asm-5.0.1.patch diff --git a/1.1.6.tar.gz b/1.1.6.tar.gz deleted file mode 100644 index 66b85af..0000000 --- a/1.1.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:793fe27f8aa5ae71e6dc09bcda702835ad9a23329d61cd26de046cfdcb0fbe5d -size 215393 diff --git a/1.4.1.tar.gz b/1.4.1.tar.gz new file mode 100644 index 0000000..6417806 --- /dev/null +++ b/1.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f396cd6f51939efed94f37736440238a86291ed02bcd523aa97aa2eff8de1f2 +size 230536 diff --git a/parboiled-1.1.6-build.tar.xz b/parboiled-1.1.6-build.tar.xz deleted file mode 100644 index 5f558e0..0000000 --- a/parboiled-1.1.6-build.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4a7d350818ea568dee926ffef3098a2d228f57b16e594b17f04f29b767c0a64 -size 2796 diff --git a/parboiled-build.tar.xz b/parboiled-build.tar.xz new file mode 100644 index 0000000..d9ca0ad --- /dev/null +++ b/parboiled-build.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab40ea0adc098fd8297c2bfc709409e055775d796c0a7b3e46589ae6e72b8143 +size 2860 diff --git a/parboiled-core-1.1.6.pom b/parboiled-core-1.4.1.pom similarity index 83% rename from parboiled-core-1.1.6.pom rename to parboiled-core-1.4.1.pom index 1c061d8..0950ea8 100644 --- a/parboiled-core-1.1.6.pom +++ b/parboiled-core-1.4.1.pom @@ -3,10 +3,10 @@ 4.0.0 org.parboiled parboiled-core - bundle + jar Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful http://parboiled.org - 1.1.6 + 1.4.1 Apache 2 @@ -32,15 +32,15 @@ - org.testng - testng - 5.14.1 + org.scalatestplus + testng-7-5_2.13 + 3.2.11.0 test org.scalatest - scalatest_2.9.3 - 1.9.1 + scalatest_2.13 + 3.2.11 test diff --git a/parboiled-java-1.1.6.pom b/parboiled-java-1.4.1.pom similarity index 81% rename from parboiled-java-1.1.6.pom rename to parboiled-java-1.4.1.pom index ca7805e..e6f0d65 100644 --- a/parboiled-java-1.1.6.pom +++ b/parboiled-java-1.4.1.pom @@ -3,10 +3,10 @@ 4.0.0 org.parboiled parboiled-java - bundle + jar Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful http://parboiled.org - 1.1.6 + 1.4.1 Apache 2 @@ -34,39 +34,39 @@ org.parboiled parboiled-core - 1.1.6 + 1.4.1 - org.testng - testng - 5.14.1 + org.scalatestplus + testng-7-5_2.13 + 3.2.11.0 test org.scalatest - scalatest_2.9.3 - 1.9.1 + scalatest_2.13 + 3.2.11 test org.ow2.asm asm - 4.1 + 9.2 org.ow2.asm asm-tree - 4.1 + 9.2 org.ow2.asm asm-analysis - 4.1 + 9.2 org.ow2.asm asm-util - 4.1 + 9.2 \ No newline at end of file diff --git a/parboiled-port-to-objectweb-asm-5.0.1.patch b/parboiled-port-to-objectweb-asm-5.0.1.patch deleted file mode 100644 index 369f968..0000000 --- a/parboiled-port-to-objectweb-asm-5.0.1.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 66129b1155188b4c2b1d3b34641a7118fd99eb51 Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Thu, 27 Mar 2014 10:59:08 +0100 -Subject: [PATCH] Port to objectweb-asm 5.0.1 - ---- - .../src/main/java/org/parboiled/transform/ParserClassNode.java | 2 ++ - parboiled-java/src/main/java/org/parboiled/transform/RuleMethod.java | 3 ++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/parboiled-java/src/main/java/org/parboiled/transform/ParserClassNode.java b/parboiled-java/src/main/java/org/parboiled/transform/ParserClassNode.java -index 6534f24..3da751b 100644 ---- a/parboiled-java/src/main/java/org/parboiled/transform/ParserClassNode.java -+++ b/parboiled-java/src/main/java/org/parboiled/transform/ParserClassNode.java -@@ -26,6 +26,7 @@ import static org.parboiled.common.Preconditions.*; - import org.objectweb.asm.Type; - import org.objectweb.asm.tree.ClassNode; - import org.objectweb.asm.tree.MethodNode; -+import org.objectweb.asm.Opcodes; - - import java.util.*; - -@@ -39,6 +40,7 @@ class ParserClassNode extends ClassNode { - private Class extendedClass; - - public ParserClassNode(Class parentClass) { -+ super(Opcodes.ASM4); - this.parentClass = checkArgNotNull(parentClass, "parentClass"); - parentType = Type.getType(parentClass); - } -diff --git a/parboiled-java/src/main/java/org/parboiled/transform/RuleMethod.java b/parboiled-java/src/main/java/org/parboiled/transform/RuleMethod.java -index c60ef8a..8c023ca 100644 ---- a/parboiled-java/src/main/java/org/parboiled/transform/RuleMethod.java -+++ b/parboiled-java/src/main/java/org/parboiled/transform/RuleMethod.java -@@ -31,6 +31,7 @@ import org.objectweb.asm.tree.LabelNode; - import org.objectweb.asm.tree.LocalVariableNode; - import org.objectweb.asm.tree.MethodNode; - import org.objectweb.asm.tree.analysis.BasicValue; -+import org.objectweb.asm.Opcodes; - import org.parboiled.BaseParser; - import org.parboiled.common.StringUtils; - import org.parboiled.support.Var; -@@ -71,7 +72,7 @@ class RuleMethod extends MethodNode { - - public RuleMethod(Class ownerClass, int access, String name, String desc, String signature, String[] exceptions, - boolean hasExplicitActionOnlyAnno, boolean hasDontLabelAnno, boolean hasSkipActionsInPredicates) { -- super(access, name, desc, signature, exceptions); -+ super(Opcodes.ASM4, access, name, desc, signature, exceptions); - this.ownerClass = ownerClass; - parameterCount = Type.getArgumentTypes(desc).length; - hasCachedAnnotation = parameterCount == 0; --- -1.9.0 - diff --git a/parboiled.changes b/parboiled.changes index 4d19235..b770a5d 100644 --- a/parboiled.changes +++ b/parboiled.changes @@ -4,6 +4,13 @@ Wed Oct 11 07:22:30 UTC 2023 - Fridrich Strba - Do not build the scala subpackage, since it is not needed by any package +------------------------------------------------------------------- +Fri Oct 6 11:26:05 UTC 2023 - Fridrich Strba + +- Require Java 9 for building because the function + java.lang.invoke.MethodHandles.Lookup.defineClass(...) does not + exist in earlier versions. + ------------------------------------------------------------------- Sun Mar 20 15:24:52 UTC 2022 - Fridrich Strba diff --git a/parboiled.spec b/parboiled.spec index 8bf12db..bcc5172 100644 --- a/parboiled.spec +++ b/parboiled.spec @@ -16,33 +16,32 @@ # -%global scala_short_version 2.10 %global base_name parboiled -Name: %{base_name} -Summary: Java/Scala library providing parsing of input text based on PEGs -License: Apache-2.0 -Group: Development/Libraries/Java -Version: 1.1.6 +Version: 1.4.1 Release: 0 URL: http://parboiled.org/ Source0: https://github.com/sirthias/parboiled/archive/%{version}.tar.gz -Source1: %{base_name}-%{version}-build.tar.xz +Source1: %{base_name}-build.tar.xz # for build see https://github.com/sirthias/parboiled/wiki/Building-parboiled Source2: https://repo1.maven.org/maven2/org/parboiled/%{base_name}-core/%{version}/%{base_name}-core-%{version}.pom Source3: https://repo1.maven.org/maven2/org/parboiled/%{base_name}-java/%{version}/%{base_name}-java-%{version}.pom -Patch0: parboiled-port-to-objectweb-asm-5.0.1.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: javapackages-local >= 6 +BuildRequires: javapackages-local +BuildArch: noarch +Name: %{base_name} +Summary: Java library providing parsing of input text based on PEGs +License: Apache-2.0 +Group: Development/Libraries/Java +BuildRequires: java-devel >= 9 BuildRequires: objectweb-asm Requires: mvn(org.ow2.asm:asm) Requires: mvn(org.ow2.asm:asm-analysis) Requires: mvn(org.ow2.asm:asm-tree) Requires: mvn(org.ow2.asm:asm-util) -BuildArch: noarch %description -parboiled is a mixed Java/Scala library providing parsing of +parboiled is a mixed Java library providing parsing of arbitrary input text based on Parsing expression grammars (PEGs). PEGs are an alternative to context free grammars (CFGs) for formally specifying syntax, they make a replacement for regular expressions @@ -62,8 +61,6 @@ This package contains javadoc for %{name}. find . -name "*.class" -delete find . -name "*.jar" -delete -%patch0 -p1 - cp %{SOURCE2} %{base_name}-core/pom.xml cp %{SOURCE3} %{base_name}-java/pom.xml