diff --git a/pom.xml b/pom.xml
index 343cecbdc..e2e2deeb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,7 +196,7 @@
     <profile>
       <id>xstream-release</id>
       <properties>
-        <version.java.enforced>[16,17)</version.java.enforced>
+        <version.java.enforced>[17,18)</version.java.enforced>
       </properties>
       <build>
         <plugins>
@@ -1139,8 +1139,8 @@
     <version.xpp3>1.1.4c</version.xpp3>
 
     <jar.module.name>${project.artifactId}</jar.module.name>
-    <javadoc.java.release>16</javadoc.java.release>
-    <javadoc.link.javase>https://docs.oracle.com/en/java/javase/16/docs/api/</javadoc.link.javase>
+    <javadoc.java.release>17</javadoc.java.release>
+    <javadoc.link.javase>https://docs.oracle.com/en/java/javase/${javadoc.java.release}/docs/api/</javadoc.link.javase>
 
     <argLine>${surefire.argline}</argLine>
     <javadoc.doclint>-missing</javadoc.doclint>
diff --git a/xstream-benchmark/pom.xml b/xstream-benchmark/pom.xml
index 75a6f525b..59f06084f 100644
--- a/xstream-benchmark/pom.xml
+++ b/xstream-benchmark/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <!--
      Copyright (C) 2006 Joe Walnes.
-     Copyright (C) 2006, 2007, 2009, 2011, 2012, 2013, 2015, 2017, 2018, 2019, 2020 XStream committers.
+     Copyright (C) 2006, 2007, 2009, 2011, 2012, 2013, 2015, 2017, 2018, 2019, 2020, 2022 XStream committers.
      All rights reserved.
      
      The software in this package is published under the terms of the BSD
@@ -23,9 +23,9 @@
 
   <profiles>
     <profile>
-      <id>jdk16</id>
+      <id>jdk17</id>
       <activation>
-        <jdk>16</jdk>
+        <jdk>17</jdk>
       </activation>
       <build>
         <plugins>
diff --git a/xstream-distribution/pom.xml b/xstream-distribution/pom.xml
index 45c8f1b9f..40951420c 100644
--- a/xstream-distribution/pom.xml
+++ b/xstream-distribution/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <!--
      Copyright (C) 2006 Joe Walnes.
-     Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012, 2013, 2015, 2016, 2018, 2020 XStream committers.
+     Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012, 2013, 2015, 2016, 2018, 2020, 2022 XStream committers.
      All rights reserved.
      
      The software in this package is published under the terms of the BSD
@@ -48,9 +48,9 @@
 
   <profiles>
     <profile>
-      <id>jdk16</id>
+      <id>jdk17</id>
       <activation>
-        <jdk>16</jdk>
+        <jdk>17</jdk>
       </activation>
       <build>
         <plugins>
diff --git a/xstream-hibernate/pom.xml b/xstream-hibernate/pom.xml
index 1ac0f9225..cb2a27df9 100644
--- a/xstream-hibernate/pom.xml
+++ b/xstream-hibernate/pom.xml
@@ -24,9 +24,9 @@
 
   <profiles>
     <profile>
-      <id>jdk16</id>
+      <id>jdk17</id>
       <activation>
-        <jdk>16</jdk>
+        <jdk>17</jdk>
       </activation>
       <build>
         <plugins>
diff --git a/xstream/pom.xml b/xstream/pom.xml
index bcd383265..9da71d80c 100644
--- a/xstream/pom.xml
+++ b/xstream/pom.xml
@@ -253,9 +253,9 @@
 
   <profiles>
     <profile>
-      <id>jdk16</id>
+      <id>jdk17</id>
       <activation>
-        <jdk>16</jdk>
+        <jdk>17</jdk>
       </activation>
       <build>
         <plugins>