master -> develop

.github/workflows/deploy.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Set up Java for publishing to Maven Central Repository
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
           server-id: sonatype-nexus-snapshots
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
@@ -35,7 +35,7 @@ jobs:
       - name: Set up Java for publishing to GitHub Packages
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
       - name: Publish to GitHub Packages
         run: mvn -P github,release -B deploy
         env:

.github/workflows/maven.yml

@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Build with Maven
         run: mvn -B clean package --file pom.xml -U
   #        run: mvn -B clean package jacoco:report --file pom.xml -U
@@ -28,8 +28,8 @@ jobs:
     strategy:
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
-        java: [ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 ]
-        os: [ ubuntu-20.04, windows-2019, macos-10.15 ]
+        java: [ 17, 18, 19, 20, 21 ]
+        os: [ ubuntu-22.04, windows-2022, macos-12 ]
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

README.md

@@ -12,6 +12,11 @@ Main features:
   sides
 - Flexible SPN resolution - you own the code and do not have to rely on magic SPN calculation algorithms
 
+Java Compatibility
+========
+Version 0.2.x+ requires Java 17 or higher
+Version 0.1.x+ supports Java 7+
+
 Installation
 ========
 
@@ -23,7 +28,7 @@ Kerb4J is available from Maven Central repo:
 <dependency>
     <groupId>com.kerb4j</groupId>
     <artifactId>kerb4j-client</artifactId>
-    <version>0.1.3</version>
+    <version>0.2.0</version>
 </dependency>
 ```
 
@@ -33,7 +38,7 @@ Kerb4J is available from Maven Central repo:
 <dependency>
     <groupId>com.kerb4j</groupId>
     <artifactId>kerb4j-server-spring-security</artifactId>
-    <version>0.1.3</version>
+    <version>0.2.0</version>
 </dependency>
 ```
 
@@ -43,7 +48,7 @@ Kerb4J is available from Maven Central repo:
 <dependency>
     <groupId>com.kerb4j</groupId>
     <artifactId>kerb4j-server-tomcat</artifactId>
-    <version>0.1.3</version>
+    <version>0.2.0</version>
 </dependency>
 ```
 

kerb4j-base64/kerb4j-base64-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>kerb4j-base64</artifactId>
         <groupId>com.kerb4j</groupId>
-        <version>0.1.3</version>
+        <version>0.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kerb4j-base64/kerb4j-base64-common/src/main/java/com/kerb4j/common/util/base64/Base64Codec.java

@@ -2,7 +2,7 @@
 
 public class Base64Codec {
 
-    private final static Base64CodecImpl impl = getImpl();
+    private static final Base64CodecImpl impl = getImpl();
 
     public static String encode(byte[] data) {
         return impl.encodeImpl(data);
@@ -16,11 +16,9 @@ private static Base64CodecImpl getImpl() {
         try {
             try {
                 Class.forName("java.util.Base64");
-                return (Base64CodecImpl) Class.forName("com.kerb4j.common.util.base64.Java8Base64").
-                        getConstructor().newInstance();
+                return (Base64CodecImpl) Class.forName("com.kerb4j.common.util.base64.Java8Base64").getConstructor().newInstance();
             } catch (ClassNotFoundException e) {
-                return (Base64CodecImpl) Class.forName("com.kerb4j.common.util.base64.DatatypeConverterCodec").
-                        getConstructor().newInstance();
+                return (Base64CodecImpl) Class.forName("com.kerb4j.common.util.base64.DatatypeConverterCodec").getConstructor().newInstance();
             }
         } catch (Exception e) {
             return null;

kerb4j-base64/kerb4j-base64-java8/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>kerb4j-base64</artifactId>
         <groupId>com.kerb4j</groupId>
-        <version>0.1.3</version>
+        <version>0.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.kerb4j</groupId>
             <artifactId>kerb4j-base64-common</artifactId>
-            <version>0.1.3</version>
+            <version>0.2.0</version>
         </dependency>
     </dependencies>
 
@@ -30,16 +30,16 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.6.2</version>
+                        <version>3.11.0</version>
                         <configuration>
-                            <source>1.8</source>
-                            <target>1.8</target>
+                            <source>17</source>
+                            <target>17</target>
                         </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>3.0.0</version>
+                        <version>3.4.0</version>
                         <executions>
                             <execution>
                                 <id>add-source</id>

kerb4j-base64/pom.xml

@@ -5,17 +5,15 @@
     <parent>
         <artifactId>kerb4j</artifactId>
         <groupId>com.kerb4j</groupId>
-        <version>0.1.3</version>
+        <version>0.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>kerb4j-base64</artifactId>
     <packaging>pom</packaging>
 
-
     <modules>
         <module>kerb4j-base64-common</module>
-        <module>kerb4j-base64-java7</module>
         <module>kerb4j-base64-java8</module>
     </modules>
 

kerb4j-client/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.kerb4j</groupId>
         <artifactId>kerb4j</artifactId>
-        <version>0.1.3</version>
+        <version>0.2.0</version>
     </parent>
 
     <artifactId>kerb4j-client</artifactId>
@@ -18,20 +18,20 @@
         <dependency>
             <groupId>com.kerb4j</groupId>
             <artifactId>kerb4j-common</artifactId>
-            <version>0.1.3</version>
+            <version>0.2.0</version>
         </dependency>
         <dependency>
             <groupId>com.kerb4j</groupId>
             <artifactId>kerb4j-common</artifactId>
-            <version>0.1.3</version>
+            <version>0.2.0</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.security.kerberos</groupId>
             <artifactId>spring-security-kerberos-web</artifactId>
-            <version>1.0.1.RELEASE</version>
+            <version>2.0.0</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -49,7 +49,6 @@
             <artifactId>kerb-simplekdc</artifactId>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 
 </project>

kerb4j-client/src/main/java/com/kerb4j/client/SpnegoHttpURLConnection.java

@@ -34,8 +34,11 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.security.PrivilegedActionException;
-import java.util.*;
-import java.util.concurrent.Callable;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 

kerb4j-client/src/test/java/com/kerb4j/client/SpnegoHttpURLConnectionTests.java

@@ -91,12 +91,12 @@ public void testSpnegoWithForward() throws Exception {
         huc.setRequestMethod("GET");
         huc.connect();
         int responseCode = huc.getResponseCode();
-        Assertions.assertEquals(401, responseCode);
+        //Forward is on and /login does not exist.
+        Assertions.assertEquals(404, responseCode);
     }
 
     @Test
     public void testSpnegoWithSuccessHandler() throws Exception {
-
         SimpleKdcServer kdc = getKdc();
         Assertions.assertNotNull(kdc);
         File workDir = getWorkDir();
@@ -149,11 +149,11 @@ public void testSpnegoWithSuccessHandler() throws Exception {
             Assertions.assertEquals("hello", br.readLine());
         }
 
-        // TODO: uncomment
+        // TODO: uncomment - rather provide a proper timeout test with kerby configured to generate very short token interval
         {
             // now let's test ticket renewal
 
-            Thread.sleep(400_000); // Make it a separate test probably with "slow" classifier somehow
+            //Thread.sleep(400_000); // Make it a separate test probably with "slow" classifier somehow
 
             HttpURLConnection huc = new SpnegoHttpURLConnection(spnegoClient).connect(new URL("http://" + host + ":" + port + "/hello"));
             BufferedReader br = new BufferedReader(new InputStreamReader(huc.getInputStream()));

kerb4j-client/src/test/java/com/kerb4j/client/TestAppConfiguration.java

@@ -1,6 +1,5 @@
 package com.kerb4j.client;
 
-
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
@@ -11,37 +10,28 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @Configuration
-@Import({
-        ServletWebServerFactoryAutoConfiguration.class,
+@Import({ServletWebServerFactoryAutoConfiguration.class,
         DispatcherServletAutoConfiguration.class,
         WebMvcAutoConfiguration.class,
         SecurityAutoConfiguration.class,
         HttpMessageConvertersAutoConfiguration.class,
         ErrorMvcAutoConfiguration.class,
-        PropertyPlaceholderAutoConfiguration.class
-})
+        PropertyPlaceholderAutoConfiguration.class})
 @Controller
 public class TestAppConfiguration {
 
-    @RequestMapping(
-            path = "/",
-            method = RequestMethod.GET,
-            produces = "text/plain")
     @ResponseBody
+    @GetMapping(path = "/", produces = "text/plain")
     public String home() {
         return "home";
     }
 
-    @RequestMapping(
-            path = "/hello",
-            method = RequestMethod.GET,
-            produces = "text/plain")
     @ResponseBody
+    @GetMapping(path = "/hello", produces = "text/plain")
     public String hello() {
         return "hello";
     }