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

9
build.gradle
View File

@@ -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("testRuntimeOnly", create(group: "org.junit.jupiter", name: "junit-jupiter-engine", version: project["version.junitJupiter"]))
add("testImplementation", catalog.junit.jupiter.api)
add("testRuntimeOnly", catalog.junit.jupiter.engine)
add("testImplementation", gradleTestKit())
}

24
gradle.properties
View File

@@ -1,17 +1,15 @@
woggioniMavenRepositoryUrl=https://mvn.woggioni.net/
version.myGradlePlugins=2022.08
version.gradle=7.4.3
version.lombok=1.18.22
version.junitJupiter=5.7.2
version.junitPlatform=1.7.0
version.bnd=5.3.0
version.felix.config.admin=1.9.20
version.felix=7.0.1
version.felix.scr=2.1.30
lys.catalog.version=0.2-SNAPSHOT
version.myGradlePlugins=2023.01
version.gradle=7.6
version.felix.config.admin=1.9.26
version.felix=7.0.5
version.felix.scr=2.2.4
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.function=1.1.0
version.osgi.promise=1.1.1
version.osgi.service.component=1.5.1
version.osgi.function=1.2.0
version.osgi.promise=1.3.0

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -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

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

16
settings.gradle
View File

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

3
wildfly/src/main/java/net/woggioni/gradle/wildfly/Deploy2WildflyTask.java
View File

@@ -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) {