found a few issues with running maven under jdk 6. Decided to bump the source and target java versions to 1.6, normalize the servlet-api dependency to 2.4, and remove references to a Java 1.7 RT class (java.util.Objects)

Author: Mark Adamcin

hmac/src/main/java/net/adamcin/httpsig/hmac/HmacKey.java

@@ -38,7 +38,6 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.Objects;
 import java.util.Set;
 
 public class HmacKey implements Key {
@@ -55,8 +54,14 @@ public class HmacKey implements Key {
      * @param secret The secret used to sign
      */
     public HmacKey(String keyId, String secret) {
-        this.keyId = Objects.requireNonNull(keyId, "keyId must not be null");
-        this.secret = Objects.requireNonNull(secret, "secret must not be null");
+        if (keyId == null) {
+            throw new NullPointerException("keyId must not be null");
+        }
+        if (secret == null) {
+            throw new NullPointerException("secret must not be null");
+        }
+        this.keyId = keyId;
+        this.secret = secret;
     }
 
     /**

http-helpers/src/test/java/net/adamcin/httpsig/http/HttpServerTestBody.java

@@ -39,7 +39,6 @@
 import net.adamcin.httpsig.ssh.jce.AuthorizedKeys;
 import net.adamcin.httpsig.testutil.KeyTestUtil;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.slf4j.Logger;
@@ -82,7 +81,7 @@ protected void setServlet(Servlet servlet) throws Exception {
 
     protected Integer getPort() {
         if (server.getConnectors().length > 0) {
-            return ((ServerConnector) server.getConnectors()[0]).getLocalPort();
+            return server.getConnectors()[0].getLocalPort();
         } else {
             return null;
         }

pom.xml

@@ -65,16 +65,16 @@
 
     <properties>
         <encoding>UTF-8</encoding>
-        <package-info.version>1.1.0</package-info.version>
-        <maven.compiler.source>1.5</maven.compiler.source>
-        <maven.compiler.target>1.5</maven.compiler.target>
+        <package-info.version>1.2.0</package-info.version>
+        <maven.compiler.source>1.6</maven.compiler.source>
+        <maven.compiler.target>1.6</maven.compiler.target>
         <slf4j.version>1.6.1</slf4j.version>
         <junit.version>4.11</junit.version>
         <maven.bundle.plugin.version>2.3.7</maven.bundle.plugin.version>
         <maven.scr.plugin.version>1.9.0</maven.scr.plugin.version>
         <scr.annotations.version>1.7.0</scr.annotations.version>
         <scr.generator.version>1.3.0</scr.generator.version>
-        <jetty.version>9.1.0.v20131115</jetty.version>
+        <jetty.version>7.6.16.v20140903</jetty.version>
     </properties>
 
     <issueManagement>
@@ -108,6 +108,10 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>1.3.1</version>
+                </plugin>
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>
                     <version>2.4.1</version>