Skip to content

Commit

Permalink
Merge pull request #59 from mavlyutov/master
Browse files Browse the repository at this point in the history 
added few options to openstack provider
  • Loading branch information
@mavlyutov
mavlyutov committed Feb 5, 2014
2 parents 926679d + 9ee4a37 commit 0e16442
Show file tree
Hide file tree
Showing 16 changed files with 766 additions and 804 deletions.
203 changes: 110 additions & 93 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<artifactId>plugin</artifactId>
<version>1.457</version>
</parent>

<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>jclouds-jenkins</artifactId>
<version>2.5-SNAPSHOT</version>
Expand Down Expand Up @@ -37,7 +36,6 @@
<hpi.plugin.version>1.84</hpi.plugin.version>
<jsr305.version>1.3.9</jsr305.version>
</properties>

<developers>
<developer>
<id>sdirector</id>
Expand All @@ -56,51 +54,48 @@
<url>http://vijaykiran.com</url>
</developer>
<developer>
<id>abayer</id>
<name>Andrew Bayer</name>
<email>andrew.bayer@gmail.com</email>
<timezone>-8</timezone>
<id>abayer</id>
<name>Andrew Bayer</name>
<email>andrew.bayer@gmail.com</email>
<timezone>-8</timezone>
</developer>
<developer>
<id>mavlyutov</id>
<name>Marat Mavlyutov</name>
<email>m.mavlyutov@gmail.com</email>
<timezone>+3</timezone>
<id>mavlyutov</id>
<name>Marat Mavlyutov</name>
<email>m.mavlyutov@gmail.com</email>
<timezone>+3</timezone>
</developer>

</developers>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-core</artifactId>
<version>1.457</version>
<exclusions>
<exclusion>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guava</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-core</artifactId>
<version>1.457</version>
<exclusions>
<exclusion>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guava</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler</artifactId>
<version>${stapler.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -159,7 +154,6 @@
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>org.apache.jclouds</groupId>
Expand Down Expand Up @@ -189,67 +183,94 @@
<scope>test</scope>
</dependency>
</dependencies>


<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<version>${hpi.plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler</artifactId>
<version>${stapler.version}</version>
</dependency>
</dependencies>
<configuration>
<archive>
<manifestEntries>
<Mask-Classes>com.google.common</Mask-Classes>
</manifestEntries>
</archive>
<maskClasses>com.google.common</maskClasses>
</configuration>

</plugin>
</plugins>
</pluginManagement>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<version>${hpi.plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler</artifactId>
<version>${stapler.version}</version>
</dependency>
</dependencies>
<configuration>
<archive>
<manifestEntries>
<Mask-Classes>com.google.common</Mask-Classes>
</manifestEntries>
</archive>
<maskClasses>com.google.common</maskClasses>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<executions>
<execution>
<id>default-testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</execution>
<execution>
<id>default-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</execution>
</executions>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<version>${hpi.plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler</artifactId>
<version>${stapler.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler</artifactId>
<version>${stapler.version}</version>
</dependency>
</dependencies>
<configuration>
<archive>
<manifestEntries>
<Mask-Classes>com.google.common</Mask-Classes>
</manifestEntries>
</archive>
<maskClasses>com.google.common</maskClasses>
<archive>
<manifestEntries>
<Mask-Classes>com.google.common</Mask-Classes>
</manifestEntries>
</archive>
<maskClasses>com.google.common</maskClasses>
</configuration>


</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -262,27 +283,23 @@
</plugin>
</plugins>
</build>

<scm>
<connection>scm:git:git://github.com/jenkinsci/jclouds-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/jclouds-plugin.git</developerConnection>
<url>http://github.com/jenkinsci/jclouds-plugin</url>
<connection>scm:git:git://github.com/jenkinsci/jclouds-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/jclouds-plugin.git</developerConnection>
<url>http://github.com/jenkinsci/jclouds-plugin</url>
</scm>

<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

<profiles>
<profile>
<id>live</id>
Expand Down Expand Up @@ -330,4 +347,4 @@
</build>
</profile>
</profiles>
</project>
</project>
3 changes: 1 addition & 2 deletions src/main/java/jenkins/plugins/jclouds/compute/JCloudsCleanupThread.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,11 @@ public void run() {
logger.log(Level.INFO, "Deleting pending node " + c.getName());
try {
((JCloudsComputer) c).deleteSlave();
} catch (IOException e) {
} catch (IOException | InterruptedException e) {
logger.log(Level.WARNING, "Failed to disconnect and delete " + c.getName() + ": " + e.getMessage());
}
}
});

deletedNodesBuilder.add(f);
}
}
Expand Down

0 comments on commit 0e16442

Please sign in to comment.