You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2021/06/25 08:19:50 UTC
[wicket] branch master updated (d79c4c2 -> 5136688)
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git.
from d79c4c2 WICKET-6897 Javadoc build fails on fresh checkout of master or rel/wicket-9.3.0
new f0d01b8 Remove dependencies which already come as transitive ones from wicket-native-websocket-core
new 5136688 WICKET-6897 Javadoc build fails on fresh checkout of master or rel/wicket-9.3.0
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 102 ++++++++-------------
.../wicket-native-websocket-core/pom.xml | 2 -
.../wicket-native-websocket-javax/pom.xml | 8 --
3 files changed, 36 insertions(+), 76 deletions(-)
[wicket] 02/02: WICKET-6897 Javadoc build fails on fresh checkout
of master or rel/wicket-9.3.0
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 5136688e7b6da05c7cacfd73be5f6051e17de9da
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Fri Jun 25 11:17:20 2021 +0300
WICKET-6897 Javadoc build fails on fresh checkout of master or rel/wicket-9.3.0
Simplify the setup of maven-javadoc-plugin by using Maven properties
(cherry picked from commit 580ab68797cf983bdf681e225217f5230f082a7e)
---
pom.xml | 102 +++++++++++++++++++++++-----------------------------------------
1 file changed, 36 insertions(+), 66 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1ed58e0..99c2718 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,6 +124,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <javadoc.additionalJOption/>
+ <javadoc.jdk.apidocs.link>https://docs.oracle.com/en/java/javase/${java.specification.version}/docs/api/</javadoc.jdk.apidocs.link>
+
<maven.compiler.optimize>true</maven.compiler.optimize>
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
@@ -999,6 +1002,30 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin.version}</version>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>256m</maxmemory>
+ <quiet>true</quiet>
+ <links>
+ <link>${javadoc.jdk.apidocs.link}</link>
+ </links>
+ <failOnError>true</failOnError>
+ <doclint>none</doclint>
+ <additionalJOption>${javadoc.additionalJOption}</additionalJOption>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release-plugin.version}</version>
<inherited>true</inherited>
@@ -1236,6 +1263,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
</plugin>
</plugins>
@@ -1549,75 +1581,13 @@
</build>
</profile>
<profile>
- <id>on-java-12-</id>
+ <id>on-java-11-or-12</id>
<activation>
<jdk>[11,12]</jdk>
</activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin.version}</version>
- <configuration>
- <minmemory>128m</minmemory>
- <maxmemory>256m</maxmemory>
- <quiet>true</quiet>
- <links>
- <link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
- </links>
- <failOnError>true</failOnError>
- <doclint>none</doclint>
- <additionalJOption>--no-module-directories</additionalJOption>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- <profile>
- <id>on-java-13+</id>
- <activation>
- <jdk>[13,)</jdk>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin.version}</version>
- <configuration>
- <minmemory>128m</minmemory>
- <maxmemory>256m</maxmemory>
- <quiet>true</quiet>
- <links>
- <link>https://docs.oracle.com/en/java/javase/16/docs/api/</link>
- </links>
- <failOnError>true</failOnError>
- <doclint>none</doclint>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <properties>
+ <javadoc.additionalJOption>--no-module-directories</javadoc.additionalJOption>
+ </properties>
</profile>
</profiles>
<reporting>
[wicket] 01/02: Remove dependencies which already come as
transitive ones from wicket-native-websocket-core
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit f0d01b85b7c67309b86b34dfe9c59581ba3d5078
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Fri Jun 25 11:16:35 2021 +0300
Remove dependencies which already come as transitive ones from wicket-native-websocket-core
(cherry picked from commit 6f4ed26ea8121928526515cf4dd7f26d24f0e810)
---
wicket-native-websocket/wicket-native-websocket-core/pom.xml | 2 --
wicket-native-websocket/wicket-native-websocket-javax/pom.xml | 8 --------
2 files changed, 10 deletions(-)
diff --git a/wicket-native-websocket/wicket-native-websocket-core/pom.xml b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
index 48c823d..9d74101 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
@@ -39,11 +39,9 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</dependency>
-
</dependencies>
</project>
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
index 0c0f3e3..cdee765 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
@@ -34,19 +34,11 @@
<dependencies>
<dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-core</artifactId>
</dependency>
<dependency>