accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] branch master updated: Fix #684 Move accumulo-maven-plugin from build (#686)
Date Tue, 09 Oct 2018 22:35:30 GMT
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new 2c8a786  Fix #684 Move accumulo-maven-plugin from build (#686)
2c8a786 is described below

commit 2c8a78644900ac41a24485174f2d57f142ada06d
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Tue Oct 9 18:35:25 2018 -0400

    Fix #684 Move accumulo-maven-plugin from build (#686)
    
    This removes accumulo-maven-plugin from this main accumulo repo. The
    corresponding addition can be found in the new repo named
    accumulo-maven-plugin.
---
 maven-plugin/.gitignore                            |  28 ----
 maven-plugin/pom.xml                               | 169 ---------------------
 maven-plugin/src/it/plugin-test/pom.xml            | 154 -------------------
 maven-plugin/src/it/plugin-test/postbuild.groovy   |  27 ----
 .../org/apache/accumulo/plugin/CustomFilter.java   |  33 ----
 .../org/apache/accumulo/plugin/it/PluginIT.java    | 137 -----------------
 maven-plugin/src/it/settings.xml                   |  57 -------
 .../maven/plugin/AbstractAccumuloMojo.java         |  70 ---------
 .../apache/accumulo/maven/plugin/StartMojo.java    | 110 --------------
 .../org/apache/accumulo/maven/plugin/StopMojo.java |  52 -------
 maven-plugin/src/main/spotbugs/exclude-filter.xml  |  29 ----
 pom.xml                                            |  34 +----
 12 files changed, 1 insertion(+), 899 deletions(-)

diff --git a/maven-plugin/.gitignore b/maven-plugin/.gitignore
deleted file mode 100644
index e77a822..0000000
--- a/maven-plugin/.gitignore
+++ /dev/null
@@ -1,28 +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.
-
-# Maven ignores
-/target/
-
-# IDE ignores
-/.settings/
-/.project
-/.classpath
-/.pydevproject
-/.idea
-/*.iml
-/nbproject/
-/nbactions.xml
-/nb-configuration.xml
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
deleted file mode 100644
index 6086aec..0000000
--- a/maven-plugin/pom.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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.accumulo</groupId>
-    <artifactId>accumulo-project</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>accumulo-maven-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
-  <name>Apache Accumulo Maven Plugin</name>
-  <description>An Apache Maven plugin for testing software against a test Apache Accumulo
instance.</description>
-  <prerequisites>
-    <maven>${maven.plugin-version}</maven>
-  </prerequisites>
-  <dependencies>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-minicluster</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-    </dependency>
-    <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>
-      <artifactId>maven-model</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-    </dependency>
-    <dependency>
-      <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>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>analyze</id>
-            <goals>
-              <goal>analyze-only</goal>
-            </goals>
-            <configuration>
-              <ignoredUnusedDeclaredDependencies combine.children="append">
-                <unusedDeclaredDependency>junit:junit:jar:4.12</unusedDeclaredDependency>
-              </ignoredUnusedDeclaredDependencies>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-plugin-plugin</artifactId>
-        <configuration>
-          <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
-        </configuration>
-        <executions>
-          <execution>
-            <id>mojo-descriptor</id>
-            <goals>
-              <goal>descriptor</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>help-goal</id>
-            <goals>
-              <goal>helpmojo</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-invoker-plugin</artifactId>
-        <configuration>
-          <cloneClean>true</cloneClean>
-          <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-          <debug>true</debug>
-          <pomIncludes>
-            <pomInclude>*/pom.xml</pomInclude>
-          </pomIncludes>
-          <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-          <settingsFile>src/it/settings.xml</settingsFile>
-          <goals>
-            <goal>clean</goal>
-            <goal>post-integration-test</goal>
-          </goals>
-          <profiles>
-            <profile>!autoformat</profile>
-          </profiles>
-        </configuration>
-        <executions>
-          <execution>
-            <id>integration-test</id>
-            <goals>
-              <goal>install</goal>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>skip-plugin-its-with-skipTests</id>
-      <activation>
-        <property>
-          <name>skipTests</name>
-        </property>
-      </activation>
-      <properties>
-        <invoker.skip>true</invoker.skip>
-      </properties>
-    </profile>
-    <profile>
-      <id>skip-plugin-its-with-skipITs</id>
-      <activation>
-        <property>
-          <name>skipITs</name>
-        </property>
-      </activation>
-      <properties>
-        <invoker.skip>true</invoker.skip>
-      </properties>
-    </profile>
-  </profiles>
-</project>
diff --git a/maven-plugin/src/it/plugin-test/pom.xml b/maven-plugin/src/it/plugin-test/pom.xml
deleted file mode 100644
index aa3f9ea..0000000
--- a/maven-plugin/src/it/plugin-test/pom.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>@project.groupId@</groupId>
-    <artifactId>accumulo-project</artifactId>
-    <version>@project.version@</version>
-  </parent>
-
-  <groupId>@project.groupId@</groupId>
-  <artifactId>@project.artifactId@-test</artifactId>
-  <version>@project.version@</version>
-
-  <description>A simple IT verifying the basic use case.</description>
-
-  <properties>
-    <warbucks.skip>true</warbucks.skip>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-configuration</groupId>
-      <artifactId>commons-configuration</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-minicluster</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-client-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.zookeeper</groupId>
-      <artifactId>zookeeper</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-client-runtime</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-failsafe-plugin</artifactId>
-          <configuration>
-            <excludedGroups combine.self="override" />
-            <groups combine.self="override" />
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>@project.groupId@</groupId>
-        <artifactId>@project.artifactId@</artifactId>
-        <version>@project.version@</version>
-        <configuration>
-          <instanceName>plugin-it-instance</instanceName>
-          <rootPassword>ITSecret</rootPassword>
-        </configuration>
-        <executions>
-          <execution>
-            <id>run-plugin</id>
-            <goals>
-              <goal>start</goal>
-              <goal>stop</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>run-integration-tests</id>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-            <configuration>
-              <excludedGroups combine.self="override" />
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/maven-plugin/src/it/plugin-test/postbuild.groovy b/maven-plugin/src/it/plugin-test/postbuild.groovy
deleted file mode 100644
index 3fbfcab..0000000
--- a/maven-plugin/src/it/plugin-test/postbuild.groovy
+++ /dev/null
@@ -1,27 +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.
- */
-File outputDirectory = new File(basedir, "target/accumulo-maven-plugin/plugin-it-instance");
-assert outputDirectory.isDirectory()
-
-File testCreateTable = new File(basedir, "target/accumulo-maven-plugin/plugin-it-instance/testCreateTablePassed");
-assert testCreateTable.isFile()
-
-File testWriteToTable = new File(basedir, "target/accumulo-maven-plugin/plugin-it-instance/testWriteToTablePassed");
-assert testWriteToTable.isFile()
-
-File testCheckIterator = new File(basedir, "target/accumulo-maven-plugin/plugin-it-instance/testCheckIteratorPassed");
-assert testCheckIterator.isFile()
diff --git a/maven-plugin/src/it/plugin-test/src/main/java/org/apache/accumulo/plugin/CustomFilter.java
b/maven-plugin/src/it/plugin-test/src/main/java/org/apache/accumulo/plugin/CustomFilter.java
deleted file mode 100644
index 97be677..0000000
--- a/maven-plugin/src/it/plugin-test/src/main/java/org/apache/accumulo/plugin/CustomFilter.java
+++ /dev/null
@@ -1,33 +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 org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.Filter;
-
-/**
- *
- */
-public class CustomFilter extends Filter {
-
-  @Override
-  public boolean accept(Key k, Value v) {
-    return k.getColumnFamily().toString().equals("allowed");
-  }
-
-}
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
deleted file mode 100644
index 0d58a05..0000000
--- a/maven-plugin/src/it/plugin-test/src/test/java/org/apache/accumulo/plugin/it/PluginIT.java
+++ /dev/null
@@ -1,137 +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.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.Accumulo;
-import org.apache.accumulo.core.client.AccumuloClient;
-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.ClientInfo;
-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.MiniAccumuloCluster;
-import org.apache.accumulo.plugin.CustomFilter;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class PluginIT {
-
-  private static ClientInfo info;
-  private static AccumuloClient client;
-
-  @BeforeClass
-  public static void setUp() throws Exception {
-    String instanceName = "plugin-it-instance";
-    info = MiniAccumuloCluster.getClientInfo(new File("target/accumulo-maven-plugin/" + instanceName));
-    client = Accumulo.newClient().usingClientInfo(info).build();
-  }
-
-  @Test
-  public void testConnection() {
-    assertTrue(info != null);
-    assertTrue(client != null);
-    assertTrue(client instanceof AccumuloClient);
-  }
-
-  @Test
-  public void testCreateTable() throws AccumuloException, AccumuloSecurityException, TableExistsException,
IOException {
-    String tableName = "testCreateTable";
-    client.tableOperations().create(tableName);
-    assertTrue(client.tableOperations().exists(tableName));
-    assertTrue(new File("target/accumulo-maven-plugin/" + info.getInstanceName() + "/testCreateTablePassed").createNewFile());
-  }
-
-  @Test
-  public void writeToTable() throws AccumuloException, AccumuloSecurityException, TableExistsException,
TableNotFoundException, IOException {
-    String tableName = "writeToTable";
-    client.tableOperations().create(tableName);
-    BatchWriter bw = client.createBatchWriter(tableName, new BatchWriterConfig());
-    Mutation m = new Mutation("ROW");
-    m.put("CF", "CQ", "V");
-    bw.addMutation(m);
-    bw.close();
-    Scanner scanner = client.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/" + info.getInstanceName() + "/testWriteToTablePassed").createNewFile());
-  }
-
-  @Test
-  public void checkIterator() throws IOException, AccumuloException, AccumuloSecurityException,
TableExistsException, TableNotFoundException {
-    String tableName = "checkIterator";
-    client.tableOperations().create(tableName);
-    BatchWriter bw = client.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 = client.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/" + info.getInstanceName() + "/testCheckIteratorPassed").createNewFile());
-  }
-
-}
diff --git a/maven-plugin/src/it/settings.xml b/maven-plugin/src/it/settings.xml
deleted file mode 100644
index abf9583..0000000
--- a/maven-plugin/src/it/settings.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-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.
--->
-
-<settings>
-  <!-- This allows the invoked Maven to use the normal local repo as an additional "remote"
repo -->
-  <!-- see also https://maven.apache.org/plugins/maven-invoker-plugin/examples/fast-use.html
-->
-  <profiles>
-    <profile>
-      <id>it-repo</id>
-      <repositories>
-        <repository>
-          <id>local.central</id>
-          <url>@localRepositoryUrl@</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>local.central</id>
-          <url>@localRepositoryUrl@</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-  </profiles>
-  <activeProfiles>
-    <activeProfile>it-repo</activeProfile>
-  </activeProfiles>
-</settings>
diff --git a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
deleted file mode 100644
index 18e3bfb..0000000
--- a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/AbstractAccumuloMojo.java
+++ /dev/null
@@ -1,70 +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.maven.plugin;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-
-public abstract class AbstractAccumuloMojo extends AbstractMojo {
-
-  @Parameter(defaultValue = "${project}", readonly = true)
-  private MavenProject project;
-
-  @Parameter(defaultValue = "false", alias = "skip", property = "accumulo.skip", required
= true)
-  private boolean skip;
-
-  protected boolean shouldSkip() {
-    if (skip) {
-      getLog().info("Skipping execution of accumulo-maven-plugin");
-    }
-    return skip;
-  }
-
-  void configureMiniClasspath(MiniAccumuloConfigImpl macConfig, String miniClasspath)
-      throws MalformedURLException {
-    ArrayList<String> classpathItems = new ArrayList<>();
-    if (miniClasspath == null && project != null) {
-      classpathItems.add(project.getBuild().getOutputDirectory());
-      classpathItems.add(project.getBuild().getTestOutputDirectory());
-      for (Artifact artifact : project.getArtifacts()) {
-        classpathItems.add(artifact.getFile().toURI().toURL().toString());
-      }
-    } else if (miniClasspath != null && !miniClasspath.isEmpty()) {
-      classpathItems.addAll(Arrays.asList(miniClasspath.split(File.pathSeparator)));
-    }
-
-    // Hack to prevent sisu-guava, a maven 3.0.4 dependency, from effecting normal accumulo
-    // behavior.
-    String sisuGuava = null;
-    for (String items : classpathItems)
-      if (items.contains("sisu-guava"))
-        sisuGuava = items;
-
-    if (sisuGuava != null)
-      classpathItems.remove(sisuGuava);
-
-    macConfig.setClasspathItems(classpathItems.toArray(new String[classpathItems.size()]));
-  }
-}
diff --git a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StartMojo.java b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StartMojo.java
deleted file mode 100644
index 42131cf..0000000
--- a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StartMojo.java
+++ /dev/null
@@ -1,110 +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.maven.plugin;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.accumulo.minicluster.MiniAccumuloCluster;
-import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
-import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
-import org.apache.commons.io.FileUtils;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-
-/**
- * Goal which starts an instance of {@link MiniAccumuloCluster}.
- */
-@Mojo(name = "start", defaultPhase = LifecyclePhase.PRE_INTEGRATION_TEST,
-    requiresDependencyResolution = ResolutionScope.TEST)
-public class StartMojo extends AbstractAccumuloMojo {
-
-  @Parameter(defaultValue = "${project.build.directory}", alias = "outputDirectory",
-      property = "accumulo.outputDirectory", required = true)
-  private File outputDirectory;
-
-  @Parameter(defaultValue = "testInstance", alias = "instanceName",
-      property = "accumulo.instanceName", required = true)
-  private String instanceName;
-
-  @Parameter(defaultValue = "secret", alias = "rootPassword", property = "accumulo.rootPassword",
-      required = true)
-  private String rootPassword;
-
-  @Parameter(defaultValue = "0", alias = "zooKeeperPort", property = "accumulo.zooKeeperPort",
-      required = true)
-  private int zooKeeperPort;
-
-  private String miniClasspath;
-
-  static Set<MiniAccumuloClusterImpl> runningClusters = Collections
-      .synchronizedSet(new HashSet<>());
-
-  @Override
-  public void execute() throws MojoExecutionException {
-    if (shouldSkip()) {
-      return;
-    }
-
-    File subdir = new File(new File(outputDirectory, "accumulo-maven-plugin"), instanceName);
-
-    try {
-      subdir = subdir.getCanonicalFile();
-      if (subdir.exists())
-        FileUtils.forceDelete(subdir);
-      if (!subdir.mkdirs() && !subdir.isDirectory())
-        throw new IOException(subdir + " cannot be created as a directory");
-      MiniAccumuloConfigImpl cfg = new MiniAccumuloConfigImpl(subdir, rootPassword);
-      cfg.setInstanceName(instanceName);
-      cfg.setZooKeeperPort(zooKeeperPort);
-      configureMiniClasspath(cfg, miniClasspath);
-      MiniAccumuloClusterImpl mac = new MiniAccumuloClusterImpl(cfg);
-      getLog().info("Starting MiniAccumuloCluster: " + mac.getInstanceName() + " in "
-          + mac.getConfig().getDir());
-      mac.start();
-      runningClusters.add(mac);
-    } catch (Exception e) {
-      throw new MojoExecutionException(
-          "Unable to start " + MiniAccumuloCluster.class.getSimpleName(), e);
-    }
-
-  }
-
-  public static void main(String[] args) throws MojoExecutionException {
-    int a = 0;
-    for (String arg : args) {
-      if (a < 2) {
-        // skip the first two args
-        a++;
-        continue;
-      }
-      StartMojo starter = new StartMojo();
-      starter.outputDirectory = new File(args[0]);
-      String[] instArgs = arg.split(" ");
-      starter.instanceName = instArgs[0];
-      starter.rootPassword = instArgs[1];
-      starter.miniClasspath = args[1];
-      starter.execute();
-    }
-  }
-}
diff --git a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StopMojo.java b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StopMojo.java
deleted file mode 100644
index fb96088..0000000
--- a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StopMojo.java
+++ /dev/null
@@ -1,52 +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.maven.plugin;
-
-import org.apache.accumulo.minicluster.MiniAccumuloCluster;
-import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
-import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl.LogWriter;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-
-/**
- * Goal which stops all instances of {@link MiniAccumuloCluster} started with the start mojo.
- */
-@Mojo(name = "stop", defaultPhase = LifecyclePhase.POST_INTEGRATION_TEST,
-    requiresDependencyResolution = ResolutionScope.TEST)
-public class StopMojo extends AbstractAccumuloMojo {
-
-  @Override
-  public void execute() throws MojoExecutionException {
-    if (shouldSkip()) {
-      return;
-    }
-
-    for (MiniAccumuloClusterImpl mac : StartMojo.runningClusters) {
-      getLog().info("Stopping MiniAccumuloCluster: " + mac.getInstanceName());
-      try {
-        mac.stop();
-        for (LogWriter log : mac.getLogWriters())
-          log.flush();
-      } catch (Exception e) {
-        throw new MojoExecutionException(
-            "Unable to start " + MiniAccumuloCluster.class.getSimpleName(), e);
-      }
-    }
-  }
-}
diff --git a/maven-plugin/src/main/spotbugs/exclude-filter.xml b/maven-plugin/src/main/spotbugs/exclude-filter.xml
deleted file mode 100644
index e4122bb..0000000
--- a/maven-plugin/src/main/spotbugs/exclude-filter.xml
+++ /dev/null
@@ -1,29 +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.
--->
-<FindBugsFilter>
-    <Match>
-        <!-- new file on user input can be dangerous but OK here -->
-        <Class name="org.apache.accumulo.maven.plugin.StartMojo"/>
-        <Bug code="PATH" pattern="PATH_TRAVERSAL_IN"/>
-    </Match>
-    <Match>
-        <!-- dangerous on untrusted files but OK here -->
-        <Class name="org.apache.accumulo.maven.plugin.HelpMojo"/>
-        <Method name="build" params="" returns="org.w3c.dom.Document"/>
-        <Bug code="XXE" pattern="XXE_DOCUMENT"/>
-    </Match>
-</FindBugsFilter>
diff --git a/pom.xml b/pom.xml
index e796e73..f672899 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,6 @@
     <module>client/mapreduce</module>
     <module>core</module>
     <module>iterator-test-harness</module>
-    <module>maven-plugin</module>
     <module>minicluster</module>
     <module>proxy</module>
     <module>server/base</module>
@@ -135,7 +134,6 @@
     <jetty.version>9.4.11.v20180605</jetty.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.plugin-version>3.2.5</maven.plugin-version>
     <!-- surefire/failsafe plugin option -->
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
     <powermock.version>1.7.4</powermock.version>
@@ -332,11 +330,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.accumulo</groupId>
-        <artifactId>accumulo-maven-plugin</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.accumulo</groupId>
         <artifactId>accumulo-minicluster</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -490,31 +483,6 @@
         <version>${htrace.hadoop.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-artifact</artifactId>
-        <version>${maven.plugin-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-core</artifactId>
-        <version>${maven.plugin-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-model</artifactId>
-        <version>${maven.plugin-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-plugin-api</artifactId>
-        <version>${maven.plugin-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugin-tools</groupId>
-        <artifactId>maven-plugin-annotations</artifactId>
-        <version>3.5.2</version>
-      </dependency>
-      <dependency>
         <groupId>org.apache.thrift</groupId>
         <artifactId>libthrift</artifactId>
         <version>${thrift.version}</version>
@@ -882,7 +850,7 @@
             <goals>clean deploy</goals>
             <preparationGoals>clean verify</preparationGoals>
             <tagNameFormat>rel/@{project.version}</tagNameFormat>
-            <releaseProfiles>apache-release,accumulo-release,skip-plugin-its-with-skipTests</releaseProfiles>
+            <releaseProfiles>apache-release,accumulo-release</releaseProfiles>
             <useReleaseProfile>false</useReleaseProfile>
             <pushChanges>false</pushChanges>
             <localCheckout>true</localCheckout>


Mime
View raw message