Gradle version bump

use of lys-catalog for dependency version management

build.gradle

@@ -29,16 +29,19 @@ subprojects { subproject ->
     repositories {
         maven {
             url = woggioniMavenRepositoryUrl
+            content {
+                includeGroup 'net.woggioni'
+            }
         }
         mavenCentral()
     }
 
     dependencies {
         ['compileOnly', 'annotationProcessor', 'testCompileOnly', 'testAnnotationProcessor'].each { conf ->
-            add(conf, [group: "org.projectlombok", name: "lombok", version: project['version.lombok']])
+            add(conf, [group: "org.projectlombok", name: "lombok", version: catalog.versions.lombok.get()])
         }
-        add("testImplementation", create(group: "org.junit.jupiter", name:"junit-jupiter-api", version: project["version.junitJupiter"]))
+        add("testImplementation", catalog.junit.jupiter.api)
-        add("testRuntimeOnly", create(group: "org.junit.jupiter", name: "junit-jupiter-engine", version: project["version.junitJupiter"]))
+        add("testRuntimeOnly", catalog.junit.jupiter.engine)
         add("testImplementation", gradleTestKit())
     }
 

gradle.properties

@@ -1,17 +1,15 @@
 woggioniMavenRepositoryUrl=https://mvn.woggioni.net/
 
-version.myGradlePlugins=2022.08
+lys.catalog.version=0.2-SNAPSHOT
-version.gradle=7.4.3
+
-version.lombok=1.18.22
+version.myGradlePlugins=2023.01
-version.junitJupiter=5.7.2
+version.gradle=7.6
-version.junitPlatform=1.7.0
+version.felix.config.admin=1.9.26
-version.bnd=5.3.0
+version.felix=7.0.5
-version.felix.config.admin=1.9.20
+version.felix.scr=2.2.4
-version.felix=7.0.1
-version.felix.scr=2.1.30
 version.felix.security=2.8.2
-version.osgi=7.0.0
+version.osgi=8.0.0
 version.osgi.cm=1.6.0
-version.osgi.service.component=1.4.0
+version.osgi.service.component=1.5.1
-version.osgi.function=1.1.0
+version.osgi.function=1.2.0
-version.osgi.promise=1.1.1
+version.osgi.promise=1.3.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

osgi-app/build.gradle

@@ -36,12 +36,8 @@ dependencies {
     embedded project(path: "osgi-simple-bootstrapper-api")
     embedded project(path: "osgi-simple-bootstrapper-application")
 
-    implementation group: 'biz.aQute.bnd', name: 'biz.aQute.bnd.gradle', version: getProperty('version.bnd')
+    implementation catalog.bndlib
-    implementation group: 'biz.aQute.bnd', name: 'biz.aQute.bndlib', version: getProperty('version.bnd')
+    implementation group: 'biz.aQute.bnd', name: 'biz.aQute.bnd.gradle', version: catalog.versions.bnd.get()
-
-    ['annotationProcessor', 'testCompileOnly', 'testAnnotationProcessor'].each { conf ->
-        add(conf, [group: "org.projectlombok", name: "lombok", version: getProperty('version.lombok')])
-    }
 }
 
 jar {

osgi-app/osgi-simple-bootstrapper-api/build.gradle

@@ -5,6 +5,6 @@ plugins {
 group = "net.woggioni.osgi"
 
 dependencies {
-    compileOnly group: 'org.osgi', name: 'osgi.annotation', version: getProperty('version.osgi')
+    compileOnly catalog.osgi.annotation
-    compileOnly group: 'org.osgi', name: 'osgi.core', version: getProperty('version.osgi')
+    compileOnly catalog.osgi.core
 }

osgi-app/osgi-simple-bootstrapper-application/build.gradle

@@ -1,23 +1,20 @@
 plugins {
     id 'java-library'
-    id 'biz.aQute.bnd.builder'
+    alias(catalog.plugins.bnd)
 }
 
 group = "net.woggioni.osgi"
 
 dependencies {
-    compileOnly group: 'org.osgi', name: 'osgi.annotation', version: getProperty('version.osgi')
+    compileOnly catalog.osgi.core
-    compileOnly group: 'org.osgi', name: 'osgi.core', version: getProperty('version.osgi')
+    compileOnly catalog.osgi.cmpn
-    compileOnly group: 'org.osgi', name: 'osgi.cmpn', version: getProperty('version.osgi')
+    compileOnly catalog.osgi.annotation
-    compileOnly group: 'org.osgi',
+    compileOnly catalog.osgi.service.component.annotations
-            name: 'org.osgi.service.component.annotations',
-            version: getProperty('version.osgi.service.component')
-
     compileOnly project(":osgi-app:osgi-simple-bootstrapper-api")
 
-    runtimeOnly group: 'org.apache.felix', name: 'org.apache.felix.scr', version: getProperty('version.felix.scr')
+    runtimeOnly catalog.felix.scr
-    runtimeOnly group: 'org.osgi', name: 'org.osgi.util.function', version: getProperty('version.osgi.function')
+    runtimeOnly catalog.osgi.util.function
-    runtimeOnly group: 'org.osgi', name: 'org.osgi.util.promise', version: getProperty('version.osgi.promise')
+    runtimeOnly catalog.osgi.util.promise
 }
 
 jar {

osgi-app/osgi-simple-bootstrapper/build.gradle

@@ -13,12 +13,9 @@ configurations {
 }
 
 dependencies {
-    compileOnly group: 'org.osgi', name: 'osgi.annotation', version: getProperty('version.osgi')
+    compileOnly catalog.osgi.core
-    compileOnly group: 'org.osgi', name: 'osgi.core', version: getProperty('version.osgi')
+    compileOnly catalog.osgi.annotation
-    compileOnly group: 'org.osgi',
+    compileOnly catalog.osgi.service.component.annotations
-            name: 'org.osgi.service.component.annotations',
-            version: getProperty('version.osgi.service.component')
-
     compileOnly project(":osgi-app:osgi-simple-bootstrapper-api")
 }
 

osgi-app/osgi-simple-bootstrapper/src/main/java/net/woggioni/osgi/simple/bootstrapper/JavaAgentLauncher.java

@@ -36,7 +36,7 @@ public class JavaAgentLauncher {
         }
     }
 
-    static void agentmain(String agentArguments, Instrumentation instrumentation) {
+    public static void agentmain(String agentArguments, Instrumentation instrumentation) {
         premain(agentArguments, instrumentation);
     }
 }

settings.gradle

@@ -1,9 +1,17 @@
-pluginManagement {
+dependencyResolutionManagement {
     repositories {
-        gradlePluginPortal()
+        maven {
+            url = 'https://woggioni.net/mvn/'
+            content {
+                includeGroup 'com.lys'
+            }
+        }
     }
-    plugins {
+    versionCatalogs {
-        id 'biz.aQute.bnd.builder' version getProperty('version.bnd')
+        catalog {
+            from group: 'com.lys', name: 'lys-catalog', version: getProperty('lys.catalog.version')
+            version("slf4j", "1.7.36")
+        }
     }
 }
 

wildfly/src/main/java/net/woggioni/gradle/wildfly/Deploy2WildflyTask.java

@@ -7,6 +7,7 @@ import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.Exec;
 import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.InputFile;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -35,8 +36,8 @@ public class Deploy2WildflyTask extends Exec {
     @Getter
     private final Property<String> rpcPassword;
 
-    @Input
     @Getter
+    @InputFile
     private final RegularFileProperty artifact;
 
     private String projectProperty(String key, String defaultValue) {