Fixing archetypes to use 2.2.1-b3 release
Change-Id: Ic2a7a5cb79fc3bf024800b954b01d79dd1656286
diff --git a/tools/package/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml
index ee3f072..e8c01f3 100644
--- a/tools/package/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/tools/package/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -35,7 +35,7 @@
</fileSets>
<requiredProperties>
<requiredProperty key="onosVersion">
- <defaultValue>2.2.1-SNAPSHOT</defaultValue>
+ <defaultValue>2.2.1-b3</defaultValue>
</requiredProperty>
</requiredProperties>
</archetype-descriptor>
diff --git a/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/AppComponent.java b/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/AppComponent.java
index c2fc6428..68d35f1 100644
--- a/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/AppComponent.java
+++ b/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/AppComponent.java
@@ -18,7 +18,6 @@
*/
package ${package};
-import com.google.common.collect.ImmutableSet;
import org.onosproject.cfg.ComponentConfigService;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
diff --git a/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/package-info.java b/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/package-info.java
new file mode 100644
index 0000000..0096476
--- /dev/null
+++ b/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2014-present Open Networking Foundation
+ *
+ * Licensed 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.
+ */
+
+/**
+ * Administrative console command-line extensions.
+ */
+package ${package};
\ No newline at end of file
diff --git a/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/test/java/AppComponentTest.java b/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/test/java/AppComponentTest.java
index 05e712d..bcb3bdf 100644
--- a/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/test/java/AppComponentTest.java
+++ b/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/test/java/AppComponentTest.java
@@ -21,11 +21,7 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.cfg.ComponentConfigAdapter;
-import org.onosproject.cfg.ConfigProperty;
-
-import java.util.Set;
/**
* Set of tests of the ONOS application component.