upgrade to tapestry 5.7

eddyson-de · Aug 19, 2021 · 55ca893 · 55ca893
1 parent b5517e5
commit 55ca893
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 description = "Utilities for Geb-based browser tests of Tapestry applications"
 
 group = "de.eddyson"
-version = "0.45.2"
+version = "0.46.0"
 
 repositories {
   mavenCentral()
@@ -27,17 +27,15 @@ artifacts {
 }
 
 ext.versions=[
-  tapestry: '5.6.1',
+  tapestry: '5.7.3',
   geb: '4.1',
-  spock: '1.3-groovy-2.5',
   selenium: '3.141.59'
 ]
 
 dependencies {
   implementation "org.apache.tapestry:tapestry-runner:$versions.tapestry"
   implementation "org.apache.tapestry:tapestry-core:$versions.tapestry"
   implementation "org.gebish:geb-spock:$versions.geb"
-  implementation "org.spockframework:spock-core:$versions.spock"
   implementation "org.seleniumhq.selenium:selenium-support:$versions.selenium"
 }
 

diff --git a/src/main/groovy/de/eddyson/tapestrygeb/JettyGebSpec.groovy b/src/main/groovy/de/eddyson/tapestrygeb/JettyGebSpec.groovy
@@ -15,11 +15,11 @@ abstract class JettyGebSpec extends GebReportingSpec {
 
   protected static Logger logger = LoggerFactory.getLogger(JettyGebSpec)
 
-  Registry getRegistry(){
+  static Registry getRegistry(){
     return JettyExtension.getRegistry()
   }
 
-  def getService(Class serviceInterface){
+  static def getService(Class serviceInterface){
     return getRegistry().getService(serviceInterface)
   }
 

diff --git a/src/main/java/de/eddyson/tapestrygeb/InjectInterceptor.java b/src/main/java/de/eddyson/tapestrygeb/InjectInterceptor.java
@@ -1,9 +1,6 @@
 package de.eddyson.tapestrygeb;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-
-import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.commons.AnnotationProvider;
 import org.apache.tapestry5.ioc.annotations.Autobuild;
 import org.apache.tapestry5.ioc.annotations.Inject;
 import org.apache.tapestry5.ioc.annotations.InjectService;
@@ -12,9 +9,11 @@
 import org.spockframework.runtime.model.FieldInfo;
 import org.spockframework.runtime.model.SpecInfo;
 import org.spockframework.util.ReflectionUtil;
-
 import spock.lang.Shared;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+
 public class InjectInterceptor extends AbstractMethodInterceptor {
 
   private final SpecInfo spec;