Skip to content

Commit

Permalink
Merge pull request #1 from PTC-ALM/master
Browse files Browse the repository at this point in the history
Updating from Master
  • Loading branch information
kritisinha1 committed Nov 27, 2015
2 parents 9764847 + ce4dd81 commit 3185476
Show file tree
Hide file tree
Showing 77 changed files with 9,909 additions and 6,371 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ release.txt
executeBuild.js
.idea/
.iml
/.classpath
/work/
18 changes: 13 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<artifactId>integrity-plugin</artifactId>
<name>PTC Integrity CM - Jenkins Plugin</name>
<version>1.36-SNAPSHOT</version>
<version>1.37-SNAPSHOT</version>
<packaging>hpi</packaging>

<url>http://wiki.jenkins-ci.org/display/JENKINS/PTC+Integrity+Plugin</url>
Expand All @@ -26,6 +26,7 @@
<connection>scm:git:ssh://github.com/jenkinsci/integrity-plugin.git</connection>
<developerConnection>scm:git:ssh://git@github.com/jenkinsci/integrity-plugin.git </developerConnection>
<url>https://github.com/jenkinsci/integrity-plugin</url>
<tag>HEAD</tag>
</scm>

<dependencies>
Expand Down Expand Up @@ -64,12 +65,19 @@
<version>4.13.5479</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>2.4.2</version>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
</dependencies>
</dependencyManagement>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down
Loading

0 comments on commit 3185476

Please sign in to comment.