Skip to content

Commit 8746ed3

Browse files
committed
Migrate to PackageCloud: restore Axion, change groupId to com.rundeck.plugins, upgrade to Java 17
- Changed groupId: org.rundeck.plugins → com.rundeck.plugins - Updated Axion with prefix='' (no 'v' prefix) - Added versionCreator 'simple' to Axion - Updated nexusPublishing.packageGroup to com.rundeck.plugins - Added PackageCloud publishing configuration - CRITICAL: Upgraded from Java 11 to Java 17 for Grails 7 compatibility - Version now managed dynamically from git tags Based on origin/main (includes all post-v1.8.6 commits)
1 parent df71c6d commit 8746ed3

File tree

2 files changed

+24
-6
lines changed

2 files changed

+24
-6
lines changed

build.gradle

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212
alias(libs.plugins.nexusPublish)
1313
}
1414

15-
group = 'org.rundeck.plugins'
15+
group = 'com.rundeck.plugins'
1616
ext.publishName = "EC2 Nodes Plugin ${project.version}"
1717
ext.publishDescription = project.description ?: 'Produces Rundeck Nodes from AWS EC2'
1818
ext.githubSlug = 'rundeck-plugins/rundeck-ec2-nodes-plugin'
@@ -21,7 +21,7 @@ ext.developers = [
2121
]
2222

2323
java {
24-
sourceCompatibility = JavaVersion.VERSION_11
24+
sourceCompatibility = JavaVersion.VERSION_17
2525
withJavadocJar()
2626
withSourcesJar()
2727
}
@@ -37,9 +37,10 @@ ext.rundeckPluginVersion = '1.1'
3737
scmVersion {
3838
ignoreUncommittedChanges = false
3939
tag {
40-
prefix = 'v'
40+
prefix = '' // NO "v" prefix - see PLUGIN_TAGGING_ARCHITECTURE.md
4141
versionSeparator = ''
4242
}
43+
versionCreator 'simple' // Use simple version creator (just tag name)
4344
}
4445
project.version = scmVersion.version
4546

@@ -125,7 +126,7 @@ test {
125126
jar.dependsOn(copyToLib)
126127

127128
nexusPublishing {
128-
packageGroup = 'org.rundeck.plugins'
129+
packageGroup = 'com.rundeck.plugins'
129130
repositories {
130131
sonatype {
131132
nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
@@ -134,4 +135,21 @@ nexusPublishing {
134135
}
135136
}
136137

137-
apply from: "${rootDir}/gradle/publishing.gradle"
138+
apply from: "${rootDir}/gradle/publishing.gradle"
139+
140+
// Add PackageCloud repository
141+
publishing {
142+
repositories {
143+
maven {
144+
name = "PackageCloudTest"
145+
url = uri("https://packagecloud.io/pagerduty/rundeckpro-test/maven2")
146+
authentication {
147+
header(HttpHeaderAuthentication)
148+
}
149+
credentials(HttpHeaderCredentials) {
150+
name = "Authorization"
151+
value = "Bearer " + (System.getenv("PKGCLD_WRITE_TOKEN") ?: project.findProperty("pkgcldWriteToken"))
152+
}
153+
}
154+
}
155+
}

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ rundeckCore = "5.14.0-rc1-20250722"
1111
slf4j = "1.7.36"
1212
spock = "2.3-groovy-3.0"
1313
# Security overrides for transitive dependencies
14-
commonsLang3 = "3.18.0"
14+
commonsLang3 = "3.17.0"
1515

1616
[libraries]
1717
slf4jApi = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }

0 commit comments

Comments
 (0)