This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new a3f0abb6d Clean up old Maven profiles
a3f0abb6d is described below
commit a3f0abb6dced9ce3c95af36bb5bca8c22f982ae8
Author: Andreas Veithen <[email protected]>
AuthorDate: Sun May 1 10:54:15 2022 +0000
Clean up old Maven profiles
We now require Java 11 for the build.
---
apidocs/pom.xml | 23 +++--------------------
systests/wildfly-tests/pom.xml | 13 +------------
2 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/apidocs/pom.xml b/apidocs/pom.xml
index 0df64e085..0c2254780 100644
--- a/apidocs/pom.xml
+++ b/apidocs/pom.xml
@@ -105,6 +105,9 @@
<windowtitle>Apache Axiom</windowtitle>
<!-- doctitle only appears in the summary and we should
include the version there -->
<doctitle>Apache Axiom ${project.version}</doctitle>
+ <additionalOptions>
+ <additionalOption>-html5</additionalOption>
+ </additionalOptions>
</configuration>
</plugin>
<plugin>
@@ -140,24 +143,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalOptions>
- <additionalOption>-html5</additionalOption>
- </additionalOptions>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/systests/wildfly-tests/pom.xml b/systests/wildfly-tests/pom.xml
index 2365079bc..bcefe402b 100644
--- a/systests/wildfly-tests/pom.xml
+++ b/systests/wildfly-tests/pom.xml
@@ -34,7 +34,7 @@
<properties>
<wildfly.version>25.0.1.Final</wildfly.version>
<wildfly.home>${project.build.directory}/wildfly-${wildfly.version}</wildfly.home>
- <wildfly.jigsawArgs />
+ <wildfly.jigsawArgs>--add-modules java.se</wildfly.jigsawArgs>
</properties>
<dependencies>
@@ -175,15 +175,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <properties>
- <wildfly.jigsawArgs>--add-modules java.se</wildfly.jigsawArgs>
- </properties>
- </profile>
- </profiles>
</project>
