You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2012/03/19 17:42:52 UTC
svn commit: r1302535 - in /incubator/accumulo/trunk: core/pom.xml pom.xml
server/pom.xml start/pom.xml trace/pom.xml
Author: bimargulies
Date: Mon Mar 19 16:42:51 2012
New Revision: 1302535
URL: http://svn.apache.org/viewvc?rev=1302535&view=rev
Log:
ACCMULO-470: cleanup of maven-jar-plugin config.
Modified:
incubator/accumulo/trunk/core/pom.xml
incubator/accumulo/trunk/pom.xml
incubator/accumulo/trunk/server/pom.xml
incubator/accumulo/trunk/start/pom.xml
incubator/accumulo/trunk/trace/pom.xml
Modified: incubator/accumulo/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/pom.xml?rev=1302535&r1=1302534&r2=1302535&view=diff
==============================================================================
--- incubator/accumulo/trunk/core/pom.xml (original)
+++ incubator/accumulo/trunk/core/pom.xml Mon Mar 19 16:42:51 2012
@@ -29,6 +29,16 @@
<name>accumulo-core</name>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <outputDirectory>../lib</outputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: incubator/accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/pom.xml?rev=1302535&r1=1302534&r2=1302535&view=diff
==============================================================================
--- incubator/accumulo/trunk/pom.xml (original)
+++ incubator/accumulo/trunk/pom.xml Mon Mar 19 16:42:51 2012
@@ -132,31 +132,6 @@
</executions>
</plugin>
<plugin>
- <!-- set inherited=false? -->
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <outputDirectory>../lib</outputDirectory>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>${buildNumber}</Implementation-Build>
- <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
- </manifestEntries>
- </archive>
- <includes>
- <include>cloudtrace/**</include>
- <include>org/apache/accumulo**/**</include>
- <include>web/**</include>
- <include>randomwalk/**</include>
- <include>*.*</include>
- <include>**/META-INF/*</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
@@ -222,6 +197,21 @@
<pluginManagement>
<plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-Build>${buildNumber}</Implementation-Build>
+ <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
Modified: incubator/accumulo/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/server/pom.xml?rev=1302535&r1=1302534&r2=1302535&view=diff
==============================================================================
--- incubator/accumulo/trunk/server/pom.xml (original)
+++ incubator/accumulo/trunk/server/pom.xml Mon Mar 19 16:42:51 2012
@@ -29,11 +29,12 @@
<name>accumulo-server</name>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <outputDirectory>../lib</outputDirectory>
<archive>
<manifestSections>
<manifestSection>
@@ -44,12 +45,11 @@
</manifestSection>
</manifestSections>
</archive>
- </configuration>
- </plugin>
- </plugins>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
-
-
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: incubator/accumulo/trunk/start/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/start/pom.xml?rev=1302535&r1=1302534&r2=1302535&view=diff
==============================================================================
--- incubator/accumulo/trunk/start/pom.xml (original)
+++ incubator/accumulo/trunk/start/pom.xml Mon Mar 19 16:42:51 2012
@@ -29,11 +29,12 @@
<name>accumulo-start</name>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <outputDirectory>../lib</outputDirectory>
<archive>
<manifestSections>
<manifestSection>
@@ -44,9 +45,10 @@
</manifestSection>
</manifestSections>
</archive>
- </configuration>
- </plugin>
- </plugins>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
Modified: incubator/accumulo/trunk/trace/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/trace/pom.xml?rev=1302535&r1=1302534&r2=1302535&view=diff
==============================================================================
--- incubator/accumulo/trunk/trace/pom.xml (original)
+++ incubator/accumulo/trunk/trace/pom.xml Mon Mar 19 16:42:51 2012
@@ -27,6 +27,18 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>cloudtrace</artifactId>
<name>cloudtrace</name>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <outputDirectory>../lib</outputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<dependencies>
<dependency>