From dcc11770b105f1111fbf23f394b056f845173f6b Mon Sep 17 00:00:00 2001
From: Ronny Trommer <ronny@opennms.org>
Date: Fri, 8 Dec 2017 13:36:32 +0100
Subject: [PATCH] Cleanup and bump version numbers

---
 .circleci/config.yml                          | 38 ++++++++++++++++++
 pom.xml                                       | 39 ++++++++++---------
 .../CollectionChecker.java                    |  0
 .../PollerChecker.java                        |  0
 .../RequisitionChecker.java                   |  0
 .../{config.audit => config}/Starter.java     |  0
 .../model/NotificationCompound.java           |  0
 .../model/ServiceCompound.java                |  0
 .../ServiceCompoundsRendererExcel.java        |  0
 .../ServiceCompoundsRendererTabOutput.java    |  0
 10 files changed, 58 insertions(+), 19 deletions(-)
 create mode 100644 .circleci/config.yml
 rename src/main/java/org/opennms/forge/{config.audit => config}/CollectionChecker.java (100%)
 rename src/main/java/org/opennms/forge/{config.audit => config}/PollerChecker.java (100%)
 rename src/main/java/org/opennms/forge/{config.audit => config}/RequisitionChecker.java (100%)
 rename src/main/java/org/opennms/forge/{config.audit => config}/Starter.java (100%)
 rename src/main/java/org/opennms/forge/{config.audit => config}/model/NotificationCompound.java (100%)
 rename src/main/java/org/opennms/forge/{config.audit => config}/model/ServiceCompound.java (100%)
 rename src/main/java/org/opennms/forge/{config.audit => config}/renderer/ServiceCompoundsRendererExcel.java (100%)
 rename src/main/java/org/opennms/forge/{config.audit => config}/renderer/ServiceCompoundsRendererTabOutput.java (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..85f6235
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,38 @@
+# Java Maven CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-java/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: circleci/openjdk:8-jdk
+
+    working_directory: ~/build
+
+    environment:
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "pom.xml" }}
+
+      # Compile
+      - run:
+          name: Compile source root
+          command: |
+            mvn -DskipTests install
+
+      - run:
+          name: Run JUnit tests
+          command: |
+            mvn install
+
+      - save_cache:
+          paths:
+            - ~/.m2
+          key: v1-dependencies-{{ checksum "pom.xml" }}
diff --git a/pom.xml b/pom.xml
index 865cec3..7fb5d50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,54 +13,55 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <opennmsVersion>1.12.6</opennmsVersion>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+
+        <opennms.version>1.12.6</opennms.version>
+        <guava.version>23.0</guava.version>
+        <ch.qos.logback.version>1.2.3</ch.qos.logback.version>
+        <slf4j-api.version>1.7.25</slf4j-api.version>
+        <junit.version>4.12</junit.version>
+        <jxl.version>2.6.12</jxl.version>
+        <maven.compiler.version>3.7.0</maven.compiler.version>
     </properties>
 
     <dependencies>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.7</version>
+            <version>${slf4j-api.version}</version>
         </dependency>
-
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.1.2</version>
+            <version>${ch.qos.logback.version}</version>
         </dependency>
-
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>17.0</version>
+            <version>${guava.version}</version>
         </dependency>
-
         <dependency>
             <groupId>net.sourceforge.jexcelapi</groupId>
             <artifactId>jxl</artifactId>
-            <version>2.6.12</version>
+            <version>${jxl.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.opennms</groupId>
             <artifactId>opennms-provision-persistence</artifactId>
-            <version>${opennmsVersion}</version>
+            <version>${opennms.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.opennms</groupId>
             <artifactId>opennms-config-model</artifactId>
-            <version>${opennmsVersion}</version>
+            <version>${opennms.version}</version>
         </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
-        
     </dependencies>
 
     <build>
@@ -68,10 +69,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.5.1</version>
+                <version>${maven.compiler.version}</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/main/java/org/opennms/forge/config.audit/CollectionChecker.java b/src/main/java/org/opennms/forge/config/CollectionChecker.java
similarity index 100%
rename from src/main/java/org/opennms/forge/config.audit/CollectionChecker.java
rename to src/main/java/org/opennms/forge/config/CollectionChecker.java
diff --git a/src/main/java/org/opennms/forge/config.audit/PollerChecker.java b/src/main/java/org/opennms/forge/config/PollerChecker.java
similarity index 100%
rename from src/main/java/org/opennms/forge/config.audit/PollerChecker.java
rename to src/main/java/org/opennms/forge/config/PollerChecker.java
diff --git a/src/main/java/org/opennms/forge/config.audit/RequisitionChecker.java b/src/main/java/org/opennms/forge/config/RequisitionChecker.java
similarity index 100%
rename from src/main/java/org/opennms/forge/config.audit/RequisitionChecker.java
rename to src/main/java/org/opennms/forge/config/RequisitionChecker.java
diff --git a/src/main/java/org/opennms/forge/config.audit/Starter.java b/src/main/java/org/opennms/forge/config/Starter.java
similarity index 100%
rename from src/main/java/org/opennms/forge/config.audit/Starter.java
rename to src/main/java/org/opennms/forge/config/Starter.java
diff --git a/src/main/java/org/opennms/forge/config.audit/model/NotificationCompound.java b/src/main/java/org/opennms/forge/config/model/NotificationCompound.java
similarity index 100%
rename from src/main/java/org/opennms/forge/config.audit/model/NotificationCompound.java
rename to src/main/java/org/opennms/forge/config/model/NotificationCompound.java
diff --git a/src/main/java/org/opennms/forge/config.audit/model/ServiceCompound.java b/src/main/java/org/opennms/forge/config/model/ServiceCompound.java
similarity index 100%
rename from src/main/java/org/opennms/forge/config.audit/model/ServiceCompound.java
rename to src/main/java/org/opennms/forge/config/model/ServiceCompound.java
diff --git a/src/main/java/org/opennms/forge/config.audit/renderer/ServiceCompoundsRendererExcel.java b/src/main/java/org/opennms/forge/config/renderer/ServiceCompoundsRendererExcel.java
similarity index 100%
rename from src/main/java/org/opennms/forge/config.audit/renderer/ServiceCompoundsRendererExcel.java
rename to src/main/java/org/opennms/forge/config/renderer/ServiceCompoundsRendererExcel.java
diff --git a/src/main/java/org/opennms/forge/config.audit/renderer/ServiceCompoundsRendererTabOutput.java b/src/main/java/org/opennms/forge/config/renderer/ServiceCompoundsRendererTabOutput.java
similarity index 100%
rename from src/main/java/org/opennms/forge/config.audit/renderer/ServiceCompoundsRendererTabOutput.java
rename to src/main/java/org/opennms/forge/config/renderer/ServiceCompoundsRendererTabOutput.java