Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RUN-2285: Update aws sdk version and exclude httpcilent from build #133

Merged
merged 3 commits into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
id: get_version
run: VERSION=$(./gradlew currentVersion -q -Prelease.quiet) && echo ::set-output name=VERSION::$VERSION
- name: Upload sshj-plugin jar
uses: actions/upload-artifact@v1.0.0
uses: actions/upload-artifact@v4
with:
# Artifact name
name: Grails-Plugin-${{ steps.get_version.outputs.VERSION }}
Expand Down
30 changes: 22 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ buildscript {

plugins {
id 'pl.allegro.tech.build.axion-release' version '1.13.4'
id 'maven-publish'
}

group = 'com.github.rundeck-plugins'

apply plugin: 'java'
apply plugin: 'groovy'
apply plugin: 'idea'
Expand Down Expand Up @@ -36,10 +39,11 @@ project.version = scmVersion.version

configurations{
//declare custom pluginLibs configuration to include only libs for this plugin
pluginLibs
pluginLibs {
}

//declare compile to extend from pluginLibs so it inherits the dependencies
implementation{
implementation {
extendsFrom pluginLibs
}
}
Expand All @@ -49,23 +53,24 @@ repositories {
}
dependencies {
implementation "org.slf4j:slf4j-api:1.7.36"
implementation (group: 'org.rundeck', name: 'rundeck-core', version: '3.4.0-20210614') {
implementation (group: 'org.rundeck', name: 'rundeck-core', version: '4.0.0-20220322') {
exclude group: "com.google.guava"
}
implementation "com.amazonaws:aws-java-sdk-core:1.11.743"
implementation "com.amazonaws:aws-java-sdk-sts:1.11.743"
implementation "com.amazonaws:aws-java-sdk-core:${awsSdkVersion}"
implementation "com.amazonaws:aws-java-sdk-sts:${awsSdkVersion}"
implementation "com.fasterxml.jackson.core:jackson-databind:2.10.5.1"
implementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'

pluginLibs group: 'stax', name: 'stax', version: '1.2.0'
pluginLibs group: 'javax.xml.stream', name: 'stax-api', version: '1.0'

pluginLibs (group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '1.11.743') {
pluginLibs (group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: "${awsSdkVersion}") {
exclude group: "org.apache.httpcomponents", module: "httpclient"
exclude group: "com.fasterxml.jackson.core"
exclude group: "com.fasterxml.jackson.dataformat"
}

pluginLibs (group: 'com.amazonaws', name: 'aws-java-sdk-sts', version: '1.11.743') {
pluginLibs (group: 'com.amazonaws', name: 'aws-java-sdk-sts', version: "${awsSdkVersion}") {
exclude group: "org.apache.httpcomponents", module: "httpclient"
exclude group: "com.fasterxml.jackson.core"
exclude group: "com.fasterxml.jackson.dataformat"
}
Expand Down Expand Up @@ -104,3 +109,12 @@ jar {

//set jar task to depend on copyToLib
jar.dependsOn(copyToLib)

publishing {
publications {
maven(MavenPublication) {
artifactId = 'rundeck-ec2-nodes-plugin'
from components.java
}
}
}
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
awsSdkVersion=1.12.770
Loading