This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
commit 00eacb6a8d543d73de5bde90d28806857359e08e
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Jun 15 10:45:35 2023 -0400
JPMS
---
commons-fileupload2-core/pom.xml | 42 +++---------------------
commons-fileupload2-jakarta/pom.xml | 2 ++
commons-fileupload2-javax/pom.xml | 1 +
commons-fileupload2-portlet/pom.xml | 1 +
pom.xml | 64 ++++++++++++++++++++-----------------
5 files changed, 43 insertions(+), 67 deletions(-)
diff --git a/commons-fileupload2-core/pom.xml b/commons-fileupload2-core/pom.xml
index a69cdc3..d66f10d 100644
--- a/commons-fileupload2-core/pom.xml
+++ b/commons-fileupload2-core/pom.xml
@@ -34,18 +34,19 @@
<properties>
<commons.parent.dir>${basedir}/..</commons.parent.dir>
+
<commons.module.name>org.apache.commons.fileupload2.core</commons.module.name>
</properties>
<dependencies>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -53,37 +54,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <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>
- <jvmVersion>9</jvmVersion>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <overwriteExistingFiles>true</overwriteExistingFiles>
- <module>
- <moduleInfo>
- <name>org.apache.commons.fileupload2</name>
- <exports>
- !org.apache.commons.fileupload2.impl;
- *;
- </exports>
- </moduleInfo>
- </module>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/commons-fileupload2-jakarta/pom.xml
b/commons-fileupload2-jakarta/pom.xml
index 942d32b..fd5c945 100644
--- a/commons-fileupload2-jakarta/pom.xml
+++ b/commons-fileupload2-jakarta/pom.xml
@@ -34,6 +34,7 @@
<properties>
<commons.parent.dir>${basedir}/..</commons.parent.dir>
+
<commons.module.name>org.apache.commons.fileupload2.jakarta</commons.module.name>
</properties>
<dependencies>
@@ -70,4 +71,5 @@
<scope>test</scope>
</dependency>
</dependencies>
+
</project>
diff --git a/commons-fileupload2-javax/pom.xml
b/commons-fileupload2-javax/pom.xml
index 7543b93..84e98b5 100644
--- a/commons-fileupload2-javax/pom.xml
+++ b/commons-fileupload2-javax/pom.xml
@@ -34,6 +34,7 @@
<properties>
<commons.parent.dir>${basedir}/..</commons.parent.dir>
+
<commons.module.name>org.apache.commons.fileupload2.javax</commons.module.name>
</properties>
<dependencies>
diff --git a/commons-fileupload2-portlet/pom.xml
b/commons-fileupload2-portlet/pom.xml
index ea2d5f3..f5b2740 100644
--- a/commons-fileupload2-portlet/pom.xml
+++ b/commons-fileupload2-portlet/pom.xml
@@ -34,6 +34,7 @@
<properties>
<commons.parent.dir>${basedir}/..</commons.parent.dir>
+
<commons.module.name>org.apache.commons.fileupload2.portlet</commons.module.name>
</properties>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 4b5c5de..3b4ba63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -309,34 +309,6 @@
</dependency>
</dependencies>
</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>
- <jvmVersion>9</jvmVersion>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <overwriteExistingFiles>true</overwriteExistingFiles>
- <module>
- <moduleInfo>
- <name>org.apache.commons.fileupload2</name>
- <exports>
- !org.apache.commons.fileupload2.impl;
- *;
- </exports>
- </moduleInfo>
- </module>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -558,10 +530,42 @@
</properties>
</profile>
<profile>
- <id>release</id>
+ <id>moditect</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
<properties>
- <moditect.skip>false</moditect.skip>
+ <!-- Disable JPMS junk heap until we can get it to work -->
+ <moditect.skip>true</moditect.skip>
</properties>
+ <build>
+ <plugins>
+ <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>
+ <jvmVersion>9</jvmVersion>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <overwriteExistingFiles>true</overwriteExistingFiles>
+ <module>
+ <moduleInfo>
+ <name>${commons.module.name}</name>
+ </moduleInfo>
+ </module>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
<modules>
