Merge pull request #21 from jglick/flatten

[JENKINS-51247] Simplified use of flatten-maven-plugin
jenkinsci · May 11, 2018 · ea314b9 · ea314b9
2 parents 8f3e10a + c63b53f
commit ea314b9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 target
-.flattened-pom.xml
 
 # mvn hpi:run
 work

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.0-beta-2</version>
+    <version>1.0-beta-3</version>
   </extension>
 </extensions>
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>3.9</version>
+    <version>3.10</version>
     <relativePath />
   </parent>
   <groupId>io.jenkins.plugins</groupId>
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>org.jenkins-ci.test</groupId>
       <artifactId>docker-fixtures</artifactId>
-      <version>1.7</version>
+      <version>1.8</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>