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.

Sign up for GitHub

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

Jump to bottom

[JENKINS-72007] Support new AWS machine types #904

Merged
merged 17 commits into from
Nov 12, 2023
Merged

[JENKINS-72007] Support new AWS machine types #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
19ecb34
build(deps): bump com.hierynomus:smbj from 0.11.5 to 0.12.2
dependabot[bot] Aug 8, 2023
a88c767
build(deps): bump org.jenkins-ci.plugins:aws-credentials
dependabot[bot] Sep 13, 2023
c4d3585
build(deps-dev): bump org.testcontainers:testcontainers
dependabot[bot] Oct 3, 2023
a7b50da
build(deps): bump org.jenkins-ci.plugins:plugin from 4.73 to 4.74
dependabot[bot] Oct 3, 2023
ffa5e34
build(deps): bump org.jenkins-ci.plugins:jackson2-api
dependabot[bot] Oct 17, 2023
26e5e42
Test with Java 21.
gounthar Oct 17, 2023
807a6b4
build(deps): bump io.jenkins.tools.bom:bom-2.414.x
dependabot[bot] Oct 23, 2023
633078b
Test incremental AWS Java SDK 1.12.573-407.x
MarkEWaite Oct 26, 2023
b06985a
Merge branches 'dependabot/maven/com.hierynomus-smbj-0.12.2', 'depend…
MarkEWaite Oct 26, 2023
634f699
Require Jenkins 2.414.1 or newer
MarkEWaite Oct 26, 2023
228d178
Rely on plugin BOM for aws-credentials version
MarkEWaite Nov 11, 2023
f0c3ef6
Use latest release of aws-java-sdk - 1.12.586-413.x
MarkEWaite Nov 11, 2023
746968f
Use most recent plugin BOM - 2.414.x 2555.x
MarkEWaite Nov 11, 2023
80eb129
Use most recent parent pom 4.75
MarkEWaite Nov 11, 2023
3e110a9
Remove unnecessary joda-time exclusion
MarkEWaite Nov 11, 2023
3b9a9c2
Remove unused commons-compress test exclusion
MarkEWaite Nov 11, 2023
e11a2de
Remove another unused exclusion
MarkEWaite Nov 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
buildPlugin(useContainerAgent: true, configurations: [
[platform: 'linux', jdk: '11'],
[ platform: 'linux', jdk: '17' ],
[platform: 'linux', jdk: '17'],
[ platform: 'linux', jdk: '21' ],
])
38 changes: 7 additions & 31 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.73</version>
<version>4.75</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -77,7 +77,7 @@ THE SOFTWARE.

<properties>
<changelist>999999-SNAPSHOT</changelist>
<jenkins.version>2.414</jenkins.version>
<jenkins.version>2.414.1</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<hpi.compatibleSinceVersion>1626</hpi.compatibleSinceVersion>
</properties>
Expand All @@ -86,7 +86,7 @@ THE SOFTWARE.
<dependency>
<groupId>com.hierynomus</groupId>
<artifactId>smbj</artifactId>
<version>0.11.5</version>
<version>0.12.2</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle</groupId>
Expand All @@ -105,7 +105,6 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>aws-credentials</artifactId>
<version>191.vcb_f183ce58b_9</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -118,18 +117,12 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins.aws-java-sdk</groupId>
<artifactId>aws-java-sdk-ec2</artifactId>
<version>1.12.529-406.vdeff15e5817d</version>
<version>1.12.586-413.v6a_6c3a_420126</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.aws-java-sdk</groupId>
<artifactId>aws-java-sdk-minimal</artifactId>
<version>1.12.529-406.vdeff15e5817d</version>
</dependency>
<!-- Fixes upper bound deps issue with aws sdk plugins -->
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>jackson2-api</artifactId>
<version>2.15.2-350.v0c2f3f8fc595</version>
<version>1.12.586-413.v6a_6c3a_420126</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -191,29 +184,12 @@ THE SOFTWARE.
<groupId>io.jenkins.configuration-as-code</groupId>
<artifactId>test-harness</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.19.0</version>
<version>1.19.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
<!-- Use common-compress from core -->
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.kohsuke</groupId>
Expand All @@ -226,7 +202,7 @@ THE SOFTWARE.
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.414.x</artifactId>
<version>2423.vce598171d115</version>
<version>2555.v3190a_8a_c60c6</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down