You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mw...@apache.org on 2017/01/10 19:39:20 UTC
accumulo-examples git commit: ACCUMULO-4566 Removed code not used by
any example
Repository: accumulo-examples
Updated Branches:
refs/heads/master e07cdcde1 -> d10b96321
ACCUMULO-4566 Removed code not used by any example
* Code was accidentally moved
* Cleaned up dependencies after running 'mvn dependency:analyze'
Project: http://git-wip-us.apache.org/repos/asf/accumulo-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-examples/commit/d10b9632
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-examples/tree/d10b9632
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-examples/diff/d10b9632
Branch: refs/heads/master
Commit: d10b96321b970bab31c0d4476ac61446dc6aa287
Parents: e07cdcd
Author: Mike Walch <mw...@apache.org>
Authored: Tue Jan 10 13:42:05 2017 -0500
Committer: Mike Walch <mw...@apache.org>
Committed: Tue Jan 10 14:37:52 2017 -0500
----------------------------------------------------------------------
pom.xml | 62 ++++++++++----------
.../accumulo/examples/shell/DebugCommand.java | 46 ---------------
.../examples/shell/ExampleShellExtension.java | 37 ------------
3 files changed, 30 insertions(+), 115 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo-examples/blob/d10b9632/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b378a9d..9816beb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
<properties>
<accumulo.version>1.8.0</accumulo.version>
<hadoop.version>2.6.4</hadoop.version>
+ <slf4j.version>1.7.21</slf4j.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
@@ -122,15 +123,9 @@
<version>1.48</version>
</dependency>
<dependency>
- <groupId>com.google.auto.service</groupId>
- <artifactId>auto-service</artifactId>
- <version>1.0-rc2</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>14.0.1</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
@@ -143,32 +138,12 @@
<version>2.11</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
- <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
<version>${accumulo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- <version>${accumulo.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-shell</artifactId>
- <version>${accumulo.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-test</artifactId>
- <version>${accumulo.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-tracer</artifactId>
<version>${accumulo.version}</version>
</dependency>
@@ -183,9 +158,32 @@
<version>3.1.0-incubating</version>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-minicluster</artifactId>
+ <version>${accumulo.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ <version>${accumulo.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-test</artifactId>
+ <version>${accumulo.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/accumulo-examples/blob/d10b9632/src/main/java/org/apache/accumulo/examples/shell/DebugCommand.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/accumulo/examples/shell/DebugCommand.java b/src/main/java/org/apache/accumulo/examples/shell/DebugCommand.java
deleted file mode 100644
index df68200..0000000
--- a/src/main/java/org/apache/accumulo/examples/shell/DebugCommand.java
+++ /dev/null
@@ -1,46 +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.examples.shell;
-
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.apache.accumulo.shell.Shell;
-import org.apache.accumulo.shell.Shell.Command;
-import org.apache.commons.cli.CommandLine;
-
-public class DebugCommand extends Command {
-
- @Override
- public int execute(String fullCommand, CommandLine cl, Shell shellState) throws Exception {
- Set<String> lines = new TreeSet<>();
- lines.add("This is a test");
- shellState.printLines(lines.iterator(), true);
- return 0;
- }
-
- @Override
- public String description() {
- return "prints a message to test extension feature";
- }
-
- @Override
- public int numArgs() {
- return 0;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/accumulo-examples/blob/d10b9632/src/main/java/org/apache/accumulo/examples/shell/ExampleShellExtension.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/accumulo/examples/shell/ExampleShellExtension.java b/src/main/java/org/apache/accumulo/examples/shell/ExampleShellExtension.java
deleted file mode 100644
index be94b9c..0000000
--- a/src/main/java/org/apache/accumulo/examples/shell/ExampleShellExtension.java
+++ /dev/null
@@ -1,37 +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.examples.shell;
-
-import org.apache.accumulo.shell.Shell.Command;
-import org.apache.accumulo.shell.ShellExtension;
-
-import com.google.auto.service.AutoService;
-
-@AutoService(ShellExtension.class)
-public class ExampleShellExtension extends ShellExtension {
-
- @Override
- public String getExtensionName() {
- return "ExampleShellExtension";
- }
-
- @Override
- public Command[] getCommands() {
- return new Command[] {new DebugCommand()};
- }
-
-}