Skip to content
Permalink
Browse files

INFRA-588: Fix uploading of JAR files

Bump the version of the parent plugin to avoid failing the uploading
of the plugin when releasing. Also fix the issues highlighted by this
new version.
  • Loading branch information
Peter Jönsson
Peter Jönsson committed Feb 8, 2017
1 parent 44d621e commit d525c3c00c02b7191437de4a4b9f69474ff9c9b2
Showing with 11 additions and 6 deletions.
  1. +2 −0 .gitignore
  2. +4 −4 README.md
  3. +2 −0 client/pom.xml
  4. +2 −1 plugin/src/main/resources/hudson/plugins/swarm/SwarmSlave/configure-entries.jelly
  5. +1 −1 pom.xml
@@ -1,5 +1,7 @@
target/
work*/
release.properties
*.releaseBackup

# IntelliJ project files
*.iml
@@ -1,15 +1,15 @@
swarm-plugin
============

Jenkins Swarm plugin for self organizing slave nodes.
Jenkins Swarm plugin for self organizing slave nodes.

[![Build Status](https://jenkins.ci.cloudbees.com/buildStatus/icon?job=plugins/swarm-plugin)](https://jenkins.ci.cloudbees.com/job/plugins/swarm-plugin)

This plugin enables slaves to auto-discover a nearby Jenkins master and
This plugin enables nodes to auto-discover a nearby Jenkins master and
join it automatically, thereby forming an ad-hoc cluster. Swarm makes it
easier to auto scale a Jenkins cluster by spinning up and tearing down
new slave nodes since no manual intervention is required to make them
join or leave the cluster.
new nodes since no manual intervention required to make them join or leave the
cluster.

More documentation available on the Jenkins wiki:

@@ -15,13 +15,15 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
<executions>
<execution>
<phase>package</phase>
@@ -25,6 +25,7 @@ THE SOFTWARE.
<!--
Config page
-->
<?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">
<f:entry title="${%Description}" help="/help/system-config/master-slave/description.html">
@@ -46,4 +47,4 @@ THE SOFTWARE.
<f:slave-mode name="mode" node="${it}" />

<f:descriptorList title="${%Node Properties}" descriptors="${h.getNodePropertyDescriptors(descriptor.clazz)}" field="nodeProperties" />
</j:jelly>
</j:jelly>
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.480.3</version>
<version>2.11</version>
</parent>

<artifactId>swarm-plugin</artifactId>

0 comments on commit d525c3c

Please sign in to comment.
You can’t perform that action at this time.