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

[JENKINS-62489] Support m6g ec2 instances #482

Merged
merged 2 commits into from
Jul 31, 2020
Merged

[JENKINS-62489] Support m6g ec2 instances #482

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43e7eed
bump java-sdk and resolve enforcer issue
schottsfired Jul 21, 2020
45247ee
resolve additional build and test issues
schottsfired Jul 21, 2020
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
16 changes: 11 additions & 5 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.1</version>
<version>4.4</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -83,10 +83,10 @@ THE SOFTWARE.
<properties>
<revision>1.51</revision>
<changelist>-SNAPSHOT</changelist>
<jenkins.version>2.176.4</jenkins.version>
<jenkins.version>2.204.6</jenkins.version>
<java.level>8</java.level>
<jcasc.version>1.36</jcasc.version>
<aws-java-sdk.version>1.11.723</aws-java-sdk.version>
<aws-java-sdk.version>1.11.821</aws-java-sdk.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After a second thought, I realize: this is going to force this plugin to require this release with new additions, which is good.

But this was not strictly necessary for a Jenkins instance to be able to see the new types: one would just have to make sure to update to the latest aws-java-sdk Jenkins plugin (i.e. 1.11.821+) right?

</properties>

<dependencies>
Expand Down Expand Up @@ -164,6 +164,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.4</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -268,11 +269,16 @@ THE SOFTWARE.
</dependency>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.176.x</artifactId>
<version>9</version>
<artifactId>bom-2.204.x</artifactId>
<version>11</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.11.1</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down