Skip to content

Commit d02fd90

Browse files
michael-omichael-o
committed
[MJAVADOC-740] Upgrade Parent to 39
1 parent 4123315 commit d02fd90

File tree

85 files changed

+14947
-17545
lines changed

Some content is hidden

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

85 files changed

+14947
-17545
lines changed

‎pom.xml‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version='1.0' encoding='UTF-8'?>
2-
1+
<?xml version="1.0" encoding="UTF-8"?>
32
<!--
43
Licensed to the Apache Software Foundation (ASF) under one
54
or more contributor license agreements. See the NOTICE file
@@ -18,14 +17,13 @@ KIND, either express or implied. See the License for the
1817
specific language governing permissions and limitations
1918
under the License.
2019
-->
21-
2220
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2321
<modelVersion>4.0.0</modelVersion>
2422

2523
<parent>
2624
<groupId>org.apache.maven.plugins</groupId>
2725
<artifactId>maven-plugins</artifactId>
28-
<version>37</version>
26+
<version>39</version>
2927
<relativePath />
3028
</parent>
3129

@@ -34,53 +32,10 @@ under the License.
3432
<packaging>maven-plugin</packaging>
3533

3634
<name>Apache Maven Javadoc Plugin</name>
37-
<description>
38-
The Apache Maven Javadoc Plugin is a plugin that uses the javadoc tool for
39-
generating javadocs for the specified project.
40-
</description>
35+
<description>The Apache Maven Javadoc Plugin is a plugin that uses the javadoc tool for
36+
generating javadocs for the specified project.</description>
4137
<inceptionYear>2004</inceptionYear>
4238

43-
<prerequisites>
44-
<maven>${mavenVersion}</maven>
45-
</prerequisites>
46-
47-
<scm>
48-
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git</connection>
49-
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git</developerConnection>
50-
<url>https://github.com/apache/maven-javadoc-plugin/tree/${project.scm.tag}</url>
51-
<tag>HEAD</tag>
52-
</scm>
53-
<issueManagement>
54-
<system>jira</system>
55-
<url>https://issues.apache.org/jira/browse/MJAVADOC</url>
56-
</issueManagement>
57-
<ciManagement>
58-
<system>Jenkins</system>
59-
<url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-javadoc-plugin/</url>
60-
</ciManagement>
61-
<distributionManagement>
62-
<site>
63-
<id>apache.website</id>
64-
<url>scm:svn:https://svn.apache.org/repos/asf/maven/website/components/${maven.site.path}</url>
65-
</site>
66-
</distributionManagement>
67-
68-
<properties>
69-
<javaVersion>8</javaVersion>
70-
<mavenVersion>3.2.5</mavenVersion>
71-
<doxiaVersion>1.11.1</doxiaVersion>
72-
<doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
73-
<wagonVersion>2.4</wagonVersion>
74-
<aetherVersion>1.0.0.v20140518</aetherVersion><!-- https://cwiki.apache.org/confluence/x/VIHOCg#MavenEcosystemCleanup-ResolverandMaven -->
75-
<plexus-java.version>1.1.0</plexus-java.version>
76-
<jetty.version>9.4.43.v20210629</jetty.version>
77-
<!-- for ITs -->
78-
<sitePluginVersion>3.12.1</sitePluginVersion>
79-
<projectInfoReportsPluginVersion>3.2.2</projectInfoReportsPluginVersion>
80-
<project.build.outputTimestamp>2022-08-10T19:51:10Z</project.build.outputTimestamp>
81-
<slf4jVersion>1.7.36</slf4jVersion>
82-
</properties>
83-
8439
<contributors>
8540
<contributor>
8641
<name>Ben Speakmon</name>
@@ -129,6 +84,48 @@ under the License.
12984
</contributor>
13085
</contributors>
13186

87+
<prerequisites>
88+
<maven>${mavenVersion}</maven>
89+
</prerequisites>
90+
91+
<scm>
92+
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git</connection>
93+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git</developerConnection>
94+
<tag>HEAD</tag>
95+
<url>https://github.com/apache/maven-javadoc-plugin/tree/${project.scm.tag}</url>
96+
</scm>
97+
<issueManagement>
98+
<system>jira</system>
99+
<url>https://issues.apache.org/jira/browse/MJAVADOC</url>
100+
</issueManagement>
101+
<ciManagement>
102+
<system>Jenkins</system>
103+
<url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-javadoc-plugin/</url>
104+
</ciManagement>
105+
<distributionManagement>
106+
<site>
107+
<id>apache.website</id>
108+
<url>scm:svn:https://svn.apache.org/repos/asf/maven/website/components/${maven.site.path}</url>
109+
</site>
110+
</distributionManagement>
111+
112+
<properties>
113+
<javaVersion>8</javaVersion>
114+
<mavenVersion>3.2.5</mavenVersion>
115+
<doxiaVersion>1.11.1</doxiaVersion>
116+
<doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
117+
<wagonVersion>2.4</wagonVersion>
118+
<aetherVersion>1.0.0.v20140518</aetherVersion>
119+
<!-- https://cwiki.apache.org/confluence/x/VIHOCg#MavenEcosystemCleanup-ResolverandMaven -->
120+
<plexus-java.version>1.1.0</plexus-java.version>
121+
<jetty.version>9.4.43.v20210629</jetty.version>
122+
<!-- for ITs -->
123+
<sitePluginVersion>3.12.1</sitePluginVersion>
124+
<projectInfoReportsPluginVersion>3.2.2</projectInfoReportsPluginVersion>
125+
<project.build.outputTimestamp>2022-08-10T19:51:10Z</project.build.outputTimestamp>
126+
<slf4jVersion>1.7.36</slf4jVersion>
127+
</properties>
128+
132129
<dependencyManagement>
133130
<dependencies>
134131
<dependency>
@@ -160,7 +157,8 @@ under the License.
160157
</dependencyManagement>
161158

162159
<dependencies>
163-
<dependency> <!-- @TODO remove!! -->
160+
<dependency>
161+
<!-- @TODO remove!! -->
164162
<groupId>org.apache.maven</groupId>
165163
<artifactId>maven-compat</artifactId>
166164
<version>${mavenVersion}</version>
@@ -433,6 +431,12 @@ under the License.
433431
<plugin>
434432
<groupId>org.codehaus.modello</groupId>
435433
<artifactId>modello-maven-plugin</artifactId>
434+
<configuration>
435+
<version>1.1.1</version>
436+
<models>
437+
<model>src/main/mdo/javadocOptions.mdo</model>
438+
</models>
439+
</configuration>
436440
<executions>
437441
<execution>
438442
<goals>
@@ -442,12 +446,6 @@ under the License.
442446
</goals>
443447
</execution>
444448
</executions>
445-
<configuration>
446-
<version>1.1.1</version>
447-
<models>
448-
<model>src/main/mdo/javadocOptions.mdo</model>
449-
</models>
450-
</configuration>
451449
</plugin>
452450
<plugin>
453451
<groupId>org.eclipse.sisu</groupId>
@@ -486,7 +484,8 @@ under the License.
486484
<pomInclude>examples/*/pom.xml</pomInclude>
487485
</pomIncludes>
488486
<pomExcludes>
489-
<pomExclude>MJAVADOC-181/pom.xml</pomExclude> <!-- seems to be wrong, see comment in Jira issue -->
487+
<pomExclude>MJAVADOC-181/pom.xml</pomExclude>
488+
<!-- seems to be wrong, see comment in Jira issue -->
490489
<pomExclude>output-encoding/pom.xml</pomExclude>
491490
</pomExcludes>
492491
<properties combine.self="override" />
@@ -571,7 +570,8 @@ under the License.
571570
<onlyCurrentVersion>true</onlyCurrentVersion>
572571
<resolutionIds>Fixed</resolutionIds>
573572
<sortColumnNames>Type,Key</sortColumnNames>
574-
<maxEntries>1000</maxEntries> <!-- MCHANGES-124 -->
573+
<maxEntries>1000</maxEntries>
574+
<!-- MCHANGES-124 -->
575575
</configuration>
576576
<reportSets>
577577
<reportSet>

0 commit comments

Comments
 (0)