Update dependencies and plugins (#1625)

spockframework · Apr 6, 2023 · aed48cf · aed48cf
1 parent 22a8417
commit aed48cf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -62,18 +62,18 @@ ext {
   jacocoVersion = '0.8.8'
 
   libs = [
-    jetbrainsAnnotations: "org.jetbrains:annotations:20.1.0",
-    asm                 : "org.ow2.asm:asm:9.2",
-    bytebuddy           : "net.bytebuddy:byte-buddy:1.12.14",
+    jetbrainsAnnotations: "org.jetbrains:annotations:24.0.1",
+    asm                 : "org.ow2.asm:asm:9.5",
+    bytebuddy           : "net.bytebuddy:byte-buddy:1.14.3",
     cglib               : "cglib:cglib-nodep:3.3.0",
     groovy              : groovyDependencies,
     groovyNio           : "$groovyGroup:groovy-nio:$groovyVersion", //for groovy methods on Path
     groovySql           : "$groovyGroup:groovy-sql:$groovyVersion", //for some Spring and Unitils tests
     groovyTest          : "$groovyGroup:groovy-test:$groovyVersion", //for @NotYetImplemented
     groovyJmx           : "$groovyGroup:groovy-jmx:$groovyVersion",  //for triggering jacoco dump via jmx
-    h2database          : "com.h2database:h2:1.4.200",
+    h2database          : "com.h2database:h2:2.1.214",
     hamcrest            : "org.hamcrest:hamcrest:2.2",
-    jaxb                : "javax.xml.bind:jaxb-api:2.3.0",
+    jaxb                : "javax.xml.bind:jaxb-api:2.3.1",
     junit4              : "junit:junit:4.13.2",
     junitBom            : "org.junit:junit-bom:5.9.0",
     jupiter             : "org.junit.jupiter:junit-jupiter",

diff --git a/settings.gradle b/settings.gradle
@@ -8,10 +8,10 @@ pluginManagement {
 
   plugins {
     id "com.gradle.enterprise" version "3.12.4"
-    id "com.gradle.common-custom-user-data-gradle-plugin" version "1.9"
+    id "com.gradle.common-custom-user-data-gradle-plugin" version "1.10"
     id "org.asciidoctor.jvm.convert" version "3.3.2"
     id "net.nemerosa.versioning" version "3.0.0"
-    id "io.github.gradle-nexus.publish-plugin" version "1.2.0"
+    id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
     id "com.github.ben-manes.versions" version "0.46.0"
     id "biz.aQute.bnd.builder" version "6.4.0"
     id "io.spring.nohttp" version "0.0.11"

diff --git a/spock-unitils/src/test/groovy/org/spockframework/unitils/dbunit/UserDao.groovy b/spock-unitils/src/test/groovy/org/spockframework/unitils/dbunit/UserDao.groovy
@@ -14,9 +14,10 @@
 
 package org.spockframework.unitils.dbunit
 
-import groovy.sql.Sql
 import javax.sql.DataSource
 
+import groovy.sql.Sql
+
 class UserDao {
   private Sql sql
 
@@ -25,12 +26,12 @@ class UserDao {
   }
 
   User findByName(String firstName, String lastName) {
-    def row = sql.firstRow("select * from user where first_name=? and last_name=?", [firstName, lastName])
+    def row = sql.firstRow("select * from `user` where first_name=? and last_name=?", [firstName, lastName])
     row2User(row)
   }
 
   List<User> findByMinimalAge(int age) {
-    sql.rows("select * from user where age >= ?", [age]).collect {
+    sql.rows("select * from `user` where age >= ?", [age]).collect {
       row2User(it)
     }
   }

diff --git a/spock-unitils/src/test/groovy/org/spockframework/unitils/dbunit/UserDaoSpec.groovy b/spock-unitils/src/test/groovy/org/spockframework/unitils/dbunit/UserDaoSpec.groovy
@@ -32,7 +32,7 @@ class UserDaoSpec extends Specification {
   @Shared Sql sql = Sql.newInstance("jdbc:h2:mem:userdb", "org.h2.Driver")
 
   def setupSpec() {
-    sql.execute("create table user (first_name varchar(25), last_name varchar(50), age int)")
+    sql.execute("create table `user` (first_name varchar(25), last_name varchar(50), age int)")
   }
 
   def cleanupSpec() {