Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 04837200B21 for ; Fri, 27 May 2016 04:38:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0351C160A3A; Fri, 27 May 2016 02:38:18 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5EEF7160A2B for ; Fri, 27 May 2016 04:38:16 +0200 (CEST) Received: (qmail 18174 invoked by uid 500); 27 May 2016 02:38:15 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 18089 invoked by uid 99); 27 May 2016 02:38:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 May 2016 02:38:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4A921DFA9D; Fri, 27 May 2016 02:38:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Fri, 27 May 2016 02:38:16 -0000 Message-Id: <38cb2c2d802449fa8436e0a0334b7010@git.apache.org> In-Reply-To: <97a7d291e4d24421933269f07a1b29b8@git.apache.org> References: <97a7d291e4d24421933269f07a1b29b8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/10] accumulo git commit: ACCUMULO-4312 Update parent POM to ASF-18 archived-at: Fri, 27 May 2016 02:38:18 -0000 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.7 Commit: fd2c88baaa7e4f1ec4209882d292da208d108ca9 Parents: dbb2840 Author: Christopher Tubbs Authored: Wed May 25 17:01:20 2016 -0400 Committer: Christopher Tubbs 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 @@ - apache-release + accumulo-release @@ -215,7 +215,7 @@ - ${project.parent.build.directory}/${project.artifactId}-${project.version}-src.tar.gz + ${project.parent.build.directory}/${project.artifactId}-${project.version}-source-release.tar.gz tar.gz src @@ -242,8 +242,6 @@ package - true - ${project.artifactId}-${project.version} src/main/assemblies/binary-release.xml 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 @@ ../examples/simple - /examples/simple + examples/simple 0755 0644 @@ -78,7 +78,7 @@ ./ - /lib/ext + lib/ext 0755 */** @@ -86,7 +86,7 @@ ./ - /logs + logs 0700 */** @@ -94,7 +94,7 @@ ../docs/src/main/resources - /docs + docs 0755 0644 @@ -105,7 +105,7 @@ ../docs/target - /docs + docs 0755 0644 @@ -131,7 +131,7 @@ conf/templates - /conf + conf 0755 0644 @@ -140,7 +140,7 @@ target/example-configs - /conf/examples + conf/examples 0755 0755 @@ -149,7 +149,7 @@ target/example-configs - /conf/examples + conf/examples 0755 0644 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 @@ org.apache.maven maven-core + + + org.sonatype.sisu + sisu-inject-bean + + org.apache.maven @@ -59,6 +65,11 @@ org.apache.maven.plugin-tools maven-plugin-annotations + + junit + junit + test + 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 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 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 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 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 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 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 @@ org.apache apache - 14 + 18 org.apache.accumulo accumulo-project 1.6.6-SNAPSHOT pom Apache Accumulo Project - 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. - - http://accumulo.apache.org/maven-site/ + 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. + + https://accumulo.apache.org 2011 The Apache Software Foundation - http://www.apache.org/ + https://www.apache.org Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 @@ -48,26 +54,26 @@ user-subscribe@accumulo.apache.org user-unsubscribe@accumulo.apache.org user@accumulo.apache.org - http://mail-archives.apache.org/mod_mbox/accumulo-user + https://lists.apache.org/list.html?user@accumulo.apache.org Dev dev-subscribe@accumulo.apache.org dev-unsubscribe@accumulo.apache.org dev@accumulo.apache.org - http://mail-archives.apache.org/mod_mbox/accumulo-dev + https://lists.apache.org/list.html?dev@accumulo.apache.org Commits commits-subscribe@accumulo.apache.org commits-unsubscribe@accumulo.apache.org - http://mail-archives.apache.org/mod_mbox/accumulo-commits + https://lists.apache.org/list.html?commits@accumulo.apache.org Notifications notifications-subscribe@accumulo.apache.org notifications-unsubscribe@accumulo.apache.org - http://mail-archives.apache.org/mod_mbox/accumulo-notifications + https://lists.apache.org/list.html?notifications@accumulo.apache.org @@ -107,17 +113,10 @@ Apache Jenkins https://builds.apache.org/view/A-D/view/Accumulo/ - - - accumulo.mvn.website - Accumulo Maven Site - - scm:svn:https://svn.apache.org/repos/asf/accumulo/site/trunk/maven-site - - ${project.version} + gnu 1.50 @@ -128,21 +127,21 @@ 2.5.5 1 - + 2.2.0 3.1 - 1.6 8.1.15.v20140411 - + 1.6 + 1.6 3.0.5 true - 1.5 + 1.6.4 false - false - + 1.7.5 + source-release-tar 0.9.1 @@ -160,6 +159,7 @@ gson 2.2.2 + com.google.guava guava @@ -504,12 +504,18 @@ + + + org.codehaus.mojo + versions-maven-plugin + 2.2 + org.gaul modernizer-maven-plugin 1.4.0 - ${java.ver} + ${maven.compiler.target} @@ -547,7 +553,7 @@ com.github.koraktor mavanagaiata - 0.7.1 + 0.7.2 true @@ -559,16 +565,8 @@ org.apache.maven.plugins - maven-assembly-plugin - - false - gnu - - - - org.apache.maven.plugins maven-changes-plugin - 2.9 + 2.12 JIRA @@ -580,6 +578,7 @@ + org.apache.maven.plugins maven-clean-plugin @@ -594,13 +593,18 @@ + org.apache.maven.plugins maven-compiler-plugin - ${java.ver} - ${java.ver} true true true + + -Xlint:all + -Xlint:-processing + -Xmaxwarns + 5 + @@ -609,7 +613,7 @@ - ${sealJars} + true ${mvngit.commit.id} @@ -619,24 +623,21 @@ org.apache.maven.plugins maven-javadoc-plugin - ${project.reporting.outputEncoding} true - ${java.ver} + ${maven.compiler.target} -J-Xmx512m org.apache.maven.plugins maven-release-plugin - - 2.5 - -P !autoformat,apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2 ${extraReleaseArgs} + -P !autoformat,thrift,assemble,docs,sunny -Dtimeout.factor=2 ${extraReleaseArgs} true clean deploy clean verify rel/@{project.version} - seal-jars,skip-findbugs,skip-plugin-its-with-skipTests + apache-release,accumulo-release,skip-plugin-its-with-skipTests false false true @@ -659,12 +660,12 @@ org.codehaus.mojo build-helper-maven-plugin - 1.8 + 1.9 org.codehaus.mojo cobertura-maven-plugin - 2.6 + 2.7 true @@ -681,7 +682,7 @@ org.codehaus.mojo exec-maven-plugin - 1.2.1 + 1.4.0 org.codehaus.mojo @@ -694,7 +695,7 @@ - [${java.ver},) + [${maven.compiler.target},) [${maven.min-version},) @@ -719,9 +720,9 @@ maven-java-formatter-plugin 0.4 - ${java.ver} - ${java.ver} - ${java.ver} + ${maven.compiler.source} + ${maven.compiler.source} + ${maven.compiler.target} **/thrift/*.java **/proto/*.java @@ -738,6 +739,7 @@ + format-java-source format @@ -745,14 +747,8 @@ - org.apache.maven.plugins - maven-plugin-plugin - 3.4 - - org.apache.rat apache-rat-plugin - 0.11 nbproject/** @@ -946,35 +942,8 @@ - org.apache.maven.plugins - maven-scm-publish-plugin - - - scm-publish - - publish-scm - - site-deploy - - - - org.apache.rat apache-rat-plugin - - - - org.apache.maven.doxia - doxia-core - 1.6 - - - xerces - xercesImpl - - - - check-licenses @@ -985,94 +954,7 @@ - - - - org.apache.maven.wagon - wagon-ssh - 2.6 - - - - - - org.apache.maven.plugins - maven-changes-plugin - 2.9 - - - - jira-report - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - - javadoc - - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.4 - - - org.apache.maven.plugins - maven-pmd-plugin - 3.1 - - - **/thrift/*.java - - html - true - ${java.ver} - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - false - - - - - summary - index - dependencies - issue-tracking - scm - - - - - - org.codehaus.mojo - findbugs-maven-plugin - ${findbugs.version} - - contrib/findbugs-exclude.xml - true - true - true - Max - Medium - false - - - - m2e @@ -1096,7 +978,7 @@ org.apache.maven.plugins maven-plugin-plugin - [3.2,) + [0,) helpmojo descriptor @@ -1110,7 +992,7 @@ com.googlecode.maven-java-formatter-plugin maven-java-formatter-plugin - [0.4,) + [0,) format @@ -1123,7 +1005,7 @@ org.gaul modernizer-maven-plugin - [1.4.0,) + [0,) modernizer @@ -1136,7 +1018,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - [2.13,) + [0,) check @@ -1149,7 +1031,7 @@ org.apache.maven.plugins maven-dependency-plugin - [2.0,) + [0,) copy-dependencies @@ -1162,7 +1044,7 @@ org.apache.maven.plugins maven-remote-resources-plugin - [1.0,) + [0,) process @@ -1175,7 +1057,7 @@ org.apache.rat apache-rat-plugin - [0.8,) + [0,) check @@ -1188,7 +1070,7 @@ org.codehaus.mojo native-maven-plugin - [1.0-alpha-7,) + [0,) compile initialize @@ -1205,7 +1087,7 @@ org.codehaus.mojo exec-maven-plugin - [1.0,) + [0,) exec @@ -1218,7 +1100,7 @@ org.apache.maven.plugins maven-enforcer-plugin - [1.0,) + [0,) enforce @@ -1231,7 +1113,7 @@ org.apache.maven.plugins maven-invoker-plugin - [1.7,) + [0,) install @@ -1244,7 +1126,7 @@ com.github.ekryd.sortpom sortpom-maven-plugin - [2.4.0,) + [0,) sort verify @@ -1258,7 +1140,7 @@ com.github.koraktor mavanagaiata - [0.6.1,) + [0,) commit @@ -1276,59 +1158,29 @@ - apache-release + accumulo-release + + + true + true + true + true + - - - org.apache.maven.plugins - maven-assembly-plugin - - - org.apache.apache.resources - apache-source-release-assembly-descriptor - 1.0.4 - - - - - source-release-assembly - - single - - validate - - true - accumulo-${project.version} - - source-release-zip-tar - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - rename-source-release-assembly - - exec - - validate - - mv - ${project.build.directory} - -n accumulo-${project.version}-source-release.tar.gz accumulo-${project.version}-src.tar.gz - - 0 - 1 - - - - - - + + + + org.apache.maven.plugins + maven-assembly-plugin + false + + + false + accumulo-${project.version} + + + + @@ -1365,24 +1217,6 @@ - - seal-jars - - true - true - true - - - - - skip-findbugs - - true - - - sunny @@ -1390,32 +1224,6 @@ ReadWriteIT,SimpleProxyIT,ExamplesIT,ShellServerIT - - - cobertura - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.6 - - true - - xml - html - - - - **/thrift/*.class - - - - - - - @@ -1489,7 +1297,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${project.reporting.outputEncoding} true 1.8 -J-Xmx512m 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 @@ package - true false src/main/assemblies/native-tarball.xml 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 @@ org.apache.hadoop hadoop-client - com.google.guava guava - - 14.0.1 - test