woggioni/my-gradle-plugins
1
0
Fork 0
Code Actions Packages Releases Activity

Gradle version bump

Browse Source 
use of lys-catalog for dependency version management
This commit is contained in:
Walter Oggioni
2023-01-01 17:37:48 +08:00
parent 63a3066f62
commit a0ab18f053
11 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osgi-app/build.gradle
View File

@@ -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 group: 'biz.aQute.bnd', name: 'biz.aQute.bndlib', version: getProperty('version.bnd')
['annotationProcessor', 'testCompileOnly', 'testAnnotationProcessor'].each { conf ->
add(conf, [group: "org.projectlombok", name: "lombok", version: getProperty('version.lombok')])
}
implementation catalog.bndlib
implementation group: 'biz.aQute.bnd', name: 'biz.aQute.bnd.gradle', version: catalog.versions.bnd.get()
}
jar {

4
osgi-app/osgi-simple-bootstrapper-api/build.gradle
View File

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

19
osgi-app/osgi-simple-bootstrapper-application/build.gradle
View File

@@ -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 group: 'org.osgi', name: 'osgi.core', version: getProperty('version.osgi')
compileOnly group: 'org.osgi', name: 'osgi.cmpn', version: getProperty('version.osgi')
compileOnly group: 'org.osgi',
name: 'org.osgi.service.component.annotations',
version: getProperty('version.osgi.service.component')
compileOnly catalog.osgi.core
compileOnly catalog.osgi.cmpn
compileOnly catalog.osgi.annotation
compileOnly catalog.osgi.service.component.annotations
compileOnly project(":osgi-app:osgi-simple-bootstrapper-api")
runtimeOnly group: 'org.apache.felix', name: 'org.apache.felix.scr', version: getProperty('version.felix.scr')
runtimeOnly group: 'org.osgi', name: 'org.osgi.util.function', version: getProperty('version.osgi.function')
runtimeOnly group: 'org.osgi', name: 'org.osgi.util.promise', version: getProperty('version.osgi.promise')
runtimeOnly catalog.felix.scr
runtimeOnly catalog.osgi.util.function
runtimeOnly catalog.osgi.util.promise
}
jar {

9
osgi-app/osgi-simple-bootstrapper/build.gradle
View File

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

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

@@ -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);
}
}