You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2011/12/14 17:20:24 UTC
svn commit: r1214321 - in /incubator/accumulo/branches/1.4: ./ pom.xml
Author: vines
Date: Wed Dec 14 16:20:23 2011
New Revision: 1214321
URL: http://svn.apache.org/viewvc?rev=1214321&view=rev
Log:
Fixes accumulo-219
Modified:
incubator/accumulo/branches/1.4/ (props changed)
incubator/accumulo/branches/1.4/pom.xml
Propchange: incubator/accumulo/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 16:20:23 2011
@@ -1,4 +1,4 @@
-/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320
/incubator/accumulo/branches/1.3.5rc:1209938
/incubator/accumulo/branches/1.4:1205476
/incubator/accumulo/trunk:1205476,1205570,1208726
Modified: incubator/accumulo/branches/1.4/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/pom.xml?rev=1214321&r1=1214320&r2=1214321&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/pom.xml (original)
+++ incubator/accumulo/branches/1.4/pom.xml Wed Dec 14 16:20:23 2011
@@ -19,6 +19,13 @@
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.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>10</version>
+ </parent>
+
+
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
<packaging>pom</packaging>
@@ -36,16 +43,6 @@
<build>
<resources>
<resource>
- <directory>${basedir}/../../</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>CHANGES</include>
- <include>LICENSE</include>
- <include>DISCLAIMER</include>
- <include>NOTICE</include>
- </includes>
- </resource>
- <resource>
<directory>${basedir}/src/main/resources</directory>
</resource>
</resources>
@@ -125,6 +122,7 @@
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
<manifestEntries>
<Implementation-Build>${buildNumber}</Implementation-Build>
@@ -137,7 +135,7 @@
<include>web/**</include>
<include>randomwalk/**</include>
<include>*.*</include>
- <include>**/META-INF/*</include>
+ <include>**/META-INF/*</include>
</includes>
</configuration>
</plugin>