Skip to content

Commit

Permalink
[jwtk#519] Use moduleInfoSource, fix jdkVersion
Browse files Browse the repository at this point in the history
  • Loading branch information
@bmarwell
bmarwell committed Jul 18, 2024
1 parent 9058f99 commit f7dd80a
Show file tree
Hide file tree
Showing 8 changed files with 71 additions and 29 deletions.
15 changes: 8 additions & 7 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 13 additions & 3 deletions extensions/gson/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,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>
Expand Down
18 changes: 15 additions & 3 deletions extensions/jackson/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,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>
Expand Down
15 changes: 12 additions & 3 deletions extensions/orgjson/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,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>
Expand Down
30 changes: 19 additions & 11 deletions impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,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>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-root</artifactId>
<version>0.11.3-SNAPSHOT</version>
<version>0.12.7-SNAPSHOT</version>
</parent>

<artifactId>jjwt-integration-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/unsigned-jackson/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-integration-tests</artifactId>
<version>0.11.3-SNAPSHOT</version>
<version>0.12.7-SNAPSHOT</version>
</parent>

<artifactId>jjwt-integration-tests-unsigned-jackson</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,8 @@
<jdk>[1.8,)</jdk>
</activation>
<properties>
<maven.compiler.source>${jdk.version}</maven.compiler.source>
<maven.compiler.target>${jdk.version}</maven.compiler.target>
<gmavenplus.version>3.0.2</gmavenplus.version>
<groovy.version>3.0.19</groovy.version>
<easymock.version>4.2</easymock.version>
Expand Down

0 comments on commit f7dd80a

Please sign in to comment.