This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch ARIES-2240-run-javadoc-in-the-standard-build in repository https://gitbox.apache.org/repos/asf/aries.git
commit be6332ea2f3d26f484c322f89447d4f6247eb952 Author: Dominik Przybysz <[email protected]> AuthorDate: Wed Aug 5 23:16:12 2026 +0200 ARIES-2240: Configure new parent with javadoc in util, testsupport and versioning --- testsupport/pom.xml | 2 +- testsupport/testsupport-unit/pom.xml | 2 +- util/pom.xml | 25 ++-------------------- .../java/org/apache/aries/util/log/Logger.java | 2 +- versioning/pom.xml | 2 +- versioning/versioning-checker/pom.xml | 3 ++- .../versioning/tests/BinaryCompatibilityTest.java | 2 +- versioning/versioning-plugin/pom.xml | 2 +- 8 files changed, 10 insertions(+), 30 deletions(-) diff --git a/testsupport/pom.xml b/testsupport/pom.xml index 674d6c374..92c6bf4a7 100644 --- a/testsupport/pom.xml +++ b/testsupport/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.1.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> diff --git a/testsupport/testsupport-unit/pom.xml b/testsupport/testsupport-unit/pom.xml index 364302e5b..ffe75cd17 100644 --- a/testsupport/testsupport-unit/pom.xml +++ b/testsupport/testsupport-unit/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.1.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/util/pom.xml b/util/pom.xml index 6a0b105d8..d1375ec1b 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.1.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -66,7 +66,7 @@ <aries.skip.version.check>true</aries.skip.version.check> <org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version> - <maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version> + <aries.javadoc.exclude.packages>${aries.osgi.private.pkg}</aries.javadoc.exclude.packages> <org.apache.aries.testsupport.unit.version>2.0.0</org.apache.aries.testsupport.unit.version> <org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version> </properties> @@ -101,25 +101,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${maven-javadoc-plugin.version}</version> - <executions> - <execution> - <id>javadoc-jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <failOnError>false</failOnError> - <excludePackageNames>*.impl:*.internal</excludePackageNames> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> diff --git a/util/src/main/java/org/apache/aries/util/log/Logger.java b/util/src/main/java/org/apache/aries/util/log/Logger.java index 57a75a860..04ecc9cda 100644 --- a/util/src/main/java/org/apache/aries/util/log/Logger.java +++ b/util/src/main/java/org/apache/aries/util/log/Logger.java @@ -26,7 +26,7 @@ import org.osgi.util.tracker.ServiceTracker; // Note this file originated in the JMX subproject. /** - * <p>This <tt>Logger</tt> class represents ServiceTracker for LogService. + * <p>This <code>Logger</code> class represents ServiceTracker for LogService. * It provides a simple mechanism for interacting with the log service. * * @see org.osgi.service.log.LogService diff --git a/versioning/pom.xml b/versioning/pom.xml index 1da233b2a..eacb745ad 100644 --- a/versioning/pom.xml +++ b/versioning/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.1.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> diff --git a/versioning/versioning-checker/pom.xml b/versioning/versioning-checker/pom.xml index 58c98d978..4388f6338 100644 --- a/versioning/versioning-checker/pom.xml +++ b/versioning/versioning-checker/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.1.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -57,6 +57,7 @@ <aries.osgi.private.pkg> org.apache.aries.versioning.utils; </aries.osgi.private.pkg> + <aries.javadoc.exclude.packages>org.apache.aries.versioning.utils</aries.javadoc.exclude.packages> <lastReleaseVersion>0.4.0</lastReleaseVersion> <aries.skip.version.check>true</aries.skip.version.check> diff --git a/versioning/versioning-checker/src/test/java/org/apache/aries/versioning/tests/BinaryCompatibilityTest.java b/versioning/versioning-checker/src/test/java/org/apache/aries/versioning/tests/BinaryCompatibilityTest.java index 66281516c..13ec7b06f 100644 --- a/versioning/versioning-checker/src/test/java/org/apache/aries/versioning/tests/BinaryCompatibilityTest.java +++ b/versioning/versioning-checker/src/test/java/org/apache/aries/versioning/tests/BinaryCompatibilityTest.java @@ -301,7 +301,7 @@ public class BinaryCompatibilityTest { } /** - * Change the signature of the field from Colllection<AA> to Collection<String> + * Change the signature of the field from {@code Colllection<AA>} to {@code Collection<String>} */ @Test public void test_jdk_chap13_4_7_5() { diff --git a/versioning/versioning-plugin/pom.xml b/versioning/versioning-plugin/pom.xml index 2c97f9959..a74c90797 100644 --- a/versioning/versioning-plugin/pom.xml +++ b/versioning/versioning-plugin/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.1.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent>
