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

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:793fe27f8aa5ae71e6dc09bcda702835ad9a23329d61cd26de046cfdcb0fbe5d
-size 215393

parboiled-1.1.6-build.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b4a7d350818ea568dee926ffef3098a2d228f57b16e594b17f04f29b767c0a64
-size 2796

parboiled-build.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab40ea0adc098fd8297c2bfc709409e055775d796c0a7b3e46589ae6e72b8143
+size 2860

parboiled-core-1.4.1.pom

@@ -3,10 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.parboiled</groupId>
     <artifactId>parboiled-core</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <description>Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful</description>
     <url>http://parboiled.org</url>
-    <version>1.1.6</version>
+    <version>1.4.1</version>
     <licenses>
         <license>
             <name>Apache 2</name>
@@ -32,15 +32,15 @@
     </developers>
     <dependencies>
         <dependency>
-            <groupId>org.testng</groupId>
+            <groupId>org.scalatestplus</groupId>
-            <artifactId>testng</artifactId>
+            <artifactId>testng-7-5_2.13</artifactId>
-            <version>5.14.1</version>
+            <version>3.2.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.scalatest</groupId>
-            <artifactId>scalatest_2.9.3</artifactId>
+            <artifactId>scalatest_2.13</artifactId>
-            <version>1.9.1</version>
+            <version>3.2.11</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

parboiled-java-1.4.1.pom

@@ -3,10 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.parboiled</groupId>
     <artifactId>parboiled-java</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <description>Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful</description>
     <url>http://parboiled.org</url>
-    <version>1.1.6</version>
+    <version>1.4.1</version>
     <licenses>
         <license>
             <name>Apache 2</name>
@@ -34,39 +34,39 @@
         <dependency>
             <groupId>org.parboiled</groupId>
             <artifactId>parboiled-core</artifactId>
-            <version>1.1.6</version>
+            <version>1.4.1</version>
         </dependency>
         <dependency>
-            <groupId>org.testng</groupId>
+            <groupId>org.scalatestplus</groupId>
-            <artifactId>testng</artifactId>
+            <artifactId>testng-7-5_2.13</artifactId>
-            <version>5.14.1</version>
+            <version>3.2.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.scalatest</groupId>
-            <artifactId>scalatest_2.9.3</artifactId>
+            <artifactId>scalatest_2.13</artifactId>
-            <version>1.9.1</version>
+            <version>3.2.11</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
-            <version>4.1</version>
+            <version>9.2</version>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-tree</artifactId>
-            <version>4.1</version>
+            <version>9.2</version>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-analysis</artifactId>
-            <version>4.1</version>
+            <version>9.2</version>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-util</artifactId>
-            <version>4.1</version>
+            <version>9.2</version>
         </dependency>
     </dependencies>
 </project>

parboiled-port-to-objectweb-asm-5.0.1.patch

@@ -1,54 +0,0 @@
-From 66129b1155188b4c2b1d3b34641a7118fd99eb51 Mon Sep 17 00:00:00 2001
-From: Michal Srb <msrb@redhat.com>
-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
-

parboiled.changes

@@ -4,6 +4,13 @@ Wed Oct 11 07:22:30 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 - Do not build the scala subpackage, since it is not needed by any
   package
 
+-------------------------------------------------------------------
+Fri Oct  6 11:26:05 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- 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 <fstrba@suse.com>
 

parboiled.spec

@@ -16,33 +16,32 @@
 #
 
 
-%global scala_short_version 2.10
 %global base_name parboiled
-Name:           %{base_name}
+Version:        1.4.1
-Summary:        Java/Scala library providing parsing of input text based on PEGs
-License:        Apache-2.0
-Group:          Development/Libraries/Java
-Version:        1.1.6
 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