Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add module-info support and run CI with Java 11 #1948

Merged
merged 7 commits into from
Feb 26, 2023
Merged

Add module-info support and run CI with Java 11 #1948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7e33491
Adds explicit module descriptors to a subset of modules (#1943)
aalmiray Feb 20, 2023
bae4b5f
Configure CI to run with Java 11
aalmiray Feb 20, 2023
12594b0
Merge branch 'master' into java-modules2
velo Feb 25, 2023
55bfd2d
Configure moditect for all modules, enable only on those that require…
aalmiray Feb 25, 2023
1233651
Do not skip moditect when running tests
aalmiray Feb 25, 2023
a60cbe8
Only skip modules that don't work with moditect plugin
velo Feb 26, 2023
feefe6e
Merge branch 'master' into java-modules2
velo Feb 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apt-test-generator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@

<properties>
<main.basedir>${project.basedir}/..</main.basedir>

<moditect.skip>true</moditect.skip>
</properties>

<dependencies>
Expand Down
2 changes: 2 additions & 0 deletions benchmark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
<rx.java.version>1.3.8</rx.java.version>
<netty.version>4.1.89.Final</netty.version>
<main.basedir>${project.basedir}/..</main.basedir>

<moditect.skip>true</moditect.skip>
</properties>

<dependencyManagement>
Expand Down
2 changes: 2 additions & 0 deletions jackson-jaxb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@

<properties>
<main.basedir>${project.basedir}/..</main.basedir>

<moditect.skip>true</moditect.skip>
</properties>

<dependencies>
Expand Down
7 changes: 2 additions & 5 deletions jaxrs2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,9 @@
<description>Feign JAX-RS 2</description>

<properties>
<!-- override default bytecode version for src/main from parent pom -->
<main.java.version>1.8</main.java.version>
<main.signature.artifact>java18</main.signature.artifact>
<main.basedir>${project.basedir}/..</main.basedir>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

<moditect.skip>true</moditect.skip>
</properties>

<dependencies>
Expand Down
37 changes: 37 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>

<moditect.skip>false</moditect.skip>
<!-- specifying jvm arguments -->
<jvm.options>-Duser.language=en</jvm.options>

Expand Down Expand Up @@ -112,6 +113,7 @@
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
<maven-deploy-plugin.version>3.1.0</maven-deploy-plugin.version>
<docker-maven-plugin.version>1.2.2</docker-maven-plugin.version>
<moditect-maven-plugin.version>1.0.0.RC2</moditect-maven-plugin.version>
</properties>
<url>https://github.com/openfeign/feign</url>
<inceptionYear>2012</inceptionYear>
Expand Down Expand Up @@ -460,6 +462,36 @@
</configuration>
</plugin>

<plugin>
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
<version>${moditect-maven-plugin.version}</version>
<executions>
<execution>
<id>add-module-infos</id>
<phase>package</phase>
<goals>
<goal>add-module-info</goal>
</goals>
<configuration>
<skip>${moditect.skip}</skip>
<overwriteExistingFiles>true</overwriteExistingFiles>
<module>
<moduleInfo>
<!-- module name will be derived from filename -->
<!-- export everything -->
<exports>*;</exports>
<!-- declare services consumed by the artifact -->
<addServiceUses>true</addServiceUses>
</moduleInfo>
</module>
<jdepsExtraArgs>
<arg>--multi-release=9</arg>
</jdepsExtraArgs>
</configuration>
</execution>
</executions>
</plugin>
Comment on lines +465 to +494
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we move this whole section to line 533 (outside pluginManagement), I see no reason to keep it in here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it can be safely moved.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. I moved, push and merged... didn't realized the push got a conflict and didn't moved 🤦‍♂️

</plugins>
</pluginManagement>

Expand Down Expand Up @@ -498,6 +530,11 @@
</executions>
</plugin>

<plugin>
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
Expand Down
2 changes: 2 additions & 0 deletions ribbon/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
<properties>
<main.basedir>${project.basedir}/..</main.basedir>
<ribbon-version>2.7.18</ribbon-version>

<moditect.skip>true</moditect.skip>
</properties>

<dependencyManagement>
Expand Down
2 changes: 2 additions & 0 deletions soap/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@

<properties>
<main.basedir>${project.basedir}/..</main.basedir>

<moditect.skip>true</moditect.skip>
</properties>

<dependencies>
Expand Down