[WIP] apps CLI changes for karaf upgrade
Change-Id: I283efc39c7d4f4b31344f1d2d0cdd2b98a60932d
diff --git a/tools/build/bazel/generate_workspace.bzl b/tools/build/bazel/generate_workspace.bzl
index ba08e48..3b94f20 100644
--- a/tools/build/bazel/generate_workspace.bzl
+++ b/tools/build/bazel/generate_workspace.bzl
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Wed, 26 Sep 2018 23:17:38 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Thu, 27 Sep 2018 20:53:05 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION")
@@ -244,6 +244,12 @@
jar_sha256 = "c058e39c7c64203d3a448f3adb588cb03d6378ed808485618f26e137f29dae73",
licenses = ["notice"],
jar_urls = ["http://repo1.maven.org/maven2/commons-beanutils/commons-beanutils/1.9.3/commons-beanutils-1.9.3.jar"], )
+ if "commons_jxpath" not in native.existing_rules():
+ java_import_external(
+ name = "commons_jxpath",
+ jar_sha256 = "fcbc0ad917d9d6a73c6df21fac322e00d213ef19cd94815a007c407a8a3ff449",
+ licenses = ["notice"],
+ jar_urls = ["http://repo1.maven.org/maven2/commons-jxpath/commons-jxpath/1.3/commons-jxpath-1.3.jar"], )
if "fast_classpath_scanner" not in native.existing_rules():
java_import_external(
name = "fast_classpath_scanner",
@@ -1373,6 +1379,7 @@
artifact_map["@commons_configuration//:commons_configuration"] = "mvn:commons-configuration:commons-configuration:jar:1.10"
artifact_map["@commons_io//:commons_io"] = "mvn:commons-io:commons-io:jar:2.6"
artifact_map["@commons_beanutils//:commons_beanutils"] = "mvn:commons-beanutils:commons-beanutils:jar:1.9.3"
+artifact_map["@commons_jxpath//:commons_jxpath"] = "mvn:commons-jxpath:commons-jxpath:jar:1.3"
artifact_map["@fast_classpath_scanner//:fast_classpath_scanner"] = "mvn:io.github.lukehutch:fast-classpath-scanner:jar:2.21"
artifact_map["@jdom//:jdom"] = "mvn:jdom:jdom:jar:NON-OSGI:1.0"
artifact_map["@commons_lang//:commons_lang"] = "mvn:commons-lang:commons-lang:jar:2.6"
diff --git a/tools/build/bazel/yang.bzl b/tools/build/bazel/yang.bzl
index 93b619c..18b60e7 100644
--- a/tools/build/bazel/yang.bzl
+++ b/tools/build/bazel/yang.bzl
@@ -32,9 +32,9 @@
"package org.onosproject.model.registrator.impl;\n" + \
"\n" + \
"import org.onosproject.yang.AbstractYangModelRegistrator;\n" + \
- "import org.apache.felix.scr.annotations.Component;\n" + \
+ "import org.osgi.service.component.annotations.Component;\n" + \
"\n" + \
- "@Component(immediate = true)\n" + \
+ "@Component(immediate = true, service = YangModelRegistrator.class)\n" + \
"public class YangModelRegistrator extends AbstractYangModelRegistrator {\n" + \
" public YangModelRegistrator() {\n" + \
" super(YangModelRegistrator.class);\n" + \
diff --git a/tools/package/archetypes/cli/src/main/resources/archetype-resources/src/main/java/AppCommand.java b/tools/package/archetypes/cli/src/main/resources/archetype-resources/src/main/java/AppCommand.java
index 3d82f2c..23d2c84 100644
--- a/tools/package/archetypes/cli/src/main/resources/archetype-resources/src/main/java/AppCommand.java
+++ b/tools/package/archetypes/cli/src/main/resources/archetype-resources/src/main/java/AppCommand.java
@@ -15,7 +15,7 @@
*/
package ${package};
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
/**
@@ -26,7 +26,7 @@
public class AppCommand extends AbstractShellCommand {
@Override
- protected void execute() {
+ protected void doExecute() {
print("Hello %s", "World");
}