ACCUMULO-4312 Update parent POM to ASF-18 * Update build to use apache-18 parent pom * Standardize release profiles across branches (update build.sh for testing them) * Fix new warnings with maven-assembly-plugin:2.6 about absolute paths * Fix warning about annotations from sisu-inject-bean * Move PluginIT to prevent jar sealing warning when testing with the release profiles activated * Update pom with https instead of http links * Format description field in pom.xml (line-wrapping for readability) * Update links to mailing list archives * Remove site build distribution elements (wagon-ssh extension, site distribution mgmt section) * Update powermock version (testing only) * Add entry for versions-maven-plugin to manually check for updated plugin or dependency versions * add missing groupIds for some plugins * Update plugin versions for plugins not in parent pom * Remove reporting section (can be re-added if we decide to publish a maven site) * Update m2e configuration to cover all versions of ignored plugin execution tasks in Eclipse * Add missing execution id for plugins
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fd2c88ba Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fd2c88ba Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fd2c88ba Branch: refs/heads/1.8 Commit: fd2c88baaa7e4f1ec4209882d292da208d108ca9 Parents: dbb2840 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed May 25 17:01:20 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu May 26 21:28:00 2016 -0400 ---------------------------------------------------------------------- assemble/build.sh | 8 +- assemble/pom.xml | 6 +- assemble/src/main/assemblies/component.xml | 16 +- maven-plugin/pom.xml | 11 + .../org/apache/accumulo/plugin/PluginIT.java | 136 ------- .../org/apache/accumulo/plugin/it/PluginIT.java | 137 +++++++ pom.xml | 369 +++++-------------- server/native/pom.xml | 1 - start/pom.xml | 4 - 9 files changed, 248 insertions(+), 440 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd2c88ba/assemble/build.sh ---------------------------------------------------------------------- diff --git a/assemble/build.sh b/assemble/build.sh index 451422a..9bc0beb 100755 --- a/assemble/build.sh +++ b/assemble/build.sh @@ -274,18 +274,14 @@ createReleaseCandidate() { if [[ $1 == '--create-release-candidate' ]]; then shift createReleaseCandidate "$@" -elif [[ $1 == '--seal-jars' ]]; then - cacheGPG - # build a tag, but with sealed jars - runOrFail mvn clean install -P apache-release,seal-jars,thrift,assemble,docs elif [[ $1 == '--test' ]]; then cacheGPG # build a tag, but with tests - runOrFail mvn clean install -P apache-release,thrift,assemble,docs + runOrFail mvn clean install -P apache-release,thrift,assemble,docs,accumulo-release elif [[ $1 == '--create-email' ]]; then shift createEmail "$@" else - fail "Missing one of: $(red --create-release-candidate), $(red --test), $(red --seal-jars), $(red --create-email)" + fail "Missing one of: $(red --create-release-candidate), $(red --test), $(red --create-email)" fi http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd2c88ba/assemble/pom.xml ---------------------------------------------------------------------- diff --git a/assemble/pom.xml b/assemble/pom.xml index ee2b8f3..7f41b4f 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -200,7 +200,7 @@ </build> <profiles> <profile> - <id>apache-release</id> + <id>accumulo-release</id> <build> <plugins> <plugin> @@ -215,7 +215,7 @@ <configuration> <artifacts> <artifact> - <file>${project.parent.build.directory}/${project.artifactId}-${project.version}-src.tar.gz</file> + <file>${project.parent.build.directory}/${project.artifactId}-${project.version}-source-release.tar.gz</file> <type>tar.gz</type> <classifier>src</classifier> </artifact> @@ -242,8 +242,6 @@ </goals> <phase>package</phase> <configuration> - <attach>true</attach> - <finalName>${project.artifactId}-${project.version}</finalName> <descriptors> <descriptor>src/main/assemblies/binary-release.xml</descriptor> </descriptors> http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd2c88ba/assemble/src/main/assemblies/component.xml ---------------------------------------------------------------------- diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml index 96e1fbe..525e635 100644 --- a/assemble/src/main/assemblies/component.xml +++ b/assemble/src/main/assemblies/component.xml @@ -69,7 +69,7 @@ </fileSet> <fileSet> <directory>../examples/simple</directory> - <outputDirectory>/examples/simple</outputDirectory> + <outputDirectory>examples/simple</outputDirectory> <directoryMode>0755</directoryMode> <fileMode>0644</fileMode> <includes> @@ -78,7 +78,7 @@ </fileSet> <fileSet> <directory>./</directory> - <outputDirectory>/lib/ext</outputDirectory> + <outputDirectory>lib/ext</outputDirectory> <directoryMode>0755</directoryMode> <excludes> <exclude>*/**</exclude> @@ -86,7 +86,7 @@ </fileSet> <fileSet> <directory>./</directory> - <outputDirectory>/logs</outputDirectory> + <outputDirectory>logs</outputDirectory> <directoryMode>0700</directoryMode> <excludes> <exclude>*/**</exclude> @@ -94,7 +94,7 @@ </fileSet> <fileSet> <directory>../docs/src/main/resources</directory> - <outputDirectory>/docs</outputDirectory> + <outputDirectory>docs</outputDirectory> <directoryMode>0755</directoryMode> <fileMode>0644</fileMode> <includes> @@ -105,7 +105,7 @@ </fileSet> <fileSet> <directory>../docs/target</directory> - <outputDirectory>/docs</outputDirectory> + <outputDirectory>docs</outputDirectory> <directoryMode>0755</directoryMode> <fileMode>0644</fileMode> <includes> @@ -131,7 +131,7 @@ <fileSet> <!-- preserve old behavior of extra copy in conf --> <directory>conf/templates</directory> - <outputDirectory>/conf</outputDirectory> + <outputDirectory>conf</outputDirectory> <directoryMode>0755</directoryMode> <fileMode>0644</fileMode> <includes> @@ -140,7 +140,7 @@ </fileSet> <fileSet> <directory>target/example-configs</directory> - <outputDirectory>/conf/examples</outputDirectory> + <outputDirectory>conf/examples</outputDirectory> <directoryMode>0755</directoryMode> <fileMode>0755</fileMode> <includes> @@ -149,7 +149,7 @@ </fileSet> <fileSet> <directory>target/example-configs</directory> - <outputDirectory>/conf/examples</outputDirectory> + <outputDirectory>conf/examples</outputDirectory> <directoryMode>0755</directoryMode> <fileMode>0644</fileMode> <excludes> http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd2c88ba/maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 02dd157..ee92b40 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -46,6 +46,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> + <exclusions> + <exclusion> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-inject-bean</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -59,6 +65,11 @@ <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd2c88ba/maven-plugin/src/it/plugin-test/src/test/java/org/apache/accumulo/plugin/PluginIT.java ---------------------------------------------------------------------- diff --git a/maven-plugin/src/it/plugin-test/src/test/java/org/apache/accumulo/plugin/PluginIT.java b/maven-plugin/src/it/plugin-test/src/test/java/org/apache/accumulo/plugin/PluginIT.java deleted file mode 100644 index 6d3267a..0000000 --- a/maven-plugin/src/it/plugin-test/src/test/java/org/apache/accumulo/plugin/PluginIT.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.accumulo.plugin; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.util.Map.Entry; - -import org.apache.accumulo.core.client.AccumuloException; -import org.apache.accumulo.core.client.AccumuloSecurityException; -import org.apache.accumulo.core.client.BatchWriter; -import org.apache.accumulo.core.client.BatchWriterConfig; -import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.Instance; -import org.apache.accumulo.core.client.IteratorSetting; -import org.apache.accumulo.core.client.Scanner; -import org.apache.accumulo.core.client.TableExistsException; -import org.apache.accumulo.core.client.TableNotFoundException; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; -import org.apache.accumulo.core.data.Key; -import org.apache.accumulo.core.data.Mutation; -import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.minicluster.MiniAccumuloInstance; -import org.junit.BeforeClass; -import org.junit.Test; - -public class PluginIT { - - private static Instance instance; - private static Connector connector; - - @BeforeClass - public static void setUp() throws Exception { - String instanceName = "plugin-it-instance"; - instance = new MiniAccumuloInstance(instanceName, new File("target/accumulo-maven-plugin/" + instanceName)); - connector = instance.getConnector("root", new PasswordToken("ITSecret")); - } - - @Test - public void testInstanceConnection() { - assertTrue(instance != null); - assertTrue(instance instanceof MiniAccumuloInstance); - assertTrue(connector != null); - assertTrue(connector instanceof Connector); - } - - @Test - public void testCreateTable() throws AccumuloException, AccumuloSecurityException, TableExistsException, IOException { - String tableName = "testCreateTable"; - connector.tableOperations().create(tableName); - assertTrue(connector.tableOperations().exists(tableName)); - assertTrue(new File("target/accumulo-maven-plugin/" + instance.getInstanceName() + "/testCreateTablePassed").createNewFile()); - } - - @Test - public void writeToTable() throws AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException, IOException { - String tableName = "writeToTable"; - connector.tableOperations().create(tableName); - BatchWriter bw = connector.createBatchWriter(tableName, new BatchWriterConfig()); - Mutation m = new Mutation("ROW"); - m.put("CF", "CQ", "V"); - bw.addMutation(m); - bw.close(); - Scanner scanner = connector.createScanner(tableName, Authorizations.EMPTY); - int count = 0; - for (Entry<Key,Value> entry : scanner) { - count++; - assertEquals("ROW", entry.getKey().getRow().toString()); - assertEquals("CF", entry.getKey().getColumnFamily().toString()); - assertEquals("CQ", entry.getKey().getColumnQualifier().toString()); - assertEquals("V", entry.getValue().toString()); - } - assertEquals(1, count); - assertTrue(new File("target/accumulo-maven-plugin/" + instance.getInstanceName() + "/testWriteToTablePassed").createNewFile()); - } - - @Test - public void checkIterator() throws IOException, AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException { - String tableName = "checkIterator"; - connector.tableOperations().create(tableName); - BatchWriter bw = connector.createBatchWriter(tableName, new BatchWriterConfig()); - Mutation m = new Mutation("ROW1"); - m.put("allowed", "CQ1", "V1"); - m.put("denied", "CQ2", "V2"); - m.put("allowed", "CQ3", "V3"); - bw.addMutation(m); - m = new Mutation("ROW2"); - m.put("allowed", "CQ1", "V1"); - m.put("denied", "CQ2", "V2"); - m.put("allowed", "CQ3", "V3"); - bw.addMutation(m); - bw.close(); - - // check filter - Scanner scanner = connector.createScanner(tableName, Authorizations.EMPTY); - IteratorSetting is = new IteratorSetting(5, CustomFilter.class); - scanner.addScanIterator(is); - int count = 0; - for (Entry<Key,Value> entry : scanner) { - count++; - assertEquals("allowed", entry.getKey().getColumnFamily().toString()); - } - assertEquals(4, count); - - // check filter negated - scanner.clearScanIterators(); - CustomFilter.setNegate(is, true); - scanner.addScanIterator(is); - count = 0; - for (Entry<Key,Value> entry : scanner) { - count++; - assertEquals("denied", entry.getKey().getColumnFamily().toString()); - } - assertEquals(2, count); - assertTrue(new File("target/accumulo-maven-plugin/" + instance.getInstanceName() + "/testCheckIteratorPassed").createNewFile()); - } - -} http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd2c88ba/maven-plugin/src/it/plugin-test/src/test/java/org/apache/accumulo/plugin/it/PluginIT.java ---------------------------------------------------------------------- diff --git a/maven-plugin/src/it/plugin-test/src/test/java/org/apache/accumulo/plugin/it/PluginIT.java b/maven-plugin/src/it/plugin-test/src/test/java/org/apache/accumulo/plugin/it/PluginIT.java new file mode 100644 index 0000000..e9518bf --- /dev/null +++ b/maven-plugin/src/it/plugin-test/src/test/java/org/apache/accumulo/plugin/it/PluginIT.java @@ -0,0 +1,137 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.accumulo.plugin.it; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; +import java.util.Map.Entry; + +import org.apache.accumulo.core.client.AccumuloException; +import org.apache.accumulo.core.client.AccumuloSecurityException; +import org.apache.accumulo.core.client.BatchWriter; +import org.apache.accumulo.core.client.BatchWriterConfig; +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.Instance; +import org.apache.accumulo.core.client.IteratorSetting; +import org.apache.accumulo.core.client.Scanner; +import org.apache.accumulo.core.client.TableExistsException; +import org.apache.accumulo.core.client.TableNotFoundException; +import org.apache.accumulo.core.client.security.tokens.PasswordToken; +import org.apache.accumulo.core.data.Key; +import org.apache.accumulo.core.data.Mutation; +import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.security.Authorizations; +import org.apache.accumulo.minicluster.MiniAccumuloInstance; +import org.apache.accumulo.plugin.CustomFilter; +import org.junit.BeforeClass; +import org.junit.Test; + +public class PluginIT { + + private static Instance instance; + private static Connector connector; + + @BeforeClass + public static void setUp() throws Exception { + String instanceName = "plugin-it-instance"; + instance = new MiniAccumuloInstance(instanceName, new File("target/accumulo-maven-plugin/" + instanceName)); + connector = instance.getConnector("root", new PasswordToken("ITSecret")); + } + + @Test + public void testInstanceConnection() { + assertTrue(instance != null); + assertTrue(instance instanceof MiniAccumuloInstance); + assertTrue(connector != null); + assertTrue(connector instanceof Connector); + } + + @Test + public void testCreateTable() throws AccumuloException, AccumuloSecurityException, TableExistsException, IOException { + String tableName = "testCreateTable"; + connector.tableOperations().create(tableName); + assertTrue(connector.tableOperations().exists(tableName)); + assertTrue(new File("target/accumulo-maven-plugin/" + instance.getInstanceName() + "/testCreateTablePassed").createNewFile()); + } + + @Test + public void writeToTable() throws AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException, IOException { + String tableName = "writeToTable"; + connector.tableOperations().create(tableName); + BatchWriter bw = connector.createBatchWriter(tableName, new BatchWriterConfig()); + Mutation m = new Mutation("ROW"); + m.put("CF", "CQ", "V"); + bw.addMutation(m); + bw.close(); + Scanner scanner = connector.createScanner(tableName, Authorizations.EMPTY); + int count = 0; + for (Entry<Key,Value> entry : scanner) { + count++; + assertEquals("ROW", entry.getKey().getRow().toString()); + assertEquals("CF", entry.getKey().getColumnFamily().toString()); + assertEquals("CQ", entry.getKey().getColumnQualifier().toString()); + assertEquals("V", entry.getValue().toString()); + } + assertEquals(1, count); + assertTrue(new File("target/accumulo-maven-plugin/" + instance.getInstanceName() + "/testWriteToTablePassed").createNewFile()); + } + + @Test + public void checkIterator() throws IOException, AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException { + String tableName = "checkIterator"; + connector.tableOperations().create(tableName); + BatchWriter bw = connector.createBatchWriter(tableName, new BatchWriterConfig()); + Mutation m = new Mutation("ROW1"); + m.put("allowed", "CQ1", "V1"); + m.put("denied", "CQ2", "V2"); + m.put("allowed", "CQ3", "V3"); + bw.addMutation(m); + m = new Mutation("ROW2"); + m.put("allowed", "CQ1", "V1"); + m.put("denied", "CQ2", "V2"); + m.put("allowed", "CQ3", "V3"); + bw.addMutation(m); + bw.close(); + + // check filter + Scanner scanner = connector.createScanner(tableName, Authorizations.EMPTY); + IteratorSetting is = new IteratorSetting(5, CustomFilter.class); + scanner.addScanIterator(is); + int count = 0; + for (Entry<Key,Value> entry : scanner) { + count++; + assertEquals("allowed", entry.getKey().getColumnFamily().toString()); + } + assertEquals(4, count); + + // check filter negated + scanner.clearScanIterators(); + CustomFilter.setNegate(is, true); + scanner.addScanIterator(is); + count = 0; + for (Entry<Key,Value> entry : scanner) { + count++; + assertEquals("denied", entry.getKey().getColumnFamily().toString()); + } + assertEquals(2, count); + assertTrue(new File("target/accumulo-maven-plugin/" + instance.getInstanceName() + "/testCheckIteratorPassed").createNewFile()); + } + +} http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd2c88ba/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d4b3867..c1494d7 100644 --- a/pom.xml +++ b/pom.xml @@ -20,26 +20,32 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>14</version> + <version>18</version> </parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> <version>1.6.6-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Accumulo Project</name> - <description>Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process.</description> - <!-- this URL is where the site derived via the maven-site-plugin ends up, not the generic site --> - <url>http://accumulo.apache.org/maven-site/</url> + <description>Apache Accumulo is a sorted, distributed key/value store based + on Google's BigTable design. It is built on top of Apache Hadoop, + Zookeeper, and Thrift. It features a few novel improvements on the BigTable + design in the form of cell-level access labels and a server-side + programming mechanism that can modify key/value pairs at various points in + the data management process.</description> + <!-- this URL is where the site derived via the maven-site-plugin ends up, + not the generic site; currently not used --> + <url>https://accumulo.apache.org</url> <!-- this is the year of inception at ASF --> <inceptionYear>2011</inceptionYear> <organization> <name>The Apache Software Foundation</name> - <url>http://www.apache.org/</url> + <url>https://www.apache.org</url> </organization> <licenses> <license> <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> + <url>https://www.apache.org/licenses/LICENSE-2.0</url> </license> </licenses> <mailingLists> @@ -48,26 +54,26 @@ <subscribe>user-subscr...@accumulo.apache.org</subscribe> <unsubscribe>user-unsubscr...@accumulo.apache.org</unsubscribe> <post>u...@accumulo.apache.org</post> - <archive>http://mail-archives.apache.org/mod_mbox/accumulo-user</archive> + <archive>https://lists.apache.org/list.html?u...@accumulo.apache.org</archive> </mailingList> <mailingList> <name>Dev</name> <subscribe>dev-subscr...@accumulo.apache.org</subscribe> <unsubscribe>dev-unsubscr...@accumulo.apache.org</unsubscribe> <post>d...@accumulo.apache.org</post> - <archive>http://mail-archives.apache.org/mod_mbox/accumulo-dev</archive> + <archive>https://lists.apache.org/list.html?d...@accumulo.apache.org</archive> </mailingList> <mailingList> <name>Commits</name> <subscribe>commits-subscr...@accumulo.apache.org</subscribe> <unsubscribe>commits-unsubscr...@accumulo.apache.org</unsubscribe> - <archive>http://mail-archives.apache.org/mod_mbox/accumulo-commits</archive> + <archive>https://lists.apache.org/list.html?commits@accumulo.apache.org</archive> </mailingList> <mailingList> <name>Notifications</name> <subscribe>notifications-subscr...@accumulo.apache.org</subscribe> <unsubscribe>notifications-unsubscr...@accumulo.apache.org</unsubscribe> - <archive>http://mail-archives.apache.org/mod_mbox/accumulo-notifications</archive> + <archive>https://lists.apache.org/list.html?notificati...@accumulo.apache.org</archive> </mailingList> </mailingLists> <prerequisites> @@ -107,17 +113,10 @@ <system>Apache Jenkins</system> <url>https://builds.apache.org/view/A-D/view/Accumulo/</url> </ciManagement> - <distributionManagement> - <site> - <id>accumulo.mvn.website</id> - <name>Accumulo Maven Site</name> - <!-- this is not likely to be what we really want, but it's good enough for a test --> - <url>scm:svn:https://svn.apache.org/repos/asf/accumulo/site/trunk/maven-site</url> - </site> - </distributionManagement> <properties> <!-- used for filtering the java source with the current version --> <accumulo.release.version>${project.version}</accumulo.release.version> + <assembly.tarLongFileMode>gnu</assembly.tarLongFileMode> <!-- bouncycastle version for test dependencies --> <bouncycastle.version>1.50</bouncycastle.version> <!-- relative path for Eclipse format; should override in child modules if necessary --> @@ -128,21 +127,21 @@ <findbugs.version>2.5.5</findbugs.version> <!-- surefire/failsafe plugin option --> <forkCount>1</forkCount> - <!-- overwritten in profiles hadoop-1 or hadoop-2 --> + <!-- overwritten in hadoop profiles --> <hadoop.version>2.2.0</hadoop.version> <httpclient.version>3.1</httpclient.version> - <java.ver>1.6</java.ver> <jetty.version>8.1.15.v20140411</jetty.version> - <!-- the maven-release-plugin makes this recommendation, due to plugin bugs --> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> <maven.min-version>3.0.5</maven.min-version> <!-- surefire/failsafe plugin option --> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> - <powermock.version>1.5</powermock.version> + <powermock.version>1.6.4</powermock.version> <!-- surefire/failsafe plugin option --> <reuseForks>false</reuseForks> - <sealJars>false</sealJars> - <!-- overwritten in profiles hadoop-1 or hadoop-2 --> + <!-- overwritten in hadoop profiles --> <slf4j.version>1.7.5</slf4j.version> + <sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor> <!-- Thrift version --> <thrift.version>0.9.1</thrift.version> <!-- ZooKeeper 3.4.x works also, but we're not using new features yet; this ensures 3.3.x compatibility. --> @@ -160,6 +159,7 @@ <artifactId>gson</artifactId> <version>2.2.2</version> </dependency> + <!-- Hadoop-2.4.0 MiniDFSCluster uses classes dropped in Guava 15 --> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> @@ -504,12 +504,18 @@ <build> <pluginManagement> <plugins> + <!-- check for version updates with 'mvn versions:display-plugin-updates' --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>versions-maven-plugin</artifactId> + <version>2.2</version> + </plugin> <plugin> <groupId>org.gaul</groupId> <artifactId>modernizer-maven-plugin</artifactId> <version>1.4.0</version> <configuration> - <javaVersion>${java.ver}</javaVersion> + <javaVersion>${maven.compiler.target}</javaVersion> </configuration> </plugin> <plugin> @@ -547,7 +553,7 @@ <plugin> <groupId>com.github.koraktor</groupId> <artifactId>mavanagaiata</artifactId> - <version>0.7.1</version> + <version>0.7.2</version> <configuration> <skipNoGit>true</skipNoGit> </configuration> @@ -559,16 +565,8 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <attach>false</attach> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> - <version>2.9</version> + <version>2.12</version> <configuration> <issueManagementSystems> <issueManagementSystem>JIRA</issueManagementSystem> @@ -580,6 +578,7 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> <configuration> <filesets> @@ -594,13 +593,18 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>${java.ver}</source> - <target>${java.ver}</target> <optimize>true</optimize> <showDeprecation>true</showDeprecation> <showWarnings>true</showWarnings> + <compilerArgs> + <arg>-Xlint:all</arg> + <arg>-Xlint:-processing</arg> + <arg>-Xmaxwarns</arg> + <arg>5</arg> + </compilerArgs> </configuration> </plugin> <plugin> @@ -609,7 +613,7 @@ <configuration> <archive> <manifestEntries> - <Sealed>${sealJars}</Sealed> + <Sealed>true</Sealed> <Implementation-Build>${mvngit.commit.id}</Implementation-Build> </manifestEntries> </archive> @@ -619,24 +623,21 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <encoding>${project.reporting.outputEncoding}</encoding> <quiet>true</quiet> - <javadocVersion>${java.ver}</javadocVersion> + <javadocVersion>${maven.compiler.target}</javadocVersion> <additionalJOption>-J-Xmx512m</additionalJOption> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <!-- Work around MRELEASE-812 --> - <version>2.5</version> <configuration> - <arguments>-P !autoformat,apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2 ${extraReleaseArgs}</arguments> + <arguments>-P !autoformat,thrift,assemble,docs,sunny -Dtimeout.factor=2 ${extraReleaseArgs}</arguments> <autoVersionSubmodules>true</autoVersionSubmodules> <goals>clean deploy</goals> <preparationGoals>clean verify</preparationGoals> <tagNameFormat>rel/@{project.version}</tagNameFormat> - <releaseProfiles>seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles> + <releaseProfiles>apache-release,accumulo-release,skip-plugin-its-with-skipTests</releaseProfiles> <useReleaseProfile>false</useReleaseProfile> <pushChanges>false</pushChanges> <localCheckout>true</localCheckout> @@ -659,12 +660,12 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.8</version> + <version>1.9</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> - <version>2.6</version> + <version>2.7</version> <configuration> <aggregate>true</aggregate> <formats> @@ -681,7 +682,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> + <version>1.4.0</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -694,7 +695,7 @@ <configuration> <rules> <requireJavaVersion> - <version>[${java.ver},)</version> + <version>[${maven.compiler.target},)</version> </requireJavaVersion> <requireMavenVersion> <version>[${maven.min-version},)</version> @@ -719,9 +720,9 @@ <artifactId>maven-java-formatter-plugin</artifactId> <version>0.4</version> <configuration> - <compilerCompliance>${java.ver}</compilerCompliance> - <compilerSource>${java.ver}</compilerSource> - <compilerTargetPlatform>${java.ver}</compilerTargetPlatform> + <compilerCompliance>${maven.compiler.source}</compilerCompliance> + <compilerSource>${maven.compiler.source}</compilerSource> + <compilerTargetPlatform>${maven.compiler.target}</compilerTargetPlatform> <excludes> <exclude>**/thrift/*.java</exclude> <exclude>**/proto/*.java</exclude> @@ -738,6 +739,7 @@ </dependencies> <executions> <execution> + <id>format-java-source</id> <goals> <goal>format</goal> </goals> @@ -745,14 +747,8 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <version>3.4</version> - </plugin> - <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.11</version> <configuration> <excludes> <exclude>nbproject/**</exclude> @@ -946,35 +942,8 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-publish-plugin</artifactId> - <executions> - <execution> - <id>scm-publish</id> - <goals> - <goal>publish-scm</goal> - </goals> - <phase>site-deploy</phase> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <dependencies> - <!-- workaround for RAT-158 --> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-core</artifactId> - <version>1.6</version> - <exclusions> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> <executions> <execution> <id>check-licenses</id> @@ -985,94 +954,7 @@ </executions> </plugin> </plugins> - <extensions> - <extension> - <!-- enable ssh deployment of site with maven 3 --> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh</artifactId> - <version>2.6</version> - </extension> - </extensions> </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-changes-plugin</artifactId> - <version>2.9</version> - <reportSets> - <reportSet> - <reports> - <report>jira-report</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9.1</version> - <reportSets> - <reportSet> - <reports> - <report>javadoc</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>3.1</version> - <configuration> - <excludes> - <exclude>**/thrift/*.java</exclude> - </excludes> - <format>html</format> - <includeTests>true</includeTests> - <targetJdk>${java.ver}</targetJdk> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>summary</report> - <report>index</report> - <report>dependencies</report> - <report>issue-tracking</report> - <report>scm</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>${findbugs.version}</version> - <configuration> - <excludeFilterFile>contrib/findbugs-exclude.xml</excludeFilterFile> - <findbugsXmlOutput>true</findbugsXmlOutput> - <findbugsXmlWithMessages>true</findbugsXmlWithMessages> - <xmlOutput>true</xmlOutput> - <effort>Max</effort> - <threshold>Medium</threshold> - <failOnError>false</failOnError> - </configuration> - </plugin> - </plugins> - </reporting> <profiles> <profile> <id>m2e</id> @@ -1096,7 +978,7 @@ <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <versionRange>[3.2,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>helpmojo</goal> <goal>descriptor</goal> @@ -1110,7 +992,7 @@ <pluginExecutionFilter> <groupId>com.googlecode.maven-java-formatter-plugin</groupId> <artifactId>maven-java-formatter-plugin</artifactId> - <versionRange>[0.4,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>format</goal> </goals> @@ -1123,7 +1005,7 @@ <pluginExecutionFilter> <groupId>org.gaul</groupId> <artifactId>modernizer-maven-plugin</artifactId> - <versionRange>[1.4.0,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>modernizer</goal> </goals> @@ -1136,7 +1018,7 @@ <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <versionRange>[2.13,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>check</goal> </goals> @@ -1149,7 +1031,7 @@ <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <versionRange>[2.0,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>copy-dependencies</goal> </goals> @@ -1162,7 +1044,7 @@ <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-remote-resources-plugin</artifactId> - <versionRange>[1.0,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>process</goal> </goals> @@ -1175,7 +1057,7 @@ <pluginExecutionFilter> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <versionRange>[0.8,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>check</goal> </goals> @@ -1188,7 +1070,7 @@ <pluginExecutionFilter> <groupId>org.codehaus.mojo</groupId> <artifactId>native-maven-plugin</artifactId> - <versionRange>[1.0-alpha-7,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>compile</goal> <goal>initialize</goal> @@ -1205,7 +1087,7 @@ <pluginExecutionFilter> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <versionRange>[1.0,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>exec</goal> </goals> @@ -1218,7 +1100,7 @@ <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <versionRange>[1.0,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>enforce</goal> </goals> @@ -1231,7 +1113,7 @@ <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-invoker-plugin</artifactId> - <versionRange>[1.7,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>install</goal> </goals> @@ -1244,7 +1126,7 @@ <pluginExecutionFilter> <groupId>com.github.ekryd.sortpom</groupId> <artifactId>sortpom-maven-plugin</artifactId> - <versionRange>[2.4.0,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>sort</goal> <goal>verify</goal> @@ -1258,7 +1140,7 @@ <pluginExecutionFilter> <groupId>com.github.koraktor</groupId> <artifactId>mavanagaiata</artifactId> - <versionRange>[0.6.1,)</versionRange> + <versionRange>[0,)</versionRange> <goals> <goal>commit</goal> </goals> @@ -1276,59 +1158,29 @@ </build> </profile> <profile> - <id>apache-release</id> + <id>accumulo-release</id> + <properties> + <!-- some properties to make the release build a bit faster --> + <checkstyle.skip>true</checkstyle.skip> + <findbugs.skip>true</findbugs.skip> + <skipITs>true</skipITs> + <skipTests>true</skipTests> + </properties> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.apache.resources</groupId> - <artifactId>apache-source-release-assembly-descriptor</artifactId> - <version>1.0.4</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>source-release-assembly</id> - <goals> - <goal>single</goal> - </goals> - <phase>validate</phase> - <configuration> - <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> - <finalName>accumulo-${project.version}</finalName> - <descriptorRefs> - <descriptorRef>source-release-zip-tar</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>rename-source-release-assembly</id> - <goals> - <goal>exec</goal> - </goals> - <phase>validate</phase> - <configuration> - <executable>mv</executable> - <workingDirectory>${project.build.directory}</workingDirectory> - <commandlineArgs>-n accumulo-${project.version}-source-release.tar.gz accumulo-${project.version}-src.tar.gz</commandlineArgs> - <successCodes> - <successCode>0</successCode> - <successCode>1</successCode> - </successCodes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <!-- source assembly gets attached in the assemble module --> + <attach>false</attach> + <finalName>accumulo-${project.version}</finalName> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </profile> <profile> @@ -1365,24 +1217,6 @@ </build> </profile> <profile> - <!-- Seal jars and skip tests when the - apache-release profile is activated. --> - <id>seal-jars</id> - <properties> - <sealJars>true</sealJars> - <skipITs>true</skipITs> - <skipTests>true</skipTests> - </properties> - </profile> - <profile> - <!-- Skip findbugs executing when the - apache-release profile is activated. --> - <id>skip-findbugs</id> - <properties> - <findbugs.skip>true</findbugs.skip> - </properties> - </profile> - <profile> <!-- Minimal testing profile. (a.k.a. SunnyDay) --> <id>sunny</id> <properties> @@ -1390,32 +1224,6 @@ <it.test>ReadWriteIT,SimpleProxyIT,ExamplesIT,ShellServerIT</it.test> </properties> </profile> - <profile> - <!-- Generate cobertura reports with site. - Activate with -P cobertura --> - <id>cobertura</id> - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.6</version> - <configuration> - <aggregate>true</aggregate> - <formats> - <format>xml</format> - <format>html</format> - </formats> - <instrumentation> - <excludes> - <exclude>**/thrift/*.class</exclude> - </excludes> - </instrumentation> - </configuration> - </plugin> - </plugins> - </reporting> - </profile> <!-- profile for our default Hadoop build unfortunately, has to duplicate one of our specified profiles. see MNG-3328 --> @@ -1489,7 +1297,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <encoding>${project.reporting.outputEncoding}</encoding> <quiet>true</quiet> <javadocVersion>1.8</javadocVersion> <additionalJOption>-J-Xmx512m</additionalJOption> http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd2c88ba/server/native/pom.xml ---------------------------------------------------------------------- diff --git a/server/native/pom.xml b/server/native/pom.xml index 3a3bb19..cfe1835 100644 --- a/server/native/pom.xml +++ b/server/native/pom.xml @@ -79,7 +79,6 @@ </goals> <phase>package</phase> <configuration> - <attach>true</attach> <appendAssemblyId>false</appendAssemblyId> <descriptors> <descriptor>src/main/assemblies/native-tarball.xml</descriptor> http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd2c88ba/start/pom.xml ---------------------------------------------------------------------- diff --git a/start/pom.xml b/start/pom.xml index df7347e..4b190f4 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -46,13 +46,9 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> </dependency> - <!-- Hadoop-2.4.0 MiniDFSCluster uses classes from <Guava-15.0 --> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <?SORTPOM IGNORE?> - <version>14.0.1</version><!--$NO-MVN-MAN-VER$--> - <?SORTPOM RESUME?> <scope>test</scope> </dependency> <dependency>
