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/11/28 18:01:50 UTC
svn commit: r1207448 - in /incubator/accumulo/trunk: pom.xml
src/assemble/dist.xml src/assemble/pom.xml
Author: vines
Date: Mon Nov 28 17:01:45 2011
New Revision: 1207448
URL: http://svn.apache.org/viewvc?rev=1207448&view=rev
Log:
fixes accumulo-177 - Took a good hard look at dist.xml and I think we're good now. Also included the parent apache version 10 for module versions.
Modified:
incubator/accumulo/trunk/pom.xml
incubator/accumulo/trunk/src/assemble/dist.xml
incubator/accumulo/trunk/src/assemble/pom.xml
Modified: incubator/accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/pom.xml?rev=1207448&r1=1207447&r2=1207448&view=diff
==============================================================================
--- incubator/accumulo/trunk/pom.xml (original)
+++ incubator/accumulo/trunk/pom.xml Mon Nov 28 17:01:45 2011
@@ -14,6 +14,11 @@
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>
@@ -35,7 +40,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0</version>
<executions>
<execution>
<id>enforce-mvn</id>
@@ -54,7 +58,6 @@
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
<configuration>
<filesets>
<fileset>
@@ -84,6 +87,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
+ <version>2.3</version>
<executions>
<execution>
<id>copy-dependencies</id>
@@ -103,7 +107,6 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.2</version>
<configuration>
<outputDirectory>../../lib</outputDirectory>
<archive>
@@ -126,14 +129,12 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.4</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -143,7 +144,6 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
<configuration>
<encoding>UTF-8</encoding>
<quiet>true</quiet>
@@ -155,14 +155,12 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
<configuration>
<outputDirectory>../../lib</outputDirectory>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.10</version>
<configuration>
<environmentVariables>
<ACCUMULO_HOME>../..</ACCUMULO_HOME>
@@ -203,6 +201,19 @@
<ignore></ignore>
</action>
</pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId>
@@ -345,11 +356,16 @@
<artifactId>accumulo-core</artifactId>
<version>1.5.0-incubating-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-server</artifactId>
- <version>1.5.0-incubating-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server</artifactId>
+ <version>1.5.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-examples</artifactId>
+ <version>1.5.0-incubating-SNAPSHOT</version>
+ </dependency>
<!-- additional dependencies we need to provide -->
<dependency>
Modified: incubator/accumulo/trunk/src/assemble/dist.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/assemble/dist.xml?rev=1207448&r1=1207447&r2=1207448&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/assemble/dist.xml (original)
+++ incubator/accumulo/trunk/src/assemble/dist.xml Mon Nov 28 17:01:45 2011
@@ -24,46 +24,54 @@
<fileSet>
<directory>../../logs</directory>
<directoryMode>0700</directoryMode>
+ <excludes>
+ <exclude>*</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>../../walogs</directory>
<directoryMode>0700</directoryMode>
+ <excludes>
+ <exclude>*</exclude>
+ </excludes>
</fileSet>
+ <fileSet>
+ <directory>../../</directory>
+ <includes>
+ <include>*</include>
+ <include>**/*.py</include>
+ <include>**/*.pl</include>
+ <include>**/*.sh</include>
+ </includes>
+ <excludes>
+ <exclude>**/target</exclude>
+ <exclude>**/accumulo-env.sh</exclude>
+ <exclude>**/continuous-env.sh</exclude>
+ <exclude>**bin/**</exclude>
+ <exclude>**logs/**</exclude>
+ <exclude>**walogs/**</exclude>
+ <exclude>**.*</exclude>
+ </excludes>
+ </fileSet>
<fileSet>
<directory>../../</directory>
- <includes>
- <include>**/*.py</include>
- <include>**/*.pl</include>
- <include>**/*.sh</include>
- </includes>
- <excludes>
- <exclude>**/target*/**</exclude>
- <exclude>**/accumulo-env.sh</exclude>
- <exclude>**/continuous-env.sh</exclude>
- <exclude>../../bin/**</exclude>
- <exclude>../../logs/**</exclude>
- <exclude>../../walogs/**</exclude>
- </excludes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <useDefaultExcludes>true</useDefaultExcludes>
- <directory>../../</directory>
<excludes>
<!-- the following ignored because they were included above -->
- <exclude>**/bin/**</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>**/*.py</exclude>
- <exclude>**/*.pl</exclude>
+ <exclude>*</exclude>
+ <exclude>**/*.py</exclude>
+ <exclude>**/*.pl</exclude>
+ <exclude>**/*.sh</exclude>
+ <exclude>walogs</exclude>
+ <exclude>logs</exclude>
+ <exclude>bin</exclude>
- <!-- the following directories ignored because they should not be in
- the tarball -->
+ <!-- the following directories ignored because they should not be in the tarball -->
<exclude>**/.*/**</exclude>
- <exclude>**/logs/**</exclude>
- <exclude>**/walogs/**</exclude>
- <exclude>**/target*/**</exclude>
+ <exclude>**/target</exclude>
<!-- the following files ignored because they should not be in the tarball -->
+ <exclude>**/accumulo-env.sh</exclude>
+ <exclude>**/continuous-env.sh</exclude>
<exclude>**/.*</exclude>
<exclude>**/accumulo-site.xml</exclude>
<exclude>**/accumulo-env.sh</exclude>
Modified: incubator/accumulo/trunk/src/assemble/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/assemble/pom.xml?rev=1207448&r1=1207447&r2=1207448&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/assemble/pom.xml (original)
+++ incubator/accumulo/trunk/src/assemble/pom.xml Mon Nov 28 17:01:45 2011
@@ -34,27 +34,22 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
- <version>1.5.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server</artifactId>
- <version>1.5.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
- <version>1.5.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples</artifactId>
- <version>1.5.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>cloudtrace</artifactId>
- <version>1.5.0-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -121,7 +116,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
- <version>2.1-alpha-1</version>
<inherited>false</inherited>
<executions>
<execution>