Skip to content

Commit

Permalink
Sort date based tags (#5)
Browse files Browse the repository at this point in the history
* Handle date-based tags as v1.2.3 style

---------

Co-authored-by: Karl DeBisschop <karl.debisschop@bioraft.com>
  • Loading branch information
kdebisschop and Karl DeBisschop authored Jul 22, 2024
1 parent a746948 commit 0a193ff
Show file tree
Hide file tree
Showing 11 changed files with 298 additions and 286 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Run unit tests
run: ./gradlew test
- name: Determine coverage
run: ./gradlew jacocoTestReport
- name: Scan with Sonar
run: ./gradlew sonar
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
# - name: Scan with Sonar
# run: ./gradlew sonar
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
- name: Build with Gradle
run: ./gradlew build
27 changes: 14 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ sonarqube {
property "sonar.projectKey", "kdebisschop_rundeck-nexus3-optionvalue-plugin"
property "sonar.organization", "kdebisschop"
property "sonar.host.url", "https://sonarcloud.io"
property "sonar.login", "807fd8589d7244bd324b5fecdfca9614d8a40c8c"
}
}

Expand All @@ -30,8 +29,8 @@ apply plugin: 'eclipse'
apply plugin: 'idea'

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

defaultTasks 'clean','build'
Expand All @@ -40,8 +39,8 @@ group = 'com.github.kdebisschop'

ext.rundeckPluginVersion = '1.2'
ext.pluginClassNames='com.bioraft.rundeck.nexus.Nexus3OptionProvider'
ext.pluginName = 'Nexus3 Option Values Porvider'
ext.pluginDescription = 'Fetches and filters assests from a Nexus3 repository'
ext.pluginName = 'Nexus3 Option Values Provider'
ext.pluginDescription = 'Fetches and filters assets from a Nexus3 repository'

scmVersion {
ignoreUncommittedChanges = true
Expand All @@ -65,7 +64,6 @@ scmVersion {
project.version = scmVersion.version

repositories {
mavenLocal()
mavenCentral()
}

Expand All @@ -80,15 +78,18 @@ configurations{
}

gradle.projectsEvaluated {
tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint:unchecked"
tasks.withType(JavaCompile).tap {
configureEach {
options.compilerArgs << "-Xlint:unchecked"
}
}
}

dependencies {
implementation 'org.rundeck:rundeck-core:3.4.10-20220118'
implementation 'org.rundeck:rundeck-core:5.4.0-20240618'
implementation 'org.apache.maven:maven-artifact:3.9.8'

testImplementation group: 'junit', name: 'junit', version:'4.12'
testImplementation group: 'junit', name: 'junit', version: '4.13.1'

testImplementation (
'org.mockito:mockito-all:1.10.19',
Expand All @@ -98,7 +99,7 @@ dependencies {
}

// Task to copy plugin libs to output/lib dir
task copyToLib(type: Copy) {
tasks.register('copyToLib', Copy) {
into "$buildDir/output/lib"
from configurations.pluginLibs
}
Expand All @@ -125,11 +126,11 @@ jar {
dependsOn(copyToLib)
}

task sourceJar(type: Jar) {
tasks.register('sourceJar', Jar) {
from sourceSets.main.allJava
}

task javadocJar(type: Jar) {
tasks.register('javadocJar', Jar) {
from javadoc.destinationDir
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Feb 23 09:56:45 EST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 0a193ff

Please sign in to comment.