Skip to content

Chore doxia site upgrade #843

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

Merged
merged 5 commits into from
Mar 25, 2025
Merged

Chore doxia site upgrade #843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fdfae82
chore(deps): bump org.apache.maven.reporting:maven-reporting-api
dependabot[bot] Nov 25, 2024
f474e05
chore(deps): bump org.apache.maven.doxia:doxia-sink-api
dependabot[bot] Nov 19, 2024
84fca26
chore: fix compat with latest doxia release
slandelle Mar 25, 2025
45a1196
chore: update version of maven-site-plugin into it/test_goal_doc
davidB Mar 25, 2025
5746f05
chore: modify it/test_goal_doc to focus on scala:doc and not `site`
davidB Mar 25, 2025
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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<encoding>UTF-8</encoding>
<github.global.server>github</github.global.server>
<maven.compiler.release>8</maven.compiler.release>
<maven.reporting.version>3.1.1</maven.reporting.version>
<maven.reporting.version>4.0.0</maven.reporting.version>
<maven.version.min>3.8.1</maven.version.min>
<maven.version.max>3.9</maven.version.max>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -259,7 +259,7 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
<version>1.12.0</version>
<version>2.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
40 changes: 21 additions & 19 deletions src/it/includesExcludes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,26 @@
<version>${scala.version.lastrelease}</version>
</dependency>
</dependencies>

<reporting>
<plugins>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<configuration>
<includes>
<include>**/*.scala</include>
<include>**/TestClass.java</include>
</includes>
<excludes>
<exclude>bad.scala</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</reporting>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -43,25 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<configuration>
<reportPlugins>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<configuration>
<includes>
<include>**/*.scala</include>
<include>**/TestClass.java</include>
</includes>
<excludes>
<exclude>bad.scala</exclude>
</excludes>
</configuration>
</plugin>
</reportPlugins>
</configuration>
<version>3.21.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
3 changes: 1 addition & 2 deletions src/it/test1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,8 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.12.1</version>
<version>3.21.0</version>
</plugin>
Comment on lines 84 to 87
Copy link
Owner

Choose a reason for hiding this comment

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

Why the groupId is removed on this test but not in other?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yeah, I might clean up everywhere, or not. I don't like verbosity, groupId is optional for plugins, with org.apache.maven.plugins but most people don't know this, including IntelliJ...

</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/test_custom_outputdir/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.12.1</version>
<version>3.21.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/it/test_goal_doc/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
invoker.goals=clean compile site -e
invoker.goals=clean compile scala:doc -e
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Ahhh, so that was the reason!

34 changes: 0 additions & 34 deletions src/it/test_goal_doc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,43 +22,9 @@
<url>ANYTHING</url>
<name>ANYTHING</name>
</organization>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<configuration>
<doctitle>Hello</doctitle>
<args>
<arg>-doc-root-content</arg>
<arg>src/main/scala/rootdoc.txt</arg>
</args>
<jvmArgs>
<jvmArg>-Xms1024m</jvmArg>
<jvmArg>-Xmx4096m</jvmArg>
</jvmArgs>
</configuration>
</plugin>

</plugins>
</reporting>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.12.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion src/it/test_goal_site/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.12.1</version>
<version>3.21.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/scala_maven/ScalaDocMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

import java.io.File;
import java.util.*;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.reporting.MavenReport;
import org.apache.maven.reporting.MavenReportException;
import org.codehaus.doxia.sink.Sink;
import org.codehaus.plexus.util.StringUtils;
import scala_maven_dependency.Context;
import scala_maven_executions.JavaMainCaller;
Expand Down