Skip to content

Commit 816225d

Browse files
michael-omichael-o
committed
[MPIR-454] Upgrade to Doxia 2.0.0 Milestone Stack
This closes #43
1 parent 1231c79 commit 816225d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+516
-481
lines changed

‎pom.xml

Lines changed: 44 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,14 @@ under the License.
114114
</distributionManagement>
115115

116116
<properties>
117+
<javaVersion>8</javaVersion>
117118
<mavenVersion>3.6.3</mavenVersion>
118-
<doxiaVersion>1.11.1</doxiaVersion>
119-
<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
120-
<scmVersion>2.1.0</scmVersion>
121119
<resolverVersion>1.4.1</resolverVersion>
122-
<sitePluginVersion>3.12.1</sitePluginVersion>
123-
<fluidoSkinVersion>1.11.1</fluidoSkinVersion>
120+
<doxiaVersion>2.0.0-M12</doxiaVersion>
121+
<doxiaSitetoolsVersion>2.0.0-M19</doxiaSitetoolsVersion>
122+
<scmVersion>2.1.0</scmVersion>
123+
<sitePluginVersion>4.0.0-M15</sitePluginVersion>
124+
<fluidoSkinVersion>2.0.0-M9</fluidoSkinVersion>
124125
<checkstyle.violation.ignore>ParameterNumber,MethodLength</checkstyle.violation.ignore>
125126
<project.build.outputTimestamp>2024-06-13T16:44:23Z</project.build.outputTimestamp>
126127
</properties>
@@ -129,18 +130,12 @@ under the License.
129130
<dependency>
130131
<groupId>org.apache.maven.reporting</groupId>
131132
<artifactId>maven-reporting-api</artifactId>
132-
<version>3.1.1</version>
133+
<version>4.0.0-M12</version>
133134
</dependency>
134135
<dependency>
135136
<groupId>org.apache.maven.reporting</groupId>
136137
<artifactId>maven-reporting-impl</artifactId>
137-
<version>3.2.0</version>
138-
<exclusions>
139-
<exclusion>
140-
<groupId>org.codehaus.plexus</groupId>
141-
<artifactId>plexus-container-default</artifactId>
142-
</exclusion>
143-
</exclusions>
138+
<version>4.0.0-M15</version>
144139
</dependency>
145140

146141
<!-- Maven -->
@@ -262,36 +257,18 @@ under the License.
262257
<groupId>org.apache.maven.doxia</groupId>
263258
<artifactId>doxia-sink-api</artifactId>
264259
<version>${doxiaVersion}</version>
265-
<exclusions>
266-
<exclusion>
267-
<groupId>org.codehaus.plexus</groupId>
268-
<artifactId>plexus-container-default</artifactId>
269-
</exclusion>
270-
</exclusions>
271260
</dependency>
272261
<dependency>
273262
<groupId>org.apache.maven.doxia</groupId>
274263
<artifactId>doxia-core</artifactId>
275264
<version>${doxiaVersion}</version>
276-
<exclusions>
277-
<exclusion>
278-
<groupId>org.codehaus.plexus</groupId>
279-
<artifactId>plexus-container-default</artifactId>
280-
</exclusion>
281-
</exclusions>
282265
</dependency>
283266

284267
<!-- Doxia Sitetools -->
285268
<dependency>
286269
<groupId>org.apache.maven.doxia</groupId>
287270
<artifactId>doxia-integration-tools</artifactId>
288271
<version>${doxiaSitetoolsVersion}</version>
289-
<exclusions>
290-
<exclusion>
291-
<groupId>org.codehaus.plexus</groupId>
292-
<artifactId>plexus-container-default</artifactId>
293-
</exclusion>
294-
</exclusions>
295272
</dependency>
296273

297274
<!-- Plexus -->
@@ -431,6 +408,13 @@ under the License.
431408
<keyalg>RSA</keyalg>
432409
</configuration>
433410
</plugin>
411+
<plugin>
412+
<groupId>org.apache.maven.plugins</groupId>
413+
<artifactId>maven-surefire-plugin</artifactId>
414+
<configuration>
415+
<argLine>-Dfile.encoding=UTF-8</argLine>
416+
</configuration>
417+
</plugin>
434418
</plugins>
435419
</pluginManagement>
436420
<plugins>
@@ -495,6 +479,35 @@ under the License.
495479
</properties>
496480
<build>
497481
<plugins>
482+
<plugin>
483+
<groupId>org.apache.maven.plugins</groupId>
484+
<artifactId>maven-clean-plugin</artifactId>
485+
<!--
486+
This is necessary if "mvn site" has been invoked previously with 3.x
487+
and leaves 0-byte files in the local repository for MRM Maven Plugin
488+
to serve which are broken from a consumer's PoV.
489+
-->
490+
<executions>
491+
<execution>
492+
<id>delete-0-byte-site-descriptors</id>
493+
<goals>
494+
<goal>clean</goal>
495+
</goals>
496+
<phase>pre-integration-test</phase>
497+
<configuration>
498+
<excludeDefaultDirectories>true</excludeDefaultDirectories>
499+
<filesets>
500+
<fileset>
501+
<directory>${settings.localRepository}/org/apache/apache</directory>
502+
<includes>
503+
<include>**/*-site*.xml</include>
504+
</includes>
505+
</fileset>
506+
</filesets>
507+
</configuration>
508+
</execution>
509+
</executions>
510+
</plugin>
498511
<plugin>
499512
<groupId>org.apache.maven.plugins</groupId>
500513
<artifactId>maven-invoker-plugin</artifactId>

‎src/it/MPIR-300/verify.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
plugins = new File( basedir, 'target/site/plugins.html' ).text;
20+
plugins = new File( basedir, 'target/reports/plugins.html' ).text;
2121

2222
// version of maven-invoker-plugin is defined in pluginManagement
2323
assert plugins.contains( '<td>1.invoker-pluginManagement</td>' );
@@ -31,4 +31,4 @@ assert plugins.contains( '<td>2.checkstyle-plugin</td>' );
3131
// version of maven-changes-plugin is defined in reporting (overriding pluginManagement and plugins)
3232
assert plugins.contains( '<td>3.changes-reporting</td>' );
3333

34-
return true;
34+
return true;

‎src/it/MPIR-349/parent/verify.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
* under the License.
1818
*/
1919

20-
File indexPage = new File( basedir, 'target/site/index.html' )
20+
File indexPage = new File( basedir, 'target/reports/index.html' )
2121
assert !indexPage.text.contains( 'sitePublishLocation' )
2222

23-
File modulesPage = new File( basedir, 'target/site/modules.html' )
23+
File modulesPage = new File( basedir, 'target/reports/modules.html' )
2424
assert !modulesPage.text.contains( 'sitePublishLocation' )

‎src/it/MPIR-375/verify.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
File log = new File( basedir, 'build.log' );
2020
assert !( log.text.contains("org.eclipse.aether.transfer.ArtifactNotFoundException: Failure to find org.eclipse.m2e:lifecycle-mapping:pom") );
2121

22-
plugins = new File( basedir, 'target/site/plugin-management.html' ).text;
22+
plugins = new File( basedir, 'target/reports/plugin-management.html' ).text;
2323

2424
// maven-javadoc-plugin is defined in pluginManagement and not excluded
2525
assert plugins.contains( 'maven-javadoc-plugin' );
2626

2727
// org.eclipse.m2e:lifecycle-mapping plugin is excluded
2828
assert !( plugins.contains( 'org.eclipse.m2e' ) );
29-
assert !( plugins.contains( 'lifecycle-mapping' ) );
29+
assert !( plugins.contains( 'lifecycle-mapping' ) );

‎src/it/MPIR-407/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
dependencies = new File( basedir, 'target/site/dependencies.html' ).text;
20+
dependencies = new File( basedir, 'target/reports/dependencies.html' ).text;
2121

2222
assert !( dependencies.contains( 'The Apache Software License, Version 2.0' ) );
2323
assert !( dependencies.contains( 'Apache Public License 2.0' ) );

‎src/it/MPIR-412/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ import groovy.xml.XmlParser
2222
// should be able to parse the output as XML
2323
parser = new XmlParser();
2424
parser.setFeature( 'http://apache.org/xml/features/disallow-doctype-decl', false );
25-
result = parser.parse( new File( basedir, 'target/site/dependencies.html' ) );
25+
result = parser.parse( new File( basedir, 'target/reports/dependencies.html' ) );
2626
assert result instanceof Node;

‎src/it/MPIR-431/invoker.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,4 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
# Remove with next major version
19-
invoker.mavenOpts = -Duser.language=en
2018
invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:dependencies

‎src/it/MPIR-431/verify.groovy

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,39 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
String html = new File( basedir, 'target/site/dependencies.html' ).text
19+
String html = new File( basedir, 'target/reports/dependencies.html' ).text
2020

21+
// Revise after DOXIA-704
2122
def summaryLine = '''\
2223
<tr class="b">
23-
<td align="right">compile: 1</td>
24-
<td align="right">compile: 45.5 kB</td>
25-
<td align="right">compile: 47</td>
26-
<td align="right">compile: 36</td>
27-
<td align="right">compile: 4</td>
28-
<td rowspan="3" style="vertical-align: middle;" align="center">1.3</td>
29-
<td align="right">compile: 1</td></tr>
24+
<td style="text-align: right;">compile: 1</td>
25+
<td style="text-align: right;">compile: 45.5 kB</td>
26+
<td style="text-align: right;">compile: 47</td>
27+
<td style="text-align: right;">compile: 36</td>
28+
<td style="text-align: right;">compile: 4</td>
29+
<td rowspan="3" style="text-align: center; vertical-align: middle;">1.3</td>
30+
<td style="text-align: right;">compile: 1</td></tr>
3031
<tr class="a">
31-
<td align="right">runtime: 1</td>
32-
<td align="right">runtime: 284.2 kB</td>
33-
<td align="right">runtime: 155</td>
34-
<td align="right">runtime: 133</td>
35-
<td align="right">runtime: 10</td>
36-
<td align="right">runtime: 1</td></tr>
32+
<td style="text-align: right;">runtime: 1</td>
33+
<td style="text-align: right;">runtime: 284.2 kB</td>
34+
<td style="text-align: right;">runtime: 155</td>
35+
<td style="text-align: right;">runtime: 133</td>
36+
<td style="text-align: right;">runtime: 10</td>
37+
<td style="text-align: right;">runtime: 1</td></tr>
3738
<tr class="b">
38-
<td align="right">provided: 1</td>
39-
<td align="right">provided: 85.7 kB</td>
40-
<td align="right">provided: 209</td>
41-
<td align="right">provided: 192</td>
42-
<td align="right">provided: 4</td>
43-
<td align="right">-</td></tr>
39+
<td style="text-align: right;">provided: 1</td>
40+
<td style="text-align: right;">provided: 85.7 kB</td>
41+
<td style="text-align: right;">provided: 209</td>
42+
<td style="text-align: right;">provided: 192</td>
43+
<td style="text-align: right;">provided: 4</td>
44+
<td style="text-align: right;">-</td></tr>
4445
<tr class="a">
45-
<td align="right">test: 3</td>
46-
<td align="right">test: 2.2 MB</td>
47-
<td align="right">test: 1619</td>
48-
<td align="right">test: 1493</td>
49-
<td align="right">test: 91</td>
50-
<td align="center">1.8</td>
51-
<td align="right">test: 3</td></tr>'''
46+
<td style="text-align: right;">test: 3</td>
47+
<td style="text-align: right;">test: 2.2 MB</td>
48+
<td style="text-align: right;">test: 1619</td>
49+
<td style="text-align: right;">test: 1493</td>
50+
<td style="text-align: right;">test: 91</td>
51+
<td style="text-align: center;">1.8</td>
52+
<td style="text-align: right;">test: 3</td></tr>'''
5253

5354
assert html.contains( summaryLine.replaceAll( "\n", System.lineSeparator() ) )

‎src/it/MPIR-437/invoker.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,4 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
# Remove with next major version
19-
invoker.mavenOpts = -Duser.language=en
2018
invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:dependencies

‎src/it/MPIR-437/verify.groovy

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
File dependencies = new File( basedir, 'target/site/dependencies.html' )
19+
File dependencies = new File( basedir, 'target/reports/dependencies.html' )
2020
def summaryRow = '''\
2121
<tr class="b">
22-
<td align="right">1</td>
23-
<td align="right">78.8 kB</td>
24-
<td align="right">141</td>
25-
<td align="right">-</td>
26-
<td align="right">-</td>
27-
<td align="center">-</td>
28-
<td align="right">-</td></tr>
22+
<td style="text-align: right;">1</td>
23+
<td style="text-align: right;">78.8 kB</td>
24+
<td style="text-align: right;">141</td>
25+
<td style="text-align: right;">-</td>
26+
<td style="text-align: right;">-</td>
27+
<td style="text-align: center;">-</td>
28+
<td style="text-align: right;">-</td></tr>
2929
'''
3030

3131
assert dependencies.text.contains( summaryRow.replaceAll( "\n", System.lineSeparator() ) )

‎src/it/MPIR-455/invoker.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,4 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
# Remove with next major version
19-
invoker.mavenOpts = -Duser.language=en
2018
invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:dependencies

0 commit comments

Comments
 (0)