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

Jump to bottom

Fix generation of javadoc #2191

Merged
merged 1 commit into from
Sep 29, 2023
Merged

Fix generation of javadoc #2191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion boms/bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,14 @@
</configuration>
</plugin>
<plugin>
<!--
Can not use 3.3.0, which triggers:

Presumably you have configured maven-source-plugn to execute twice times in your build. You have to configure a classifier for at least on of them.

-->
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<version>3.2.1</version>
</plugin>
<plugin>
<artifactId>build-helper-maven-plugin</artifactId>
Expand Down
69 changes: 32 additions & 37 deletions extras/bundles/grizzly-httpservice-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,34 @@
</filesets>
</configuration>
</plugin>

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>src-dependencies</id>
<phase>generate-sources</phase>
<goals>
<!-- use copy-dependencies instead if you don't want to explode the sources -->
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<classifier>sources</classifier>
<excludeScope>provided</excludeScope>
<excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
<excludes>module-info.java</excludes>
<!-- fudge an actual source hierarchy so that the source
plugin can actually do something useful. Otherwise,
you'll end up with an empty source jar -->
<outputDirectory>${basedir}/src/main/java</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
Expand All @@ -90,6 +118,7 @@
</excludes>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down Expand Up @@ -128,17 +157,7 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<sourcepath>
${basedir}/../../grizzly-httpservice/src/main/java;
${basedir}/../../../modules/bundles/http-servlet/src/main/java;
</sourcepath>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand All @@ -149,6 +168,7 @@
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
Expand All @@ -166,32 +186,7 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>src-dependencies</id>
<phase>generate-sources</phase>
<goals>
<!-- use copy-dependencies instead if you don't want to explode the sources -->
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<classifier>sources</classifier>
<excludeScope>provided</excludeScope>
<excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
<excludes>module-info.java</excludes>
<!-- fudge an actual source hierarchy so that the source
plugin can actually do something useful. Otherwise,
you'll end up with an empty source jar -->
<outputDirectory>${basedir}/src/main/java</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>
</project>
97 changes: 50 additions & 47 deletions modules/bundles/comet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,53 @@
<build>
<defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<configuration>
<filesets>
<!-- Make sure we remove the fake source directory. -->
<fileset>
<directory>src</directory>
</fileset>
</filesets>
</configuration>
</plugin>

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>src-dependencies</id>
<phase>generate-sources</phase>
<goals>
<!-- use copy-dependencies instead if you don't want to explode the sources -->
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<classifier>sources</classifier>

<!--

As this is a bundle we are excluding
module-info.java files when unpacking the
project dependencies.

-->
<excludes>module-info.java</excludes>
<excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
<!-- fudge an actual source hierarchy so that the source
plugin can actually do something useful. Otherwise,
you'll end up with an empty source jar -->
<outputDirectory>${basedir}/src/main/java</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand All @@ -73,17 +120,7 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<sourcepath>
${basedir}/../http/src/main/java;
${basedir}/../../comet/src/main/java;
</sourcepath>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand All @@ -94,18 +131,7 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<configuration>
<filesets>
<!-- Make sure we remove the fake source directory. -->
<fileset>
<directory>src</directory>
</fileset>
</filesets>
</configuration>
</plugin>

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
Expand All @@ -123,30 +149,7 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>src-dependencies</id>
<phase>generate-sources</phase>
<goals>
<!-- use copy-dependencies instead if you don't want to explode the sources -->
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<classifier>sources</classifier>
<excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
<!-- fudge an actual source hierarchy so that the source
plugin can actually do something useful. Otherwise,
you'll end up with an empty source jar -->
<outputDirectory>${basedir}/src/main/java</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>
</project>
98 changes: 50 additions & 48 deletions modules/bundles/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,52 @@
<build>
<defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<configuration>
<filesets>
<!-- Make sure we remove the fake source directory. -->
<fileset>
<directory>src</directory>
</fileset>
</filesets>
</configuration>
</plugin>

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>src-dependencies</id>
<phase>generate-sources</phase>
<goals>
<!-- use copy-dependencies instead if you don't want to explode the sources -->
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<classifier>sources</classifier>
<!--

As this is a bundle we are excluding
module-info.java files when unpacking the
project dependencies.

-->
<excludes>module-info.java</excludes>
<excludeArtifactIds>junit,hamcrest-core</excludeArtifactIds>
<!-- fudge an actual source hierarchy so that the source
plugin can actually do something useful. Otherwise,
you'll end up with an empty source jar -->
<outputDirectory>${basedir}/src/main/java</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand All @@ -73,17 +119,15 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<sourcepath>
${basedir}/../../grizzly/src/main/java;
${basedir}/../../portunif/src/main/java;
</sourcepath>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand All @@ -94,18 +138,7 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<configuration>
<filesets>
<!-- Make sure we remove the fake source directory. -->
<fileset>
<directory>src</directory>
</fileset>
</filesets>
</configuration>
</plugin>

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
Expand All @@ -123,38 +156,7 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>src-dependencies</id>
<phase>generate-sources</phase>
<goals>
<!-- use copy-dependencies instead if you don't want to explode the sources -->
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<classifier>sources</classifier>
<!--

As this is a bundle we are excluding
module-info.java files when unpacking the
project dependencies.

-->
<excludes>module-info.java</excludes>
<excludeArtifactIds>junit,hamcrest-core</excludeArtifactIds>
<!-- fudge an actual source hierarchy so that the source
plugin can actually do something useful. Otherwise,
you'll end up with an empty source jar -->
<outputDirectory>${basedir}/src/main/java</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>
</project>
Loading
Loading