Skip to content

Commit 286d4ea

Browse files
committed
Migrate to PackageCloud: restore Axion, change groupId to com.rundeck.plugins, upgrade to Java 17
- Changed groupId: com.rundeck → com.rundeck.plugins - Updated Axion with ignoreUncommittedChanges=false - Upgraded from Java 11 to Java 17 for Grails 7 compatibility - Updated nexusPublishing.packageGroup to com.rundeck.plugins - Added PackageCloud publishing configuration - Version now managed dynamically from git tags See: .temp/PLUGIN_TAGGING_ARCHITECTURE.md and PACKAGECLOUD_MIGRATION_PLAN.md
1 parent 3e9375f commit 286d4ea

2 files changed

Lines changed: 25 additions & 8 deletions

File tree

build.gradle

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id 'java'
55
}
66

7-
group 'com.rundeck'
7+
group 'com.rundeck.plugins'
88

99
ext.rundeckPluginVersion = '1.2'
1010
ext.publishName = "Git Plugin ${project.version}"
@@ -18,19 +18,19 @@ ext.developers = [
1818

1919

2020
java {
21-
sourceCompatibility = JavaVersion.VERSION_11
22-
targetCompatibility = JavaVersion.VERSION_11
21+
sourceCompatibility = JavaVersion.VERSION_17
22+
targetCompatibility = JavaVersion.VERSION_17
2323
withJavadocJar()
2424
withSourcesJar()
2525
}
2626

2727
scmVersion {
28-
ignoreUncommittedChanges = true
28+
ignoreUncommittedChanges = false
2929
tag {
30-
prefix = ''
30+
prefix = '' // NO "v" prefix - see PLUGIN_TAGGING_ARCHITECTURE.md
3131
versionSeparator = ''
3232
}
33-
versionCreator("simple")
33+
versionCreator 'simple' // Use simple version creator (just tag name)
3434
}
3535
project.version = scmVersion.version
3636

@@ -116,7 +116,7 @@ jar {
116116
}
117117

118118
nexusPublishing {
119-
packageGroup = 'org.rundeck.plugins'
119+
packageGroup = 'com.rundeck.plugins'
120120
repositories {
121121
sonatype()
122122
}
@@ -127,3 +127,20 @@ test {
127127
}
128128

129129
apply from: "${rootDir}/gradle/publishing.gradle"
130+
131+
// Add PackageCloud repository
132+
publishing {
133+
repositories {
134+
maven {
135+
name = "PackageCloudTest"
136+
url = uri("https://packagecloud.io/pagerduty/rundeckpro-test/maven2")
137+
authentication {
138+
header(HttpHeaderAuthentication)
139+
}
140+
credentials(HttpHeaderCredentials) {
141+
name = "Authorization"
142+
value = "Bearer " + (System.getenv("PKGCLD_WRITE_TOKEN") ?: project.findProperty("pkgcldWriteToken"))
143+
}
144+
}
145+
}
146+
}

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ objenesis = "1.4"
1515
# Security overrides for transitive dependencies
1616
okhttp3 = "4.12.0"
1717
okio = "3.9.1"
18-
commonsLang3 = "3.18.0"
18+
commonsLang3 = "3.17.0"
1919

2020
[libraries]
2121
groovyAll = { group = "org.codehaus.groovy", name = "groovy-all", version.ref = "groovy" }

0 commit comments

Comments
 (0)