Fixed #HZN-466.

Seperated the resource-cli tool into the contrib package and excluded the second slf4j implementation from the main build.
OpenNMS · Oct 7, 2015 · c2f693b · c2f693b
1 parent e1bb702
commit c2f693b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 22 deletions.
diff --git a/features/resource-cli/pom.xml b/features/resource-cli/pom.xml
@@ -20,18 +20,24 @@
 
     <dependencies>
         <dependency>
-            <groupId>args4j</groupId>
-            <artifactId>args4j</artifactId>
-            <version>${args4j.version}</version>
+            <groupId>org.opennms</groupId>
+            <artifactId>opennms-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opennms.core</groupId>
+            <artifactId>org.opennms.core.api</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.opennms</groupId>
-            <artifactId>opennms-model</artifactId>
+            <artifactId>opennms-webapp-rest</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-        <!-- Jersey for Rest and XML -->
+        <dependency>
+            <groupId>args4j</groupId>
+            <artifactId>args4j</artifactId>
+            <version>${args4j.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.sun.jersey.contribs</groupId>
             <artifactId>jersey-apache-client</artifactId>
@@ -43,7 +49,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-json</artifactId>
@@ -55,29 +60,20 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
-        <dependency>
-            <groupId>org.opennms.core</groupId>
-            <artifactId>org.opennms.core.api</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.7.12</version>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4jVersion}</version>
         </dependency>
-
         <dependency>
-            <groupId>org.opennms</groupId>
-            <artifactId>opennms-webapp-rest</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4jVersion}</version>
         </dependency>
-
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/opennms-base-assembly/pom.xml b/opennms-base-assembly/pom.xml
@@ -70,6 +70,13 @@
                   <classifier>jar-with-dependencies</classifier>
                   <outputDirectory>${project.build.directory}/jasperstudio-extension</outputDirectory>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.opennms.features</groupId>
+                  <artifactId>resource-cli</artifactId>
+                  <type>jar</type>
+                  <classifier>jar-with-dependencies</classifier>
+                  <outputDirectory>${project.build.directory}/resource-cli</outputDirectory>
+                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>
@@ -382,6 +389,7 @@
     <dependency>
       <groupId>org.opennms.features</groupId>
       <artifactId>resource-cli</artifactId>
+      <classifier>jar-with-dependencies</classifier>
       <version>${project.version}</version>
     </dependency>
     <!--

diff --git a/opennms-base-assembly/src/assembly/daemon.xml b/opennms-base-assembly/src/assembly/daemon.xml
@@ -59,6 +59,10 @@
       <directory>${project.build.directory}/jasperstudio-extension</directory>
       <outputDirectory>contrib/jasperstudio-extension</outputDirectory>
     </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}/resource-cli</directory>
+      <outputDirectory>contrib/resource-cli</outputDirectory>
+    </fileSet>
     <fileSet>
       <directory>${project.build.outputDirectory}/share</directory>
       <outputDirectory>share</outputDirectory>
@@ -123,7 +127,9 @@
         <exclude>org.opennms:opennms-install</exclude>
         <exclude>org.opennms.features:org.opennms.features.system-report</exclude>
         <exclude>org.opennms:opennms-jasperstudio-extension</exclude>
+        <exclude>org.opennms.features:resource-cli</exclude>
         <exclude>org.slf4j:slf4j-jdk14</exclude>
+        <exclude>org.slf4j:slf4j-simple</exclude>
         <!-- Exclude the dependency POMs -->
         <exclude>*:pom</exclude>
       </excludes>