Skip to content

Commit cd7e09b

Browse files
slandelledependabot[bot]davidB
authored
chore: doxia + site upgrade (#843)
* chore(deps): bump org.apache.maven.reporting:maven-reporting-api Bumps [org.apache.maven.reporting:maven-reporting-api](https://github.com/apache/maven-reporting-api) from 3.1.1 to 4.0.0. - [Commits](apache/maven-reporting-api@maven-reporting-api-3.1.1...maven-reporting-api-4.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.reporting:maven-reporting-api dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * chore(deps): bump org.apache.maven.doxia:doxia-sink-api Bumps [org.apache.maven.doxia:doxia-sink-api](https://github.com/apache/maven-doxia) from 1.12.0 to 2.0.0. - [Release notes](https://github.com/apache/maven-doxia/releases) - [Commits](apache/maven-doxia@doxia-1.12.0...doxia-2.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.doxia:doxia-sink-api dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * chore: fix compat with latest doxia release * chore: update version of maven-site-plugin into it/test_goal_doc * chore: modify it/test_goal_doc to focus on scala:doc and not `site` Else it's the same test as it/test_goal_site --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: David Bernard <[email protected]>
1 parent 064d4c4 commit cd7e09b

File tree

8 files changed

+28
-61
lines changed

8 files changed

+28
-61
lines changed

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<encoding>UTF-8</encoding>
130130
<github.global.server>github</github.global.server>
131131
<maven.compiler.release>8</maven.compiler.release>
132-
<maven.reporting.version>3.1.1</maven.reporting.version>
132+
<maven.reporting.version>4.0.0</maven.reporting.version>
133133
<maven.version.min>3.8.1</maven.version.min>
134134
<maven.version.max>3.9</maven.version.max>
135135
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -259,7 +259,7 @@
259259
<dependency>
260260
<groupId>org.apache.maven.doxia</groupId>
261261
<artifactId>doxia-sink-api</artifactId>
262-
<version>1.12.0</version>
262+
<version>2.0.0</version>
263263
<scope>provided</scope>
264264
</dependency>
265265
<dependency>

‎src/it/includesExcludes/pom.xml‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,26 @@
1616
<version>${scala.version.lastrelease}</version>
1717
</dependency>
1818
</dependencies>
19+
20+
<reporting>
21+
<plugins>
22+
<plugin>
23+
<groupId>@project.groupId@</groupId>
24+
<artifactId>@project.artifactId@</artifactId>
25+
<version>@project.version@</version>
26+
<configuration>
27+
<includes>
28+
<include>**/*.scala</include>
29+
<include>**/TestClass.java</include>
30+
</includes>
31+
<excludes>
32+
<exclude>bad.scala</exclude>
33+
</excludes>
34+
</configuration>
35+
</plugin>
36+
</plugins>
37+
</reporting>
38+
1939
<build>
2040
<plugins>
2141
<plugin>
@@ -43,25 +63,7 @@
4363
<plugin>
4464
<groupId>org.apache.maven.plugins</groupId>
4565
<artifactId>maven-site-plugin</artifactId>
46-
<version>3.3</version>
47-
<configuration>
48-
<reportPlugins>
49-
<plugin>
50-
<groupId>@project.groupId@</groupId>
51-
<artifactId>@project.artifactId@</artifactId>
52-
<version>@project.version@</version>
53-
<configuration>
54-
<includes>
55-
<include>**/*.scala</include>
56-
<include>**/TestClass.java</include>
57-
</includes>
58-
<excludes>
59-
<exclude>bad.scala</exclude>
60-
</excludes>
61-
</configuration>
62-
</plugin>
63-
</reportPlugins>
64-
</configuration>
66+
<version>3.21.0</version>
6567
</plugin>
6668
<plugin>
6769
<groupId>org.apache.maven.plugins</groupId>

‎src/it/test1/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,8 @@
8282
</configuration>
8383
</plugin>
8484
<plugin>
85-
<groupId>org.apache.maven.plugins</groupId>
8685
<artifactId>maven-site-plugin</artifactId>
87-
<version>3.12.1</version>
86+
<version>3.21.0</version>
8887
</plugin>
8988
</plugins>
9089
</build>

‎src/it/test_custom_outputdir/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<plugin>
7474
<groupId>org.apache.maven.plugins</groupId>
7575
<artifactId>maven-site-plugin</artifactId>
76-
<version>3.12.1</version>
76+
<version>3.21.0</version>
7777
</plugin>
7878
<plugin>
7979
<groupId>org.apache.maven.plugins</groupId>

‎src/it/test_goal_doc/invoker.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
invoker.goals=clean compile site -e
1+
invoker.goals=clean compile scala:doc -e

‎src/it/test_goal_doc/pom.xml‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,43 +22,9 @@
2222
<url>ANYTHING</url>
2323
<name>ANYTHING</name>
2424
</organization>
25-
<reporting>
26-
<plugins>
27-
<plugin>
28-
<groupId>org.apache.maven.plugins</groupId>
29-
<artifactId>maven-site-plugin</artifactId>
30-
</plugin>
31-
<plugin>
32-
<groupId>org.apache.maven.plugins</groupId>
33-
<artifactId>maven-project-info-reports-plugin</artifactId>
34-
</plugin>
35-
<plugin>
36-
<groupId>@project.groupId@</groupId>
37-
<artifactId>@project.artifactId@</artifactId>
38-
<version>@project.version@</version>
39-
<configuration>
40-
<doctitle>Hello</doctitle>
41-
<args>
42-
<arg>-doc-root-content</arg>
43-
<arg>src/main/scala/rootdoc.txt</arg>
44-
</args>
45-
<jvmArgs>
46-
<jvmArg>-Xms1024m</jvmArg>
47-
<jvmArg>-Xmx4096m</jvmArg>
48-
</jvmArgs>
49-
</configuration>
50-
</plugin>
51-
52-
</plugins>
53-
</reporting>
5425
<build>
5526
<pluginManagement>
5627
<plugins>
57-
<plugin>
58-
<groupId>org.apache.maven.plugins</groupId>
59-
<artifactId>maven-site-plugin</artifactId>
60-
<version>3.12.1</version>
61-
</plugin>
6228
<plugin>
6329
<groupId>org.apache.maven.plugins</groupId>
6430
<artifactId>maven-project-info-reports-plugin</artifactId>

‎src/it/test_goal_site/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<plugin>
4141
<groupId>org.apache.maven.plugins</groupId>
4242
<artifactId>maven-site-plugin</artifactId>
43-
<version>3.12.1</version>
43+
<version>3.21.0</version>
4444
</plugin>
4545
<plugin>
4646
<groupId>org.apache.maven.plugins</groupId>

‎src/main/java/scala_maven/ScalaDocMojo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
import java.io.File;
88
import java.util.*;
9+
import org.apache.maven.doxia.sink.Sink;
910
import org.apache.maven.plugins.annotations.Execute;
1011
import org.apache.maven.plugins.annotations.LifecyclePhase;
1112
import org.apache.maven.plugins.annotations.Mojo;
1213
import org.apache.maven.plugins.annotations.Parameter;
1314
import org.apache.maven.plugins.annotations.ResolutionScope;
1415
import org.apache.maven.reporting.MavenReport;
1516
import org.apache.maven.reporting.MavenReportException;
16-
import org.codehaus.doxia.sink.Sink;
1717
import org.codehaus.plexus.util.StringUtils;
1818
import scala_maven_dependency.Context;
1919
import scala_maven_executions.JavaMainCaller;

0 commit comments

Comments
 (0)