From 5a2c8d4d3d2e82a5af119d9aede469373424dee4 Mon Sep 17 00:00:00 2001
From: Pavel Jandejsek <pavel.jandejsek@gmail.com>
Date: Fri, 22 Dec 2023 13:18:45 +0100
Subject: [PATCH] Update dependencies and add java 17 build.

CGLib replaced with Byte Buddy since Spock would not work with it on newer java versions.
---
 .github/workflows/ci.yml                      |  2 +-
 pom.xml                                       | 21 +++++++++----------
 .../engine/JBehaveTestEngine.java             |  2 +-
 .../discovery/JBehaveSelectorResolver.java    |  4 ++--
 .../jbehavesupport/runner/JUnitRunner.java    |  2 +-
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 08c3feb..07b4fd7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8 ]
+        java: [ 8, 17 ]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Java ${{ matrix.java }}
diff --git a/pom.xml b/pom.xml
index 9458d22..37119c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,12 +39,11 @@
         <version.junit-platform>1.8.2</version.junit-platform>
         <version.junit4>4.13.2</version.junit4>
         <version.jbehave>5.0</version.jbehave>
-        <version.slf4j>1.7.30</version.slf4j>
-        <version.groovy>2.5.14</version.groovy>
-        <version.spock>1.3-groovy-2.5</version.spock>
-        <version.cglib>3.3.0</version.cglib>
-        <version.lombok>1.18.18</version.lombok>
-        <version.logback>1.2.13</version.logback>
+        <version.slf4j>2.0.9</version.slf4j>
+        <version.spock>2.3-groovy-4.0</version.spock>
+        <version.byte-buddy>1.14.8</version.byte-buddy>
+        <version.lombok>1.18.30</version.lombok>
+        <version.logback>1.3.14</version.logback>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -53,7 +52,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.12.0</version>
                 <configuration>
                     <source>${version.jdk}</source>
                     <target>${version.jdk}</target>
@@ -62,7 +61,7 @@
             <plugin>
                 <groupId>org.codehaus.gmavenplus</groupId>
                 <artifactId>gmavenplus-plugin</artifactId>
-                <version>1.6.2</version>
+                <version>3.0.2</version>
                 <executions>
                     <execution>
                         <goals>
@@ -120,9 +119,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
-            <version>${version.cglib}</version>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+            <version>${version.byte-buddy}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/org/jbehavesupport/engine/JBehaveTestEngine.java b/src/main/java/org/jbehavesupport/engine/JBehaveTestEngine.java
index e808493..ed86657 100644
--- a/src/main/java/org/jbehavesupport/engine/JBehaveTestEngine.java
+++ b/src/main/java/org/jbehavesupport/engine/JBehaveTestEngine.java
@@ -83,7 +83,7 @@ public void execute(ExecutionRequest request) {
 
     @SneakyThrows(ReflectiveOperationException.class)
     private static Comparator<TestDescriptor> getComparatorInstance(String className) {
-        return (Comparator<TestDescriptor>) Class.forName(className).newInstance();
+        return (Comparator<TestDescriptor>) Class.forName(className).getDeclaredConstructor().newInstance();
     }
 
 }
diff --git a/src/main/java/org/jbehavesupport/engine/discovery/JBehaveSelectorResolver.java b/src/main/java/org/jbehavesupport/engine/discovery/JBehaveSelectorResolver.java
index d67ca05..b9cc507 100644
--- a/src/main/java/org/jbehavesupport/engine/discovery/JBehaveSelectorResolver.java
+++ b/src/main/java/org/jbehavesupport/engine/discovery/JBehaveSelectorResolver.java
@@ -67,12 +67,12 @@ public Resolution resolve(ClassSelector selector, Context context) {
         return resolveTestClass((Class<? extends JUnit5Stories>)selector.getJavaClass(), context);
     }
 
-    @SneakyThrows({IllegalAccessException.class, InstantiationException.class})
+    @SneakyThrows({ReflectiveOperationException.class})
     private Resolution resolveTestClass(Class<? extends ConfigurableEmbedder> testClass, Context context) {
         List<String> storyPaths;
         Embedder configuredEmbedder;
 
-        ConfigurableEmbedder configurableEmbedder = testClass.newInstance();
+        ConfigurableEmbedder configurableEmbedder = testClass.getDeclaredConstructor().newInstance();
         configuredEmbedder = configurableEmbedder.configuredEmbedder();
         setupNullStepMonitor(configuredEmbedder);
         storyPaths = getStoryPaths(configurableEmbedder);
diff --git a/src/main/java/org/jbehavesupport/runner/JUnitRunner.java b/src/main/java/org/jbehavesupport/runner/JUnitRunner.java
index 6629e13..40550ff 100644
--- a/src/main/java/org/jbehavesupport/runner/JUnitRunner.java
+++ b/src/main/java/org/jbehavesupport/runner/JUnitRunner.java
@@ -72,7 +72,7 @@ public JUnitRunner(Class<? extends ConfigurableEmbedder> testClass)
 
         super(testClass);
         reportLevel = System.getProperty("jbehave.report.level", ReportLevel.STEP.name());
-        ConfigurableEmbedder configurableEmbedder = testClass.newInstance();
+        ConfigurableEmbedder configurableEmbedder = testClass.getDeclaredConstructor().newInstance();
         configuredEmbedder = configurableEmbedder.configuredEmbedder();
         setupNullStepMonitor(configuredEmbedder);
         storyPaths = getStoryPaths(configurableEmbedder);