Skip to content

Commit

Permalink
Merge pull request #56 from rundeck-plugins/update-axion
Browse files Browse the repository at this point in the history
Update axion to 1.17.2
  • Loading branch information
sjrd218 authored Nov 22, 2024
2 parents 55cd29f + 202391e commit ac7dd94
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
- name: Get Fetch Tags
run: git -c protocol.version=2 fetch --tags --progress --no-recurse-submodules origin
if: "!contains(github.ref, 'refs/tags')"
- name: Set up JDK 1.8
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: set up JDK 1.8
- name: set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11
- name: Build with Gradle
run: ./gradlew build
- name: Get Release Version
Expand Down
19 changes: 6 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@ buildscript {
}

plugins {
id 'pl.allegro.tech.build.axion-release' version '1.13.4'
id 'pl.allegro.tech.build.axion-release' version '1.17.2'
}
defaultTasks 'clean','build'
apply plugin: 'java'
apply plugin: 'idea'
apply plugin: 'maven-publish'
apply plugin: 'pl.allegro.tech.build.axion-release'

sourceCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
ext.rundeckPluginVersion= '1.2'
ext.rundeckVersion='4.17.6-20240402'
ext.rundeckVersion='5.2.0-20240410'

/**
* Set this to a comma-separated list of full classnames of your implemented Rundeck
Expand All @@ -25,18 +26,10 @@ ext.rundeckVersion='4.17.6-20240402'
ext.pluginClassNames='org.rundeck.plugins.S3LogFileStoragePlugin'

scmVersion {
ignoreUncommittedChanges = true
tag {
prefix = 'v'
versionSeparator = ''
def origDeserialize=deserialize
//apend .0 to satisfy semver if the tag version is only X.Y
deserialize = { config, position, tagName ->
def orig = origDeserialize(config, position, tagName)
if (orig.split('\\.').length < 3) {
orig += ".0"
}
orig
}
}
}
project.version = scmVersion.version
Expand Down Expand Up @@ -94,7 +87,7 @@ jar {
def libList = configurations.pluginLibs.collect{'lib/'+it.name}.join(' ')
attributes 'Rundeck-Plugin-Name': 'S3 Log Plugin'
attributes 'Rundeck-Plugin-Description': 'Store execution log files in S3, for backup or for cloud-friendly behavior.'
attributes 'Rundeck-Plugin-Rundeck-Compatibility-Version': '2.6.5+'
attributes 'Rundeck-Plugin-Rundeck-Compatibility-Version': '5.2.0+'
attributes 'Rundeck-Plugin-Tags': 'java,s3,execution file storage'
attributes 'Rundeck-Plugin-License': 'Apache 2.0'
attributes 'Rundeck-Plugin-Author': 'Rundeck, Inc.'
Expand Down

0 comments on commit ac7dd94

Please sign in to comment.