[truecommons-parent: 6/7] Commit new pom file
Gerard Ryan
galileo at fedoraproject.org
Thu Oct 24 18:28:59 UTC 2013
commit 811a7724bdfe5d61e71ac6338d120fa0dcc41b48
Author: Gerard Ryan <gerard at ryan.lt>
Date: Wed Oct 23 22:20:40 2013 +0100
Commit new pom file
oss-parent-21.pom => truecommons-parent-67.pom | 251 ++++++++++++------------
1 files changed, 130 insertions(+), 121 deletions(-)
---
diff --git a/oss-parent-21.pom b/truecommons-parent-67.pom
similarity index 73%
rename from oss-parent-21.pom
rename to truecommons-parent-67.pom
index bf50676..5e0fa88 100644
--- a/oss-parent-21.pom
+++ b/truecommons-parent-67.pom
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- - Copyright (C) 2004-2012 Schlichtherle IT Services. All rights reserved.
+ - Copyright (C) 2012-2013 Schlichtherle IT Services. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
@@ -14,9 +14,10 @@
- See the License for the specific language governing permissions and
- limitations under the License.
-->
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<prerequisites>
<maven>${maven.enforcer.requireMavenVersion}</maven>
@@ -28,13 +29,15 @@
<version>7</version>
</parent>
- <groupId>de.schlichtherle</groupId>
- <artifactId>oss-parent</artifactId>
- <version>21</version>
+ <groupId>net.java.truecommons</groupId>
+ <artifactId>truecommons-parent</artifactId>
+ <version>67</version>
<packaging>pom</packaging>
- <name>OSS Parent</name>
- <description>Parent POM for Open Source Software (OOS) projects.</description>
+ <name>TrueCommons Parent</name>
+ <description>
+ Parent POM for Open Source Software projects hosted on java.net.
+ </description>
<organization>
<name>Schlichtherle IT Services</name>
<url>http://schlichtherle.de</url>
@@ -43,13 +46,21 @@
<developer>
<name>Christian Schlichtherle</name>
<email>christian AT schlichtherle DOT de</email>
- <organization>Schlichtherle IT Services</organization>
+ <organization>Schlichtherle IT Services</organization>
<timezone>1</timezone>
<roles>
<role>owner</role>
</roles>
+ <properties>
+ <picUrl>http://www.gravatar.com/avatar/e2f69ddc944f8891566fc4b18518e4e6.png</picUrl>
+ </properties>
</developer>
</developers>
+ <scm>
+ <connection>scm:hg:https://hg.java.net/hg/truecommons~parent</connection>
+ <developerConnection>scm:hg:ssh://hg.java.net/truecommons~parent</developerConnection>
+ <url>http://java.net/projects/truecommons/sources/parent/show</url>
+ </scm>
<properties>
<!-- maven-enforcer-plugin -->
@@ -57,17 +68,22 @@
<maven.enforcer.requireJavaVersion>${maven.compiler.source}</maven.enforcer.requireJavaVersion> <!-- forward reference -->
<netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
- <scala.version>2.9.2</scala.version>
- <!-- maven-compiler-plugin -->
- <maven.compiler.showWarnings>true</maven.compiler.showWarnings>
+ <scala.lang.version>2.10</scala.lang.version>
+ <scala.version>2.10.3</scala.version>
+
+ <!-- Reinforce defaults of maven-compiler-plugin for NetBeans. -->
+ <maven.compiler.showDeprecation>false</maven.compiler.showDeprecation>
+ <maven.compiler.showWarnings>false</maven.compiler.showWarnings>
+ <maven.compiler.debug>true</maven.compiler.debug>
+ <maven.compiler.optimize>false</maven.compiler.optimize>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- maven-gpg-plugin -->
<gpg.useagent>true</gpg.useagent>
-
+
<!-- maven-javadoc-plugin -->
<!--detectLinks>true</detectLinks-->
<header><b>${project.name} ${project.version}</b></header>
@@ -78,16 +94,10 @@
<javadoc.version>false</javadoc.version>
<!-- maven-release-plugin -->
- <releaseProfiles>integration-test</releaseProfiles>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
<preparationGoals>clean install</preparationGoals>
- <!-- maven-surefire-plugin && maven-failsafe-plugin -->
- <parallel>both</parallel>
-
- <!-- clirr-maven-plugin -->
- <comparisonVersion>1.0</comparisonVersion>
-
- <slf4j.version>1.6.6</slf4j.version>
+ <slf4j.version>1.7.5</slf4j.version>
</properties>
<dependencyManagement>
@@ -95,28 +105,30 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.0.6</version>
+ <version>1.0.13</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.4.1</version>
+ <version>1.5</version>
<exclusions>
<exclusion>
<groupId>org.tukaani</groupId>
@@ -127,7 +139,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2.1</version>
+ <version>4.3.1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -148,7 +160,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.9.0</version>
+ <version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -160,7 +172,12 @@
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
- <version>1.2</version>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-actors</artifactId>
+ <version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
@@ -169,14 +186,14 @@
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
- <artifactId>scalacheck_${scala.version}</artifactId>
- <version>1.9</version>
+ <artifactId>scalacheck_${scala.lang.version}</artifactId>
+ <version>1.10.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
- <artifactId>scalatest_${scala.version}</artifactId>
- <version>1.8</version>
+ <artifactId>scalatest_${scala.lang.version}</artifactId>
+ <version>1.9.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -197,7 +214,7 @@
<dependency>
<groupId>org.tukaani</groupId>
<artifactId>xz</artifactId>
- <version>1.1</version>
+ <version>1.4</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -235,15 +252,15 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</plugin>
<plugin>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.7.1</version>
+ <version>2.9</version>
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.10</version>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
@@ -251,32 +268,42 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.1</version>
<configuration>
- <!-- Required for NetBeans. -->
- <debug>${maven.compiler.debug}</debug>
- <optimize>${maven.compiler.optimize}</optimize>
+ <!-- This is required for NetBeans.
+ Use only properties which are defined in this POM! -->
+ <encoding>${project.build.sourceEncoding}</encoding>
<showDeprecation>${maven.compiler.showDeprecation}</showDeprecation>
<showWarnings>${maven.compiler.showWarnings}</showWarnings>
+ <debug>${maven.compiler.debug}</debug>
+ <optimize>${maven.compiler.optimize}</optimize>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.4</version>
+ <version>2.8</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <version>2.3</version>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.1.1</version>
+ <version>1.3.1</version>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.12</version>
+ <version>2.16</version>
<executions>
<execution>
<id>integration-test</id>
@@ -292,119 +319,78 @@
<version>1.4</version>
</plugin>
<plugin>
+ <artifactId>maven-help-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.5.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.9.1</version>
<configuration>
<version>${javadoc.version}</version>
</configuration>
</plugin>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
+ <version>2.7</version>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.4.1</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</plugin>
<plugin>
<artifactId>maven-scm-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8.1</version>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.7.1</version>
+ <version>2.1</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <reportPlugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <reports>
- <report>aggregate</report>
- <report>javadoc</report>
- </reports>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- <reports>
- <report>aggregate</report>
- <report>jxr</report>
- </reports>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <!--configuration>
- <effort>Max</effort>
- </configuration-->
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- </plugin>
- <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- </plugin-->
- <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin-->
- </reportPlugins>
- </configuration>
+ <version>3.3</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.2.1</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
- <configuration>
- <includes>
- <include>**/*Test.class</include>
- <include>**/*Spec.class</include>
- </includes>
- </configuration>
+ <version>2.16</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
- <version>3.0.2</version>
- <configuration>
- <sendJavaToScalac>false</sendJavaToScalac>
- </configuration>
+ <version>3.1.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -414,7 +400,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -423,10 +409,10 @@
</plugin>
</plugins>
</pluginManagement>
-
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.3.1</version>
<executions>
<execution>
<id>enforce-maven</id>
@@ -452,7 +438,7 @@
<profiles>
<profile>
- <id>non-transitive-main-source-dependencies</id>
+ <id>non-transitive-main-sources-dependencies</id>
<activation>
<file>
<exists>src/main</exists>
@@ -462,12 +448,11 @@
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
- <optional>true</optional>
</dependency>
</dependencies>
</profile>
<profile>
- <id>non-transitive-test-source-dependencies</id>
+ <id>non-transitive-test-sources-dependencies</id>
<activation>
<file>
<exists>src/test</exists>
@@ -475,6 +460,10 @@
</activation>
<dependencies>
<dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -496,6 +485,16 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>scala-compile-first</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>add-source</goal>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -510,11 +509,11 @@
<dependencies>
<dependency>
<groupId>org.scalatest</groupId>
- <artifactId>scalatest_${scala.version}</artifactId>
+ <artifactId>scalatest_${scala.lang.version}</artifactId>
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
- <artifactId>scalacheck_${scala.version}</artifactId>
+ <artifactId>scalacheck_${scala.lang.version}</artifactId>
</dependency>
</dependencies>
<build>
@@ -522,6 +521,16 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>scala-test-compile</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>add-source</goal>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -543,11 +552,11 @@
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.2.1</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.9.1</version>
</plugin>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
@@ -557,4 +566,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
More information about the scm-commits
mailing list