Cleaning pom

jenkinsci · Jan 28, 2018 · 38fcc24 · 38fcc24
1 parent bdf9bd0
commit 38fcc24
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ Changelog of Git Changelog Plugin.
 ### No issue
 **Doc**
 
-[8586254e107db8a](https://github.com/jenkinsci/git-changelog-plugin/commit/8586254e107db8a) Tomas Bjerre *2018-01-11 18:06:38*
+[bdf9bd0eb52798c](https://github.com/jenkinsci/git-changelog-plugin/commit/bdf9bd0eb52798c) Tomas Bjerre *2018-01-13 21:09:09*
 
 ## 1.57
 ### No issue

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,3 +1,3 @@
 #!groovy
 
-buildPlugin(jdkVersions: [7, 8])
+buildPlugin()
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
-Git Changelog Jenkins Plugin [![Build Status](https://jenkins.ci.cloudbees.com/job/plugins/job/git-changelog-plugin/badge/icon)](https://jenkins.ci.cloudbees.com/job/plugins/job/git-changelog-plugin/)
-===========================
+# Git Changelog Jenkins Plugin
+
+[![Build Status](https://ci.jenkins.io/job/Plugins/job/git-changelog-plugin/job/master/badge/icon)](https://ci.jenkins.io/job/Plugins/job/git-changelog-plugin)
 
 Jenkins plugin to extract a changelog out of commit messages between two GIT revisions. This changelog can be postprocessed and converted
 to either an human readable git changelog listing all commits, or a JIRA filter URL.

diff --git a/debug.sh b/debug.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-mvnDebug -q hpi:run -Djava.util.logging.config.file=logging.properties
+mvnDebug -q hpi:run -Djava.util.logging.config.file=logging.properties -Djenkins.version=2.89.3
 
diff --git a/pom.xml b/pom.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<groupId>org.jenkins-ci.plugins</groupId>
 		<artifactId>plugin</artifactId>
-		<version>2.23</version>
+		<version>3.2</version>
 	</parent>
 
 	<properties>
 		<jenkins.version>2.1</jenkins.version>
-		<hpi-plugin.version>1.115</hpi-plugin.version>
-		<jenkins-test-harness.version>2.19</jenkins-test-harness.version>
 		<findbugs.failOnError>false</findbugs.failOnError>
+		<java.level>7</java.level>
+		<maven.javadoc.skip>true</maven.javadoc.skip>
 	</properties>
 
 	<groupId>de.wellnerbou.jenkins</groupId>
@@ -35,28 +36,8 @@
 		<!-- All issues for this plugin: https://issues.jenkins-ci.org/issues/?jql=project%20%3D%20JENKINS%20AND%20component%20%3D%20git-changelog-plugin -->
 	</issueManagement>
 
-	<distributionManagement>
-		<repository>
-			<uniqueVersion>false</uniqueVersion>
-			<id>maven.jenkins-ci.org</id>
-			<url>https://repo.jenkins-ci.org/releases/</url>
-		</repository>
-		<snapshotRepository>
-			<id>maven.jenkins-ci.org</id>
-			<url>https://repo.jenkins-ci.org/snapshots/</url>
-		</snapshotRepository>
-	</distributionManagement>
-
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<configuration>
@@ -154,6 +135,33 @@ Changelog of Git Changelog Plugin.
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>se.bjurr.violations</groupId>
+				<artifactId>violations-maven-plugin</artifactId>
+				<version>1.7</version>
+				<configuration>
+					<minSeverity>INFO</minSeverity>
+					<detailLevel>VERBOSE</detailLevel>
+					<maxViolations>99999999</maxViolations>
+					<printViolations>true</printViolations>
+					<violations>
+						<violation>
+							<parser>FINDBUGS</parser>
+							<reporter>Findbugs</reporter>
+							<folder>.</folder>
+							<pattern>.*/findbugsXml.*\.xml$</pattern>
+						</violation>
+					</violations>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>verify</phase>
+						<goals>
+							<goal>violations</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
@@ -221,6 +229,10 @@ Changelog of Git Changelog Plugin.
 					<artifactId>guava</artifactId>
 					<groupId>com.google.guava</groupId>
 				</exclusion>
+				<exclusion>
+					<artifactId>httpclient</artifactId>
+					<groupId>org.apache.httpcomponents</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -232,13 +244,12 @@ Changelog of Git Changelog Plugin.
 					<artifactId>guava</artifactId>
 					<groupId>com.google.guava</groupId>
 				</exclusion>
+				<exclusion>
+					<artifactId>httpclient</artifactId>
+					<groupId>org.apache.httpcomponents</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.jenkins-ci.main</groupId>
-			<artifactId>maven-plugin</artifactId>
-			<version>2.9</version>
-		</dependency>
 		<dependency>
 			<groupId>org.jenkins-ci.plugins</groupId>
 			<artifactId>token-macro</artifactId>
@@ -273,6 +284,12 @@ Changelog of Git Changelog Plugin.
 			<version>2.1.0</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aop</artifactId>
+			<version>4.1.6.RELEASE</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<profiles>

diff --git a/run.sh b/run.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-mvn -q hpi:run -Djava.util.logging.config.file=logging.properties
+mvn -q hpi:run -Djava.util.logging.config.file=logging.properties -Djenkins.version=2.89.3