From f3234917de4a8cffef5cea514773fdfdfaeeac2c Mon Sep 17 00:00:00 2001
From: Benjamin Marwell <bmarwell@apache.org>
Date: Tue, 19 Apr 2022 22:24:44 +0200
Subject: [PATCH] [#519] Use moduleInfoSource, fix jdkVersion

---
 api/pom.xml                | 15 ++++++++-------
 extensions/gson/pom.xml    | 16 +++++++++++++---
 extensions/jackson/pom.xml | 18 +++++++++++++++---
 extensions/orgjson/pom.xml | 15 ++++++++++++---
 impl/pom.xml               | 30 +++++++++++++++++++-----------
 pom.xml                    |  6 +++---
 6 files changed, 70 insertions(+), 30 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index aba3f5def..5e83d74c9 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -70,13 +70,14 @@
                                 </goals>
                                 <configuration>
                                     <module>
-                                        <moduleInfo>
-                                            <name>io.jsonwebtoken.jjwt.api</name>
-                                            <exports>
-                                                io.jsonwebtoken;
-                                                io.jsonwebtoken.*;
-                                            </exports>
-                                        </moduleInfo>
+                                        <moduleInfoSource>
+                                            module io.jsonwebtoken.jjwt.api {
+                                                exports io.jsonwebtoken;
+                                                exports io.jsonwebtoken.io;
+                                                exports io.jsonwebtoken.lang;
+                                                exports io.jsonwebtoken.security;
+                                            }
+                                        </moduleInfoSource>
                                     </module>
                                 </configuration>
                             </execution>
diff --git a/extensions/gson/pom.xml b/extensions/gson/pom.xml
index 21333a497..fd6667192 100644
--- a/extensions/gson/pom.xml
+++ b/extensions/gson/pom.xml
@@ -64,9 +64,19 @@
                                 </goals>
                                 <configuration>
                                     <module>
-                                        <moduleInfo>
-                                            <name>io.jsonwebtoken.jjwt.ext.gson</name>
-                                        </moduleInfo>
+                                        <moduleInfoSource>
+                                            module io.jsonwebtoken.jjwt.ext.gson {
+                                                requires transitive com.google.gson;
+                                                requires io.jsonwebtoken.jjwt.api;
+
+                                                exports io.jsonwebtoken.gson.io;
+
+                                                provides io.jsonwebtoken.io.Deserializer with
+                                                io.jsonwebtoken.gson.io.GsonDeserializer;
+                                                provides io.jsonwebtoken.io.Serializer with
+                                                io.jsonwebtoken.gson.io.GsonSerializer;
+                                            }
+                                        </moduleInfoSource>
                                     </module>
                                 </configuration>
                             </execution>
diff --git a/extensions/jackson/pom.xml b/extensions/jackson/pom.xml
index fde25ba8a..11e2d82bf 100644
--- a/extensions/jackson/pom.xml
+++ b/extensions/jackson/pom.xml
@@ -98,9 +98,21 @@
                                 </goals>
                                 <configuration>
                                     <module>
-                                        <moduleInfo>
-                                            <name>io.jsonwebtoken.jjwt.ext.jackson</name>
-                                        </moduleInfo>
+                                        <moduleInfoSource>
+                                            module io.jsonwebtoken.jjwt.ext.jackson {
+                                                requires transitive com.fasterxml.jackson.core;
+                                                requires transitive com.fasterxml.jackson.databind;
+                                                requires io.jsonwebtoken.jjwt.api;
+
+                                                exports io.jsonwebtoken.jackson.io;
+
+                                                provides io.jsonwebtoken.io.Deserializer with
+                                                io.jsonwebtoken.jackson.io.JacksonDeserializer;
+                                                provides io.jsonwebtoken.io.Serializer with
+                                                io.jsonwebtoken.jackson.io.JacksonSerializer;
+
+                                            }
+                                        </moduleInfoSource>
                                     </module>
                                 </configuration>
                             </execution>
diff --git a/extensions/orgjson/pom.xml b/extensions/orgjson/pom.xml
index 894bb9d7b..938ba2482 100644
--- a/extensions/orgjson/pom.xml
+++ b/extensions/orgjson/pom.xml
@@ -98,9 +98,18 @@
                                 </goals>
                                 <configuration>
                                     <module>
-                                        <moduleInfo>
-                                            <name>io.jsonwebtoken.jjwt.ext.orgjson</name>
-                                        </moduleInfo>
+                                        <moduleInfoSource>
+                                            module io.jsonwebtoken.jjwt.ext.orgjson {
+                                                requires transitive json;
+                                                requires io.jsonwebtoken.jjwt.api;
+
+                                                exports io.jsonwebtoken.orgjson.io;
+
+                                                provides io.jsonwebtoken.io.Deserializer with io.jsonwebtoken.orgjson.io.OrgJsonDeserializer;
+                                                provides io.jsonwebtoken.io.Serializer with io.jsonwebtoken.orgjson.io.OrgJsonSerializer;
+                                            }
+
+                                        </moduleInfoSource>
                                     </module>
                                 </configuration>
                             </execution>
diff --git a/impl/pom.xml b/impl/pom.xml
index f9c753cdf..e7f7a03aa 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -86,17 +86,25 @@
                                 </goals>
                                 <configuration>
                                     <module>
-                                        <moduleInfo>
-                                            <name>io.jsonwebtoken.jjwt.impl</name>
-                                            <requires>
-                                                io.jsonwebtoken.jjwt.api;
-                                            </requires>
-                                            <uses>
-                                                io.jsonwebtoken.CompressionCodec;
-                                                io.jsonwebtoken.io.Deserializer;
-                                                io.jsonwebtoken.io.Serializer;
-                                            </uses>
-                                        </moduleInfo>
+                                        <moduleInfoSource>
+                                            module io.jsonwebtoken.jjwt.impl {
+                                                requires io.jsonwebtoken.jjwt.api;
+
+                                                exports io.jsonwebtoken.impl;
+                                                exports io.jsonwebtoken.impl.compression;
+                                                exports io.jsonwebtoken.impl.crypto;
+                                                exports io.jsonwebtoken.impl.lang;
+
+                                                provides io.jsonwebtoken.CompressionCodec with
+                                                    io.jsonwebtoken.impl.compression.DeflateCompressionCodec,
+                                                    io.jsonwebtoken.impl.compression.GzipCompressionCodec;
+
+                                                uses io.jsonwebtoken.CompressionCodec;
+                                                uses io.jsonwebtoken.io.Deserializer;
+                                                uses io.jsonwebtoken.io.Serializer;
+                                            }
+
+                                        </moduleInfoSource>
                                     </module>
                                 </configuration>
                             </execution>
diff --git a/pom.xml b/pom.xml
index e935f0e2b..00acfbfa5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
         <gmavenplus.version>1.6.1</gmavenplus.version>
         <moditect.version>1.0.0.RC2</moditect.version>
 
-        <jdk.version>1.7</jdk.version>
+        <jdk.version>7</jdk.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <buildNumber>${user.name}-${maven.build.timestamp}</buildNumber>
 
@@ -550,8 +550,8 @@
                 <jdk>[,9)</jdk>
             </activation>
             <properties>
-                <maven.compiler.source>${jdk.version}</maven.compiler.source>
-                <maven.compiler.target>${jdk.version}</maven.compiler.target>
+                <maven.compiler.source>1.${jdk.version}</maven.compiler.source>
+                <maven.compiler.target>1.${jdk.version}</maven.compiler.target>
             </properties>
         </profile>
         <profile>