You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/06/18 18:53:13 UTC
svn commit: r1494200 - /commons/sandbox/commons-digest-plugin/trunk/pom.xml
Author: sebb
Date: Tue Jun 18 16:53:12 2013
New Revision: 1494200
URL: http://svn.apache.org/r1494200
Log:
Revert to using CP30; followed recipe in commons-build-plugin
Modified:
commons/sandbox/commons-digest-plugin/trunk/pom.xml
Modified: commons/sandbox/commons-digest-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/commons-digest-plugin/trunk/pom.xml?rev=1494200&r1=1494199&r2=1494200&view=diff
==============================================================================
--- commons/sandbox/commons-digest-plugin/trunk/pom.xml (original)
+++ commons/sandbox/commons-digest-plugin/trunk/pom.xml Tue Jun 18 16:53:12 2013
@@ -2,11 +2,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- Cannot easily use CP as that is only suitable for jar packaging -->
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>13</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>30</version>
</parent>
<groupId>org.apache.commons</groupId>
@@ -28,7 +27,11 @@ Apache Commons Digest Maven plugin provi
<mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
<maven.compiler.source>1.5</maven.compiler.source>
<maven.compiler.target>1.5</maven.compiler.target>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <!-- Avoid problems with jar & osgi builds in CP -->
+ <commons.manifestfile />
+ <!-- Temporary fix until CP31 is released -->
+ <maven.compile.source>${maven.compiler.source}</maven.compile.source>
+ <maven.compile.target>${maven.compiler.target}</maven.compile.target>
</properties>
<dependencies>
@@ -71,16 +74,6 @@ Apache Commons Digest Maven plugin provi
<pluginManagement>
<plugins>
- <!-- See bug https://issues.apache.org/jira/browse/MPOM-44 -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>${maven.compiler.source}</source>
- <target>${maven.compiler.target}</target>
- </configuration>
- </plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>${mavenPluginPluginVersion}</version>