Skip to content
Permalink
Browse files

Merge pull request #3431 from jglick/flatten

[JENKINS-51247] Simplified usage of flatten-maven-plugin
  • Loading branch information
jglick committed May 11, 2018
2 parents 72f4a59 + 833fda4 commit 41c2c49443b442e92e4ec76c001acdc213c4327d
Showing with 3 additions and 4 deletions.
  1. +0 −1 .gitignore
  2. +1 −1 .mvn/extensions.xml
  3. +2 −2 pom.xml
@@ -1,5 +1,4 @@
target
.flattened-pom.xml
work

# IntelliJ project files
@@ -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>
@@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci</groupId>
<artifactId>jenkins</artifactId>
<version>1.44</version>
<version>1.45</version>
<relativePath />
</parent>

@@ -114,7 +114,7 @@ THE SOFTWARE.
<!-- TODO: JENKINS-36716 - Switch to Medium once FindBugs is cleaned up, 430 issues on Mar 10, 2018 -->
<findbugs.effort>Max</findbugs.effort>
<findbugs.threshold>High</findbugs.threshold>
<findbugs.excludeFilterFile>../src/findbugs/findbugs-excludes.xml</findbugs.excludeFilterFile>
<findbugs.excludeFilterFile>${project.basedir}/../src/findbugs/findbugs-excludes.xml</findbugs.excludeFilterFile>
</properties>

<!-- Note that the 'repositories' and 'pluginRepositories' blocks below are actually copy-pasted

0 comments on commit 41c2c49

Please sign in to comment.