Merge pull request #12 from dbmdz/0.3.6-RC1

Release 0.3.6
dbmdz · Jan 30, 2019 · 9307df7 · 9307df7
2 parents 4a38d98 + 8930ed4
commit 9307df7
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 23 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>de.digitalcollections.iiif</groupId>
   <artifactId>iiif-apis</artifactId>
-  <version>0.3.6-SNAPSHOT</version>
+  <version>0.3.6</version>
   <packaging>jar</packaging>
 
   <name>DigitalCollections: IIIF API Library</name>
@@ -52,30 +52,33 @@
   </scm>
 
   <properties>
+    <java.version>1.8</java.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <version.assertj>3.8.0</version.assertj>
+    <version.assertj>3.10.0</version.assertj>
     <version.assertj-json>1.1.0</version.assertj-json>
-    <version.dc-model>2.0.0</version.dc-model>
-    <version.geojson>1.8</version.geojson>
+    <version.dc-model>2.2.0</version.dc-model>
+    <version.geojson>1.8.1</version.geojson>
     <version.guava>23.0</version.guava>
     <version.jackson>2.9.8</version.jackson>
     <version.jsonassert>1.5.0</version.jsonassert>
     <version.junit>5.3.2</version.junit>
-    <version.reflections>0.9.10</version.reflections>
+    <version.reflections>0.9.11</version.reflections>
+    <version.spotbugs>3.1.10</version.spotbugs>
     <version.uri-toolkit>0.8</version.uri-toolkit>
 
     <!-- plugins -->
-    <version.jacoco-maven-plugin>0.8.2</version.jacoco-maven-plugin>
+    <version.jacoco-maven-plugin>0.8.3</version.jacoco-maven-plugin>
     <version.maven-checkstyle-plugin>3.0.0</version.maven-checkstyle-plugin>
-    <version.maven-compiler-plugin>3.7.0</version.maven-compiler-plugin>
+    <version.maven-compiler-plugin>3.8.0</version.maven-compiler-plugin>
     <version.maven-gpg-plugin>1.6</version.maven-gpg-plugin>
     <version.maven-javadoc-plugin>3.0.1</version.maven-javadoc-plugin>
     <version.maven-source-plugin>3.0.1</version.maven-source-plugin>
     <version.maven-surefire-plugin>2.22.1</version.maven-surefire-plugin>
-    <version.nexus-staging-maven-plugin>1.6.7</version.nexus-staging-maven-plugin>
+    <version.nexus-staging-maven-plugin>1.6.8</version.nexus-staging-maven-plugin>
+    <version.spotbugs-maven-plugin>3.1.10</version.spotbugs-maven-plugin>
   </properties>
 
   <dependencies>
@@ -158,6 +161,29 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <version>${version.spotbugs-maven-plugin}</version>
+        <dependencies>
+          <!-- overwrite dependency on spotbugs if you want to specify the version of spotbugs -->
+          <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs</artifactId>
+            <version>${version.spotbugs}</version>
+          </dependency>
+        </dependencies>
+        <configuration>
+          <failOnError>false</failOnError>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
@@ -184,37 +210,36 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${version.maven-compiler-plugin}</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
           <!-- Needed to access parameter names at runtime -->
           <compilerArgument>-parameters</compilerArgument>
+          <showDeprecation>true</showDeprecation>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>${version.maven-source-plugin}</version>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${version.maven-javadoc-plugin}</version>
+        <configuration>
+          <source>8</source>
+        </configuration>
         <executions>
           <execution>
-            <id>attach-sources</id>
+            <id>attach-javadocs</id>
             <goals>
-              <goal>jar-no-fork</goal>
+              <goal>jar</goal>
             </goals>
           </execution>
         </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>${version.maven-javadoc-plugin}</version>
-        <configuration>
-          <source>8</source>
-        </configuration>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>${version.maven-source-plugin}</version>
         <executions>
           <execution>
-            <id>attach-javadocs</id>
+            <id>attach-sources</id>
             <goals>
-              <goal>jar</goal>
+              <goal>jar-no-fork</goal>
             </goals>
           </execution>
         </executions>

diff --git a/src/test/java/de/digitalcollections/iiif/model/JsonMappingTest.java b/src/test/java/de/digitalcollections/iiif/model/JsonMappingTest.java
@@ -37,10 +37,10 @@ public void setup() {
 
   @Test
   public void testCopyConstructor() {
-    IiifObjectMapper test_mapper = new IiifObjectMapper();
+    IiifObjectMapper testMapper = new IiifObjectMapper();
 
     // in newer jackson versions the `copy()` method needs to be public
-    ObjectMapper cloned_mapper = test_mapper.copy();
+    testMapper.copy();
   }
 
   @Test