Skip to content

Commit ef7f0ac

Browse files
senivamsenivam
authored
JPMS for the 4.0 - adapted from the 3.1.JPMS
2 parents 40a7793 + f0abb22 commit ef7f0ac

File tree

377 files changed

+7772
-457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

377 files changed

+7772
-457
lines changed

‎archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@
7070
<artifactId>maven-compiler-plugin</artifactId>
7171
<inherited>true</inherited>
7272
<configuration>
73-
<source>${java.version}</source>
74-
<target>${java.version}</target>
7573
<showWarnings>false</showWarnings>
7674
<fork>false</fork>
7775
</configuration>

‎archetypes/jersey-quickstart-grizzly2/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@
5353
</plugins>
5454

5555
</build>
56-
</project>
56+
</project>

‎archetypes/jersey-quickstart-grizzly2/src/main/resources/META-INF/maven/archetype-metadata.xml‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,38 @@
1818
-->
1919

2020
<archetype-descriptor
21-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
22-
name="jersey-quickstart-webapp"
23-
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
24-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
21+
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0 https://maven.apache.org/xsd/archetype-descriptor-1.1.0.xsd"
23+
name="quickstart">
2524
<fileSets>
26-
<fileSet filtered="true" packaged="true" encoding="UTF-8">
25+
<fileSet filtered="true" packaged="true">
26+
<excludes>
27+
<exclude>module-info.java</exclude>
28+
</excludes>
2729
<directory>src/main/java</directory>
2830
<includes>
29-
<include>**/*</include>
31+
<include>**/*.java</include>
3032
</includes>
3133
</fileSet>
32-
<!--<fileSet filtered="true" encoding="UTF-8">
33-
<directory>src/main/webapp</directory>
34-
</fileSet>-->
35-
<fileSet filtered="true" packaged="true" encoding="UTF-8">
34+
<fileSet filtered="true" packaged="false">
35+
<directory>src/main/java</directory>
36+
<includes>
37+
<include>module-info.java</include>
38+
</includes>
39+
</fileSet>
40+
<fileSet filtered="true" packaged="true">
41+
<excludes>
42+
<exclude>module-info.java</exclude>
43+
</excludes>
44+
<directory>src/test/java</directory>
45+
<includes>
46+
<include>**/*.java</include>
47+
</includes>
48+
</fileSet>
49+
<fileSet filtered="true" packaged="false">
3650
<directory>src/test/java</directory>
3751
<includes>
38-
<include>**/*</include>
52+
<include>module-info.java</include>
3953
</includes>
4054
</fileSet>
4155
</fileSets>

‎archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@
5252
<artifactId>maven-compiler-plugin</artifactId>
5353
<version>${compiler.mvn.plugin.version}</version>
5454
<inherited>true</inherited>
55-
<configuration>
56-
<source>1.8</source>
57-
<target>1.8</target>
58-
</configuration>
5955
</plugin>
6056
<plugin>
6157
<groupId>org.codehaus.mojo</groupId>

‎archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/src/main/java/module-info.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
module ${package}.module {
2+
requires jakarta.ws.rs;
3+
4+
requires org.glassfish.grizzly.http.server;
5+
6+
requires org.glassfish.jersey.core.server;
7+
requires org.glassfish.jersey.container.grizzly2.http;
8+
9+
exports ${package};
10+
}

‎archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/src/test/java/MyResourceTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
package $package;
1+
package ${package}.test;
22

33
import jakarta.ws.rs.client.Client;
44
import jakarta.ws.rs.client.ClientBuilder;
55
import jakarta.ws.rs.client.WebTarget;
66

77
import org.glassfish.grizzly.http.server.HttpServer;
88

9+
import ${package}.Main;
10+
911
import org.junit.jupiter.api.AfterEach;
1012
import org.junit.jupiter.api.BeforeEach;
1113
import org.junit.jupiter.api.Test;

‎archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/src/test/java/module-info.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module ${package}.module.test {
2+
requires jakarta.ws.rs;
3+
4+
requires org.junit.jupiter.api;
5+
6+
requires com.example.archetype.grizzly.module;
7+
8+
exports ${package}.test;
9+
}

‎archetypes/jersey-quickstart-webapp/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@
5252
</resource>
5353
</resources>
5454
</build>
55-
</project>
55+
</project>

‎archetypes/jersey-quickstart-webapp/src/main/resources/META-INF/maven/archetype-metadata.xml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,27 @@
1818
-->
1919

2020
<archetype-descriptor
21-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
22-
name="jersey-quickstart-webapp"
23-
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
24-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
21+
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0 https://maven.apache.org/xsd/archetype-descriptor-1.1.0.xsd"
23+
name="quickstart">
2524
<fileSets>
26-
<fileSet filtered="true" packaged="true" encoding="UTF-8">
25+
<fileSet filtered="true" packaged="true">
26+
<excludes>
27+
<exclude>module-info.java</exclude>
28+
</excludes>
2729
<directory>src/main/java</directory>
28-
</fileSet>
29-
<fileSet filtered="true" encoding="UTF-8">
30-
<directory>src/main/webapp</directory>
3130
<includes>
32-
<include>**/*</include>
31+
<include>**/*.java</include>
3332
</includes>
3433
</fileSet>
35-
<fileSet filtered="true" packaged="true" encoding="UTF-8">
36-
<directory>src/test/java</directory>
34+
<fileSet filtered="true" packaged="false">
35+
<directory>src/main/java</directory>
3736
<includes>
38-
<include>**/*</include>
37+
<include>module-info.java</include>
3938
</includes>
4039
</fileSet>
40+
<fileSet filtered="true" packaged="false">
41+
<directory>src/main/webapp</directory>
42+
</fileSet>
4143
</fileSets>
4244
</archetype-descriptor>

‎archetypes/jersey-quickstart-webapp/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
<artifactId>maven-compiler-plugin</artifactId>
1818
<version>${compiler.mvn.plugin.version}</version>
1919
<inherited>true</inherited>
20-
<configuration>
21-
<source>1.8</source>
22-
<target>1.8</target>
23-
</configuration>
2420
</plugin>
2521
<plugin>
2622
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)