Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: apache/maven-javadoc-plugin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: maven-javadoc-plugin-3.6.3
Choose a base ref
...
head repository: apache/maven-javadoc-plugin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: maven-javadoc-plugin-3.10.0
Choose a head ref
Loading
Showing with 1,857 additions and 2,057 deletions.
  1. +6 −2 .github/workflows/maven.yml
  2. +1 −1 .github/workflows/release-drafter.yml
  3. +72 −82 pom.xml
  4. +8 −11 src/{test/resources/unit/settings.xml → config/checkstyle-suppressions.xml}
  5. +54 −54 src/it/projects/MJAVADOC-110/verify.bsh
  6. +58 −58 src/it/projects/MJAVADOC-126/verify.bsh
  7. +63 −63 src/it/projects/MJAVADOC-172/verify.bsh
  8. +61 −61 src/it/projects/MJAVADOC-180/verify.bsh
  9. +67 −67 src/it/projects/MJAVADOC-181/verify.bsh
  10. +82 −82 src/it/projects/MJAVADOC-194/verify.bsh
  11. +1 −1 src/it/projects/MJAVADOC-257/mymojo/pom.xml
  12. +18 −7 src/it/projects/MJAVADOC-257/pom.xml
  13. +41 −41 src/it/projects/MJAVADOC-262/verify.bsh
  14. +31 −31 src/it/projects/MJAVADOC-278/verify.bsh
  15. +48 −48 src/it/projects/MJAVADOC-320/verify.groovy
  16. +3 −3 src/it/projects/MJAVADOC-365/invoker.properties
  17. +10 −0 src/it/projects/MJAVADOC-365/pom.xml
  18. +2 −2 src/it/projects/MJAVADOC-365/verify.bsh
  19. +54 −54 src/it/projects/MJAVADOC-384/verify.bsh
  20. +31 −31 src/it/projects/MJAVADOC-407/verify.bsh
  21. +47 −47 src/it/projects/MJAVADOC-414/verify.bsh
  22. +2 −1 src/it/projects/MJAVADOC-427/invoker.properties
  23. +1 −1 src/it/projects/MJAVADOC-427/verify.groovy
  24. +1 −1 src/it/projects/MJAVADOC-434_fixcompile/pom.xml
  25. +1 −1 src/it/projects/MJAVADOC-437/verify.bsh
  26. +1 −1 src/it/projects/MJAVADOC-449_aggr_modulepath/invoker.properties
  27. +6 −6 src/it/projects/MJAVADOC-449_aggr_modulepath/verify.groovy
  28. +1 −1 src/it/projects/MJAVADOC-450_classifier/verify.groovy
  29. +1 −1 src/it/projects/MJAVADOC-495_offline-filescheme/verify.groovy
  30. +57 −57 src/it/projects/MJAVADOC-497/verify.bsh
  31. +5 −14 src/it/projects/MJAVADOC-498_aggr_modulepath/baz/pom.xml
  32. +3 −2 src/it/projects/MJAVADOC-498_aggr_modulepath/invoker.properties
  33. +0 −9 src/it/projects/MJAVADOC-498_aggr_modulepath/pom.xml
  34. +3 −2 src/it/projects/MJAVADOC-498_mm_modulepath/invoker.properties
  35. +0 −9 src/it/projects/MJAVADOC-498_mm_modulepath/pom.xml
  36. +4 −3 src/it/projects/MJAVADOC-498_modulepath/invoker.properties
  37. +0 −9 src/it/projects/MJAVADOC-498_modulepath/pom.xml
  38. +3 −2 src/it/projects/MJAVADOC-498_modulepath/verify.groovy
  39. +4 −4 src/it/projects/MJAVADOC-506_excl-module-info/verify.groovy
  40. +6 −6 src/it/projects/MJAVADOC-555_aggr_mixed/verify.groovy
  41. +2 −2 src/it/projects/MJAVADOC-555_link-automatic-modules/verify.groovy
  42. +4 −4 src/it/projects/MJAVADOC-568_manifest-splitpackage/mojo/pom.xml
  43. +3 −0 src/it/projects/MJAVADOC-569_aggr-mixed/module2/pom.xml
  44. +2 −2 src/it/projects/MJAVADOC-569_aggr-mixed/pom.xml
  45. +2 −2 src/it/projects/MJAVADOC-575_source8-module-info/verify.groovy
  46. +2 −3 src/it/projects/MJAVADOC-580_detectLinks/invoker.properties
  47. +1 −1 src/it/projects/MJAVADOC-580_detectLinks/verify.groovy
  48. +2 −2 src/it/projects/MJAVADOC-590_nooverview/verify.groovy
  49. +0 −5 src/it/projects/MJAVADOC-591_release8/pom.xml
  50. +1 −1 src/it/projects/MJAVADOC-592_detectApiLink/verify.groovy
  51. +3 −3 src/it/projects/MJAVADOC-610_mrjar/invoker.properties
  52. +2 −2 src/it/projects/MJAVADOC-610_mrjar/verify.groovy
  53. +1 −1 src/it/projects/MJAVADOC-611_dependencyLinks/verify.groovy
  54. +3 −3 src/it/projects/MJAVADOC-618_modular-war/verify.groovy
  55. +1 −1 src/it/projects/MJAVADOC-619_copyright-year/verify.groovy
  56. +3 −3 src/it/projects/MJAVADOC-620_no-dot-in-version/verify.bsh
  57. +3 −3 src/it/projects/MJAVADOC-620_top-level-package/verify.bsh
  58. +1 −1 src/it/projects/MJAVADOC-625_addstylesheet/verify.groovy
  59. +10 −10 src/it/projects/MJAVADOC-639_requires_ignored/verify.groovy
  60. +1 −1 src/it/projects/MJAVADOC-661_mrjar/verify.groovy
  61. +2 −3 src/it/projects/MJAVADOC-704_toolchains/invoker.properties
  62. +1 −1 src/it/projects/MJAVADOC-770/verify.groovy
  63. +51 −51 src/it/projects/dependencySource-1/verify.bsh
  64. +51 −51 src/it/projects/dependencySource-2/verify.bsh
  65. +51 −51 src/it/projects/dependencySource-3/verify.bsh
  66. +0 −5 src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml
  67. +51 −51 src/it/projects/dependencySource-4/verify.bsh
  68. +139 −139 src/it/projects/detectLinks/verify.bsh
  69. +1 −1 src/it/projects/examples/alternate-doclet/verify.groovy
  70. +1 −1 src/it/projects/examples/exclude-package-names/verify.groovy
  71. +18 −0 src/it/projects/javadoc-fix-version/invoker.properties
  72. +60 −0 src/it/projects/javadoc-fix-version/pom.xml
  73. +7 −19 ...ir/AppSample.java → it/projects/javadoc-fix-version/src/main/java/fix/test/ClassWithJavadoc.java}
  74. +29 −0 src/it/projects/javadoc-fix-version/src/main/java/fix/test/ClassWithJavadocAndVersion.java
  75. +4 −27 ...estdir/App.java → it/projects/javadoc-fix-version/src/main/java/fix/test/ClassWithNoJavadoc.java}
  76. +91 −0 src/it/projects/javadoc-fix-version/verify.bsh
  77. +3 −3 src/it/projects/javadoc-fix/verify.bsh
  78. +63 −63 src/it/projects/output-encoding/verify.bsh
  79. +1 −1 src/it/projects/reproducible/verify.groovy
  80. +32 −35 src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java
  81. +81 −113 src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
  82. +1 −1 ...java/org/apache/maven/plugins/javadoc/{AggregatorJavadocJar.java → AggregatorJavadocJarMojo.java}
  83. +1 −1 .../apache/maven/plugins/javadoc/{AggregatorTestJavadocJar.java → AggregatorTestJavadocJarMojo.java}
  84. +21 −36 src/main/java/org/apache/maven/plugins/javadoc/{JavadocJar.java → JavadocJarMojo.java}
  85. +42 −73 src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java
  86. +36 −12 src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
  87. +6 −1 src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java
  88. +1 −13 src/main/java/org/apache/maven/plugins/javadoc/{TestJavadocJar.java → TestJavadocJarMojo.java}
  89. +1 −58 src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java
  90. +1 −1 src/main/java/org/apache/maven/plugins/javadoc/TestResourcesBundleMojo.java
  91. +0 −3 src/site/apt/examples/alternate-doclet.apt.vm
  92. +5 −5 src/site/apt/examples/fix-javadocs.apt.vm
  93. +5 −6 src/site/apt/examples/output-configuration.apt.vm
  94. +1 −1 src/site/apt/usage.apt.vm
  95. +6 −6 src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java
  96. +7 −26 src/test/java/org/apache/maven/plugins/javadoc/{JavadocJarTest.java → JavadocJarMojoTest.java}
  97. +10 −17 src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
  98. +33 −4 src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java
  99. +0 −81 src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarInvalidDestdirMavenProjectStub.java
  100. +1 −1 src/test/resources/unit/aggregate-modules-not-in-subdirectories-test/all/pom.xml
  101. +1 −1 src/test/resources/unit/aggregate-resources-test/aggregate-resources-test-plugin-config.xml
  102. +1 −1 src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml
  103. +1 −1 src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml
  104. +1 −1 src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
  105. +1 −1 src/test/resources/unit/docfiles-test/docfiles-test-plugin-config.xml
  106. +1 −1 src/test/resources/unit/docfiles-with-java-test/docfiles-with-java-test-plugin-config.xml
  107. +1 −1 src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml
  108. +1 −1 src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml
  109. +1 −1 src/test/resources/unit/file-include-exclude-test/file-include-exclude-plugin-config.xml
  110. +0 −1 src/test/resources/unit/fix-test/expected/src/main/java/fix/test/ClassWithJavadoc.java
  111. +0 −1 src/test/resources/unit/fix-test/expected/src/main/java/fix/test/ClassWithNoJavadoc.java
  112. +0 −1 src/test/resources/unit/fix-test/expected/src/main/java/fix/test/InterfaceWithJavadoc.java
  113. +0 −1 src/test/resources/unit/fix-test/expected/src/main/java/fix/test/InterfaceWithNoJavadoc.java
  114. +1 −1 src/test/resources/unit/header-footer-test/header-footer-test-plugin-config.xml
  115. +1 −1 ...maven/plugins/maven-javadoc-plugin/unit/helpfile-test/1.0-SNAPSHOT/helpfile-test-1.0-SNAPSHOT.pom
  116. +1 −1 src/test/resources/unit/helpfile-test/pom.xml
  117. +1 −1 src/test/resources/unit/javaHome-test/javaHome-test-plugin-config.xml
  118. +1 −1 src/test/resources/unit/javadocjar-archive-config/javadocjar-archive-config.xml
  119. +1 −1 src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml
  120. +1 −1 src/test/resources/unit/javadocjar-failonerror/javadocjar-failonerror-plugin-config.xml
  121. +0 −77 src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml
  122. +1 −1 src/test/resources/unit/jdk5-test/jdk5-test-plugin-config.xml
  123. +1 −1 src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml
  124. +1 −1 src/test/resources/unit/newline-test/newline-test-plugin-config.xml
  125. +1 −1 src/test/resources/unit/optionsumlautencoding-test/optionsumlautencoding-test-plugin-config.xml
  126. +1 −1 src/test/resources/unit/pom-test/pom-test-plugin-config.xml
  127. +1 −1 src/test/resources/unit/proxy-test/proxy-test-plugin-config.xml
  128. +1 −1 src/test/resources/unit/quotedpath'test/quotedpath-test-plugin-config.xml
  129. +1 −1 src/test/resources/unit/resources-test/resources-test-plugin-config.xml
  130. +1 −1 src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml
  131. +1 −1 src/test/resources/unit/stale-test/stale-test-plugin-config.xml
  132. +1 −1 ...s/maven-javadoc-plugin/unit/stylesheetfile-test/1.0-SNAPSHOT/stylesheetfile-test-1.0-SNAPSHOT.pom
  133. +1 −1 src/test/resources/unit/stylesheetfile-test/pom.xml
  134. +1 −1 src/test/resources/unit/subpackages-test/subpackages-test-plugin-config.xml
  135. +1 −1 src/test/resources/unit/tag-test/tag-test-plugin-config.xml
  136. +1 −1 src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml
  137. +1 −1 src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml
  138. +1 −1 src/test/resources/unit/test-javadoc-test/test-javadoc-test-plugin-config.xml
  139. +1 −1 src/test/resources/unit/validate-options-test/conflict-options-test-plugin-config.xml
  140. +1 −1 src/test/resources/unit/validate-options-test/wrong-charset-test-plugin-config.xml
  141. +1 −1 src/test/resources/unit/validate-options-test/wrong-docencoding-test-plugin-config.xml
  142. +1 −1 src/test/resources/unit/validate-options-test/wrong-encoding-test-plugin-config.xml
  143. +0 −51 src/test/resources/unit/validate-options-test/wrong-locale-test-plugin-config.xml
  144. +1 −1 src/test/resources/unit/validate-options-test/wrong-locale-with-variant-test-plugin-config.xml
8 changes: 6 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -24,7 +24,11 @@ on:
jobs:
build:
name: Verify
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
with:
jdk-distribution-matrix: '[ "temurin", "zulu", "microsoft", "liberica", "adopt-openj9" ]'
matrix-exclude: '[{ "jdk": "8", "distribution": "microsoft"}]'
matrix-exclude: '[
{ "jdk": "8", "distribution": "microsoft"},
{ "jdk": "8", "distribution": "temurin", "os": "macos-latest" },
{ "jdk": "8", "distribution": "adopt-openj9", "os": "macos-latest" }
]'
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -22,4 +22,4 @@ on:
- master
jobs:
update_release_draft:
uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v3
uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v4
154 changes: 72 additions & 82 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -23,12 +23,12 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
<version>41</version>
<version>43</version>
<relativePath />
</parent>

<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.3</version>
<version>3.10.0</version>
<packaging>maven-plugin</packaging>

<name>Apache Maven Javadoc Plugin</name>
@@ -91,7 +91,7 @@ under the License.
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git</developerConnection>
<tag>maven-javadoc-plugin-3.6.3</tag>
<tag>maven-javadoc-plugin-3.10.0</tag>
<url>https://github.com/apache/maven-javadoc-plugin/tree/${project.scm.tag}</url>
</scm>
<issueManagement>
@@ -111,57 +111,25 @@ under the License.

<properties>
<javaVersion>8</javaVersion>
<mavenVersion>3.2.5</mavenVersion>
<doxiaVersion>1.11.1</doxiaVersion>
<doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
<wagonVersion>2.4</wagonVersion>
<aetherVersion>1.0.0.v20140518</aetherVersion>
<mavenVersion>3.6.3</mavenVersion>
<doxiaSitetoolsVersion>2.0.0-M19</doxiaSitetoolsVersion>
<wagonVersion>3.5.3</wagonVersion>
<resolverVersion>1.4.1</resolverVersion>
<!-- https://cwiki.apache.org/confluence/x/VIHOCg#MavenEcosystemCleanup-ResolverandMaven -->
<plexus-java.version>1.2.0</plexus-java.version>
<jetty.version>9.4.53.v20231009</jetty.version>
<jetty.version>9.4.55.v20240627</jetty.version>
<!-- for ITs -->
<compilerPluginVersion>3.11.0</compilerPluginVersion>
<sourcePluginVersion>3.3.0</sourcePluginVersion>
<surefirePluginVersion>3.2.2</surefirePluginVersion>
<enforcerPluginVersion>3.4.1</enforcerPluginVersion>
<pluginPluginVersion>3.10.1</pluginPluginVersion>
<pluginPluginVersion>3.14.0</pluginPluginVersion>
<jarPluginVersion>3.3.0</jarPluginVersion>
<sitePluginVersion>3.12.1</sitePluginVersion>
<projectInfoReportsPluginVersion>3.5.0</projectInfoReportsPluginVersion>
<project.build.outputTimestamp>2023-11-30T21:30:37Z</project.build.outputTimestamp>
<sitePluginVersion>3.20.0</sitePluginVersion>
<projectInfoReportsPluginVersion>3.7.0</projectInfoReportsPluginVersion>
<project.build.outputTimestamp>2024-08-22T16:50:01Z</project.build.outputTimestamp>
<slf4jVersion>1.7.36</slf4jVersion>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-impl</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
<version>${aetherVersion}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<!-- @TODO remove!! -->
@@ -206,6 +174,23 @@ under the License.
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
<version>${resolverVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-impl</artifactId>
<version>${resolverVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-util</artifactId>
<version>${resolverVersion}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
@@ -215,17 +200,24 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>3.1.1</version>
<version>4.0.0-M12</version>
</dependency>
<!-- for Javadoc purposes -->
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
<version>4.0.0-M15</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
<version>3.6.1</version>
<version>3.6.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -236,27 +228,26 @@ under the License.
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
<!-- Do not upgrades, leads to IT failures, needs analysis -->
<version>3.2.0</version>
<version>3.4.0</version>
</dependency>
<!-- Doxia -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
<version>${doxiaVersion}</version>
<version>2.0.0-M12</version>
</dependency>

<!-- Doxia-sitetools -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
<version>${doxia-sitetoolsVersion}</version>
<exclusions>
<exclusion>
<!-- MJAVADOC-726 -->
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
</exclusion>
</exclusions>
<version>${doxiaSitetoolsVersion}</version>
</dependency>
<!-- Doxia-sitetools -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-integration-tools</artifactId>
<version>${doxiaSitetoolsVersion}</version>
</dependency>

<!-- wagon -->
@@ -270,12 +261,12 @@ under the License.
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
<version>3.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.11.0</version>
<version>1.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -291,7 +282,7 @@ under the License.
<dependency>
<groupId>com.thoughtworks.qdox</groupId>
<artifactId>qdox</artifactId>
<version>2.0.3</version>
<version>2.1.0</version>
</dependency>

<!-- Plexus -->
@@ -311,33 +302,24 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
<version>3.4.1</version>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>4.9.0</version>
<version>4.10.0</version>
</dependency>
<!-- MNG-6607: needs to be overriden for commons-compress otherwise it will appear earlier in the tree -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.0</version>
<scope>test</scope>
<version>2.16.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
<version>1.1</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
<version>1.3</version>
</dependency>

<!-- test -->
@@ -350,7 +332,7 @@ under the License.
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>2.2</version>
<version>3.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -396,13 +378,15 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-connector-basic</artifactId>
<version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-wagon</artifactId>
<version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -415,7 +399,7 @@ under the License.
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.24.2</version>
<version>3.26.3</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -457,6 +441,13 @@ under the License.
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<suppressionsLocation>src/config/checkstyle-suppressions.xml</suppressionsLocation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -496,7 +487,6 @@ under the License.
<configuration>
<systemPropertyVariables>
<maven.home>${maven.home}</maven.home>
<https.protocols>${https.protocols}</https.protocols>
</systemPropertyVariables>
<environmentVariables>
<JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,13 +17,11 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->

<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<mirrors>
<mirror>
<id>httpsCentral</id>
<url>https://repo.maven.apache.org/maven2</url>
<mirrorOf>central</mirrorOf>
</mirror>
</mirrors>
</settings>
<!DOCTYPE suppressions PUBLIC
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions>
<suppress checks="FileLengthCheck" files="AbstractFixJavadocMojo.java|AbstractJavadocMojo.java" />
<suppress checks="MethodLengthCheck" files="AbstractJavadocMojo.java" />
<suppress checks="ParameterNumberCheck" files="JavadocUtil.java" />
</suppressions>
Loading