Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-49371] - Update Plugin POM and use Jenkins core 1.625.3 as a…
… baseline
  • Loading branch information
oleg-nenashev authored and Jimilian committed Feb 6, 2018
1 parent 32a092a commit ede4500
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 32 deletions.
47 changes: 15 additions & 32 deletions pom.xml
@@ -1,39 +1,23 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.609.3</version>
<version>3.4</version>
</parent>

<artifactId>s3</artifactId>
<packaging>hpi</packaging>
<version>0.11.0-SNAPSHOT</version>
<name>Jenkins S3 publisher plugin</name>
<url>https://wiki.jenkins-ci.org/display/JENKINS/S3+Plugin</url>
<url>https://wiki.jenkins.io/display/JENKINS/S3+Plugin</url>

<distributionManagement>
<repository>
<id>maven.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/releases/</url>
</repository>
<snapshotRepository>
<id>maven.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/snapshots/</url>
</snapshotRepository>
</distributionManagement>
<properties>
<jenkins.version>1.625.3</jenkins.version>
<java.level>7</java.level>
<!-- TODO: remove once FindBugs issues are fixed -->
<findbugs.failOnError>false</findbugs.failOnError>
</properties>

<developers>
<developer>
Expand Down Expand Up @@ -74,12 +58,6 @@
</scm>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
Expand All @@ -89,7 +67,12 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>aws-java-sdk</artifactId>
<version>1.11.37</version>
<version>1.11.264</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>apache-httpcomponents-client-4-api</artifactId>
<version>4.5.3-2.1</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -99,7 +82,7 @@
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>maven-plugin</artifactId>
<version>2.0</version>
<version>3.1</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/hudson/plugins/s3/Entry/config.jelly
@@ -1,3 +1,4 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">

<f:entry title="Source" field="sourceFile">
Expand Down
@@ -1,3 +1,4 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">

<f:entry title="Metadata key" field="key">
Expand Down
@@ -1,3 +1,4 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">

<j:set var="latestDeployedArtifacts" value="${it.latestDeployedArtifacts}"/>
Expand Down
@@ -1,3 +1,4 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">

<j:set var="helpURL" value="/plugin/s3" />
Expand Down
@@ -1,3 +1,4 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<!-- nothing to configure -->
<f:section title="Amazon S3 profiles">
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/index.jelly
@@ -1,6 +1,7 @@
<!--
This view is used to render the plugin list page.
-->
<?jelly escape-by-default='true'?>
<div>
This is a plugin to upload files to Amazon S3 buckets.
</div>

0 comments on commit ede4500

Please sign in to comment.