Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #3 from oleg-nenashev/jep-200/JENKINS-50483
[JENKINS-50483] - Make the plugin compatible with Jenkins 2.102+ (JEP-200)
  • Loading branch information
oleg-nenashev committed May 8, 2018
2 parents 0d87577 + 4070a74 commit d0d50af
Show file tree
Hide file tree
Showing 6 changed files with 228 additions and 91 deletions.
2 changes: 2 additions & 0 deletions Jenkinsfile
@@ -0,0 +1,2 @@
// Build the plugin using https://github.com/jenkins-infra/pipeline-library
buildPlugin(jenkinsVersions: [null, "2.107.1"])
41 changes: 13 additions & 28 deletions pom.xml
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.29</version><!-- which version of Jenkins is this plugin built against? -->
<version>3.6</version>
</parent>

<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -12,8 +12,13 @@
<packaging>hpi</packaging>

<name>aws-device-farm</name>
<url>https://wiki.jenkins-ci.org/display/JENKINS/AWS+Device+Farm+Plugin</url>
<url>https://wiki.jenkins.io/display/JENKINS/AWS+Device+Farm+Plugin</url>
<description>AWS Device Farm Jenkins Plugin</description>

<properties>
<jenkins.version>1.625.3</jenkins.version>
<java.level>7</java.level>
</properties>

<dependencies>
<dependency>
Expand All @@ -22,16 +27,18 @@
<version>1.20</version>
</dependency>

<!-- TODO: use AWS SDK Plugin instead: https://plugins.jenkins.io/aws-java-sdk -->
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
<version>1.11.126</version>
</dependency>


<!-- TODO: Use Apache HttpComponents Client 4.x API instead: https://plugins.jenkins.io/apache-httpcomponents-client-4-api -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4</version>
<version>4.4.4</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -65,12 +72,10 @@
</developer>
</developers>


<!-- get every artifact through repo.jenkins-ci.org, which proxies all the artifacts that we need -->
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
<repository>
<id>central</id>
Expand All @@ -86,18 +91,10 @@
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

<properties>
<!--
explicitly specifying the latest version here because one we get from the parent POM
tends to lag behind a bit
-->
<maven-hpi-plugin.version>1.96</maven-hpi-plugin.version>
</properties>

<build>
<plugins>
<plugin>
Expand All @@ -107,18 +104,6 @@
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.1</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.9.2</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>

0 comments on commit d0d50af

Please sign in to comment.