Merge branch release/2.5.0 into master

Set compiler source encoding
Add snapshot repository
Exclude immutables from jacoco requirements
Upgrade kemitix-checkstyle-ruleset to 2.1.3
Add spring-data dependency management
Remove redundant reporting plugin
This commit is contained in:
Paul Campbell 2017-02-28 12:16:03 +00:00
commit 5a87124049
2 changed files with 49 additions and 11 deletions

View file

@ -1,6 +1,16 @@
CHANGELOG CHANGELOG
========= =========
2.5.0
------
* Set compiler source encoding
* Add snapshot repository
* Exclude immutables from jacoco requirements
* Upgrade kemitix-checkstyle-ruleset to 2.1.3
* Add spring-data dependency management
* Remove redundant reporting plugin
2.4.0 2.4.0
------ ------

50
pom.xml
View file

@ -5,7 +5,7 @@
<groupId>net.kemitix</groupId> <groupId>net.kemitix</groupId>
<artifactId>kemitix-parent</artifactId> <artifactId>kemitix-parent</artifactId>
<version>2.4.0</version> <version>2.5.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Kemitix Parent</name> <name>Kemitix Parent</name>
@ -41,12 +41,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<kemitix.build.directory>target</kemitix.build.directory> <kemitix.build.directory>target</kemitix.build.directory>
<kemitix-checkstyle-ruleset.version>2.1.2</kemitix-checkstyle-ruleset.version> <kemitix-checkstyle-ruleset.version>2.1.3</kemitix-checkstyle-ruleset.version>
<kemitix-checkstyle-ruleset.level>5-complexity</kemitix-checkstyle-ruleset.level> <kemitix-checkstyle-ruleset.level>5-complexity</kemitix-checkstyle-ruleset.level>
<lombok.version>1.16.12</lombok.version> <lombok.version>1.16.12</lombok.version>
<spring-platform.version>Athens-SR3</spring-platform.version> <spring-platform.version>Athens-SR3</spring-platform.version>
<spring-cloud.version>Camden.SR5</spring-cloud.version> <spring-cloud.version>Camden.SR5</spring-cloud.version>
<spring-data.version>Ingalls-RELEASE</spring-data.version>
<digraph-dependency.version>0.7.0</digraph-dependency.version> <digraph-dependency.version>0.7.0</digraph-dependency.version>
<digraph-dependency.basePackage>(UNSET:basePackage)</digraph-dependency.basePackage> <digraph-dependency.basePackage>(UNSET:basePackage)</digraph-dependency.basePackage>
@ -62,12 +63,12 @@
<huntbugs.version>0.0.11</huntbugs.version> <huntbugs.version>0.0.11</huntbugs.version>
<jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.version> <jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.version>
<highwheel-maven.version>1.2</highwheel-maven.version> <highwheel-maven.version>1.2</highwheel-maven.version>
<maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
<maven-jxr-plugin.version>2.5</maven-jxr-plugin.version> <maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
<jacoco-class-line-covered-ratio>0.50</jacoco-class-line-covered-ratio> <jacoco-class-line-covered-ratio>0.50</jacoco-class-line-covered-ratio>
<jacoco-class-instruction-covered-ratio>0.80</jacoco-class-instruction-covered-ratio> <jacoco-class-instruction-covered-ratio>0.80</jacoco-class-instruction-covered-ratio>
<jacoco-class-missed-count-maximum>0</jacoco-class-missed-count-maximum> <jacoco-class-missed-count-maximum>0</jacoco-class-missed-count-maximum>
<java.version>1.8</java.version>
</properties> </properties>
<developers> <developers>
@ -95,6 +96,13 @@
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-releasetrain</artifactId>
<version>${spring-data.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -171,7 +179,30 @@
</profile><!-- release --> </profile><!-- release -->
</profiles> </profiles>
<repositories>
<repository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
<pluginRepositories> <pluginRepositories>
<pluginRepository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</pluginRepository>
<pluginRepository> <pluginRepository>
<id>sevntu-maven</id> <id>sevntu-maven</id>
<name>sevntu-maven</name> <name>sevntu-maven</name>
@ -189,7 +220,7 @@
<version>${kemitix-checkstyle-ruleset.version}</version> <version>${kemitix-checkstyle-ruleset.version}</version>
<executions> <executions>
<execution> <execution>
<phase>validate</phase> <phase>verify</phase>
<goals> <goals>
<goal>${kemitix-checkstyle-ruleset.level}</goal> <goal>${kemitix-checkstyle-ruleset.level}</goal>
</goals> </goals>
@ -222,8 +253,9 @@
</compilerArgs> </compilerArgs>
<showDeprecation>true</showDeprecation> <showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings> <showWarnings>true</showWarnings>
<source>1.8</source> <source>${java.version}</source>
<target>1.8</target> <target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration> </configuration>
</plugin><!-- maven-compiler-plugin --> </plugin><!-- maven-compiler-plugin -->
@ -323,6 +355,7 @@
<exclude>*Main</exclude> <exclude>*Main</exclude>
<exclude>*Application</exclude> <exclude>*Application</exclude>
<exclude>*Configuration</exclude> <exclude>*Configuration</exclude>
<exclude>*Immutable*</exclude>
</excludes> </excludes>
<limits> <limits>
<limit> <limit>
@ -364,11 +397,6 @@
<reporting> <reporting>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${maven-project-info-reports-plugin.version}</version>
</plugin><!-- maven-project-info-reports-plugin -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId> <artifactId>maven-surefire-report-plugin</artifactId>