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

AWS SDK updated, and plugin incrementalified #17

Merged
merged 2 commits into from
May 24, 2018
Merged

AWS SDK updated, and plugin incrementalified #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbd9789
AWS SDK updated, and plugin incrementalified.
jglick May 15, 2018
01440ec
Have some test results already.
jglick May 16, 2018
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
7 changes: 7 additions & 0 deletions .mvn/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.0-beta-3</version>
</extension>
</extensions>
2 changes: 2 additions & 0 deletions .mvn/maven.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-Pconsume-incrementals
-Pmight-produce-incrementals
Copy link
Member

Choose a reason for hiding this comment

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

I wonder whether it could be managed via essentials.yml instead

Copy link
Member Author

Choose a reason for hiding this comment

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

Not safely, no.

15 changes: 8 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>3.2</version>
<version>3.11</version>
<relativePath />
</parent>
<artifactId>aws-java-sdk</artifactId>
<version>1.11.265-SNAPSHOT</version>
<version>${revision}${changelist}</version>
<packaging>hpi</packaging>

<name>Amazon Web Services SDK</name>
<description>This plugin provides AWS SDK for Java for other plugins.</description>
<url>https://wiki.jenkins-ci.org/display/JENKINS/Amazon+Web+Services+SDK+library</url>
<url>https://wiki.jenkins.io/display/JENKINS/Amazon+Web+Services+SDK+library</url>
<licenses>
<license>
<name>MIT License</name>
<url>http://opensource.org/licenses/MIT</url>
<url>https://opensource.org/licenses/MIT</url>
</license>
</licenses>
<developers>
Expand All @@ -32,11 +32,12 @@
<connection>scm:git:git://github.com/jenkinsci/aws-java-sdk-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/aws-java-sdk-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/aws-java-sdk-plugin</url>
<tag>HEAD</tag>
<tag>${scmTag}</tag>
</scm>
<properties>
<revision>1.11.329</revision>
<changelist>-SNAPSHOT</changelist>
<jenkins.version>1.625.1</jenkins.version>
<maven-hpi-plugin.disabledTestInjection>true</maven-hpi-plugin.disabledTestInjection>
<java.level>7</java.level>
</properties>
<repositories>
Expand All @@ -55,7 +56,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
<version>1.11.264</version>
<version>${revision}</version>
<exclusions>
<exclusion>
<!-- Included in core -->
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/amazonaws/AmazonECRClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package com.amazonaws;

import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.services.ecr.AmazonECR;
import com.amazonaws.services.ecr.AmazonECRClient;
import com.amazonaws.services.ecr.AmazonECRClientBuilder;
import jenkins.model.Jenkins;

/**
Expand All @@ -14,7 +16,9 @@ public class AmazonECRClientFactory {
/**
* @param credentials {@link AWSCredentials} to use.
* @return {@link AmazonECRClient} configured to use the proxy configured on Jenkins.
* @deprecated Rather use {@link AmazonECRClientBuilder} to create a {@link AmazonECR} using a {@link ClientConfiguration} configured with {@link Jenkins#proxy}.
*/
@Deprecated
public AmazonECRClient getAmazonECRClientWithProxy(AWSCredentials credentials) {
ClientConfiguration conf = new ClientConfiguration();
Jenkins j = Jenkins.getInstance();
Expand Down