Merge pull request #57 from OpenNMS/jira/OIA-38

OIA-38: Fix plugin generation from archetype
OpenNMS · Jun 2, 2022 · f927b3e · f927b3e
2 parents b4f359d + f537dca
commit f927b3e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/archetypes/example-kar-plugin/src/main/resources/archetype-resources/README.md b/archetypes/example-kar-plugin/src/main/resources/archetype-resources/README.md
@@ -12,20 +12,29 @@ The generated plugin contains code examples to demonstrate how to create a:
 
 ## Developing
 
+
 Build and install the plugin into your local Maven repository using:
+
 ```
 mvn clean install
 ```
 
-> OpenNMS normally runs as root, so make sure the artifacts are installed in `/root/.m2` or try making `/root/.m2` symlink to your user's repository
+## Deploying through features file
 
 From the OpenNMS Karaf shell:
 ```
-feature:repo-add mvn:${groupId}/karaf-features/1.0.0-SNAPSHOT/xml
+feature:repo-add mvn:${groupId}/karaf-features/${version}/xml
+feature:install opennms-plugins-${pluginId}
+```
+
+## Deploying through kar file
+
+```
+cp assembly/kar/target/opennms-${pluginId}-plugin.kar /opt/opennms/deploy/
 feature:install opennms-plugins-${pluginId}
 ```
 
-Update automatically:
+## Update automatically:
 ```
 bundle:watch *
 ```

diff --git a/archetypes/example-kar-plugin/src/main/resources/archetype-resources/plugin/pom.xml b/archetypes/example-kar-plugin/src/main/resources/archetype-resources/plugin/pom.xml
@@ -53,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>

diff --git a/archetypes/example-kar-plugin/src/main/resources/archetype-resources/pom.xml b/archetypes/example-kar-plugin/src/main/resources/archetype-resources/pom.xml
@@ -61,7 +61,7 @@
             </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
+                <artifactId>osgi.core</artifactId>
                 <version>${osgi.version}</version>
             </dependency>
             <dependency>