Skip to content

Commit f323491

Browse files
bmarwellbmarwell
committed
[#519] Use moduleInfoSource, fix jdkVersion
1 parent 5bc95b2 commit f323491

File tree

6 files changed

+70
-30
lines changed

6 files changed

+70
-30
lines changed

‎api/pom.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,14 @@
7070
</goals>
7171
<configuration>
7272
<module>
73-
<moduleInfo>
74-
<name>io.jsonwebtoken.jjwt.api</name>
75-
<exports>
76-
io.jsonwebtoken;
77-
io.jsonwebtoken.*;
78-
</exports>
79-
</moduleInfo>
73+
<moduleInfoSource>
74+
module io.jsonwebtoken.jjwt.api {
75+
exports io.jsonwebtoken;
76+
exports io.jsonwebtoken.io;
77+
exports io.jsonwebtoken.lang;
78+
exports io.jsonwebtoken.security;
79+
}
80+
</moduleInfoSource>
8081
</module>
8182
</configuration>
8283
</execution>

‎extensions/gson/pom.xml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,19 @@
6464
</goals>
6565
<configuration>
6666
<module>
67-
<moduleInfo>
68-
<name>io.jsonwebtoken.jjwt.ext.gson</name>
69-
</moduleInfo>
67+
<moduleInfoSource>
68+
module io.jsonwebtoken.jjwt.ext.gson {
69+
requires transitive com.google.gson;
70+
requires io.jsonwebtoken.jjwt.api;
71+
72+
exports io.jsonwebtoken.gson.io;
73+
74+
provides io.jsonwebtoken.io.Deserializer with
75+
io.jsonwebtoken.gson.io.GsonDeserializer;
76+
provides io.jsonwebtoken.io.Serializer with
77+
io.jsonwebtoken.gson.io.GsonSerializer;
78+
}
79+
</moduleInfoSource>
7080
</module>
7181
</configuration>
7282
</execution>

‎extensions/jackson/pom.xml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,21 @@
9898
</goals>
9999
<configuration>
100100
<module>
101-
<moduleInfo>
102-
<name>io.jsonwebtoken.jjwt.ext.jackson</name>
103-
</moduleInfo>
101+
<moduleInfoSource>
102+
module io.jsonwebtoken.jjwt.ext.jackson {
103+
requires transitive com.fasterxml.jackson.core;
104+
requires transitive com.fasterxml.jackson.databind;
105+
requires io.jsonwebtoken.jjwt.api;
106+
107+
exports io.jsonwebtoken.jackson.io;
108+
109+
provides io.jsonwebtoken.io.Deserializer with
110+
io.jsonwebtoken.jackson.io.JacksonDeserializer;
111+
provides io.jsonwebtoken.io.Serializer with
112+
io.jsonwebtoken.jackson.io.JacksonSerializer;
113+
114+
}
115+
</moduleInfoSource>
104116
</module>
105117
</configuration>
106118
</execution>

‎extensions/orgjson/pom.xml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,18 @@
9898
</goals>
9999
<configuration>
100100
<module>
101-
<moduleInfo>
102-
<name>io.jsonwebtoken.jjwt.ext.orgjson</name>
103-
</moduleInfo>
101+
<moduleInfoSource>
102+
module io.jsonwebtoken.jjwt.ext.orgjson {
103+
requires transitive json;
104+
requires io.jsonwebtoken.jjwt.api;
105+
106+
exports io.jsonwebtoken.orgjson.io;
107+
108+
provides io.jsonwebtoken.io.Deserializer with io.jsonwebtoken.orgjson.io.OrgJsonDeserializer;
109+
provides io.jsonwebtoken.io.Serializer with io.jsonwebtoken.orgjson.io.OrgJsonSerializer;
110+
}
111+
112+
</moduleInfoSource>
104113
</module>
105114
</configuration>
106115
</execution>

‎impl/pom.xml‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,25 @@
8686
</goals>
8787
<configuration>
8888
<module>
89-
<moduleInfo>
90-
<name>io.jsonwebtoken.jjwt.impl</name>
91-
<requires>
92-
io.jsonwebtoken.jjwt.api;
93-
</requires>
94-
<uses>
95-
io.jsonwebtoken.CompressionCodec;
96-
io.jsonwebtoken.io.Deserializer;
97-
io.jsonwebtoken.io.Serializer;
98-
</uses>
99-
</moduleInfo>
89+
<moduleInfoSource>
90+
module io.jsonwebtoken.jjwt.impl {
91+
requires io.jsonwebtoken.jjwt.api;
92+
93+
exports io.jsonwebtoken.impl;
94+
exports io.jsonwebtoken.impl.compression;
95+
exports io.jsonwebtoken.impl.crypto;
96+
exports io.jsonwebtoken.impl.lang;
97+
98+
provides io.jsonwebtoken.CompressionCodec with
99+
io.jsonwebtoken.impl.compression.DeflateCompressionCodec,
100+
io.jsonwebtoken.impl.compression.GzipCompressionCodec;
101+
102+
uses io.jsonwebtoken.CompressionCodec;
103+
uses io.jsonwebtoken.io.Deserializer;
104+
uses io.jsonwebtoken.io.Serializer;
105+
}
106+
107+
</moduleInfoSource>
100108
</module>
101109
</configuration>
102110
</execution>

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<gmavenplus.version>1.6.1</gmavenplus.version>
7272
<moditect.version>1.0.0.RC2</moditect.version>
7373

74-
<jdk.version>1.7</jdk.version>
74+
<jdk.version>7</jdk.version>
7575
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7676
<buildNumber>${user.name}-${maven.build.timestamp}</buildNumber>
7777

@@ -550,8 +550,8 @@
550550
<jdk>[,9)</jdk>
551551
</activation>
552552
<properties>
553-
<maven.compiler.source>${jdk.version}</maven.compiler.source>
554-
<maven.compiler.target>${jdk.version}</maven.compiler.target>
553+
<maven.compiler.source>1.${jdk.version}</maven.compiler.source>
554+
<maven.compiler.target>1.${jdk.version}</maven.compiler.target>
555555
</properties>
556556
</profile>
557557
<profile>

0 commit comments

Comments
 (0)