This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch ARIES-2240-configure-javadoc-plugin-for-next-modules in repository https://gitbox.apache.org/repos/asf/aries.git
commit 911dd245bd93ab4e2a32a47f9de9ea9e019bf6e5 Author: Dominik Przybysz <[email protected]> AuthorDate: Sun Aug 16 20:55:20 2026 +0200 ARIES-2240: Configure javadoc plugin for next modules --- .../blueprint-maven-plugin-annotation/pom.xml | 2 +- .../blueprint-maven-plugin-itest/pom.xml | 2 +- .../pom.xml | 2 +- .../blueprint-maven-plugin-spi/pom.xml | 2 +- .../blueprint-maven-plugin-spring-handlers/pom.xml | 2 +- .../blueprint-maven-plugin/pom.xml | 2 +- blueprint-maven-plugin/pom.xml | 2 +- blueprint/blueprint-api/pom.xml | 4 +- blueprint/blueprint-authz/pom.xml | 2 +- blueprint/blueprint-bundle/pom.xml | 4 +- blueprint/blueprint-cm/pom.xml | 2 +- blueprint/blueprint-compatibility/pom.xml | 2 +- blueprint/blueprint-core-compatibility/pom.xml | 2 +- blueprint/blueprint-core/pom.xml | 10 +---- blueprint/blueprint-jexl-evaluator/pom.xml | 2 +- blueprint/blueprint-noosgi/pom.xml | 2 +- blueprint/blueprint-parser/pom.xml | 2 +- blueprint/blueprint-repository/pom.xml | 2 +- blueprint/blueprint-spring-camel/pom.xml | 2 +- blueprint/blueprint-spring-extender/pom.xml | 2 +- blueprint/blueprint-spring/pom.xml | 2 +- blueprint/blueprint-web-osgi/pom.xml | 2 +- blueprint/blueprint-web/pom.xml | 2 +- blueprint/examples/blueprint-sample-war/pom.xml | 2 +- blueprint/examples/blueprint-sample/pom.xml | 2 +- blueprint/examples/pom.xml | 2 +- blueprint/itests/blueprint-itests/pom.xml | 2 +- blueprint/itests/blueprint-testbundlea/pom.xml | 2 +- blueprint/itests/blueprint-testbundleb/pom.xml | 2 +- blueprint/itests/blueprint-testbundlee/pom.xml | 2 +- blueprint/itests/blueprint-testbundles/pom.xml | 2 +- .../itests/blueprint-testquiescebundle/pom.xml | 2 +- blueprint/itests/pom.xml | 2 +- blueprint/pom.xml | 2 +- esa-ant-task/pom.xml | 2 +- .../org/apache/aries/ant/taskdefs/EsaTask.java | 6 +-- esa-maven-plugin/pom.xml | 2 +- jmx/jmx-api/pom.xml | 2 +- jmx/jmx-blueprint-api/pom.xml | 2 +- jmx/jmx-blueprint-bundle/pom.xml | 4 +- jmx/jmx-blueprint-core/pom.xml | 2 +- jmx/jmx-bundle/pom.xml | 4 +- jmx/jmx-core-whiteboard/pom.xml | 2 +- jmx/jmx-core/pom.xml | 2 +- jmx/jmx-itests/pom.xml | 2 +- jmx/jmx-mbeanserver-platform/pom.xml | 2 +- jmx/jmx-whiteboard/pom.xml | 2 +- jmx/pom.xml | 2 +- jndi/jndi-api/pom.xml | 2 +- jndi/jndi-bundle/pom.xml | 4 +- jndi/jndi-core/pom.xml | 2 +- jndi/jndi-legacy-support/pom.xml | 2 +- jndi/jndi-rmi/pom.xml | 2 +- jndi/jndi-url-itest-biz/pom.xml | 2 +- jndi/jndi-url-itest-web/pom.xml | 2 +- jndi/jndi-url-itest/pom.xml | 2 +- jndi/jndi-url/pom.xml | 2 +- jndi/pom.xml | 2 +- parent/pom.xml | 47 ++++++++++++++++++++++ proxy/pom.xml | 2 +- proxy/proxy-api/pom.xml | 2 +- proxy/proxy-impl/pom.xml | 10 +---- proxy/proxy-itests/pom.xml | 2 +- subsystem/pom.xml | 2 +- subsystem/subsystem-api/pom.xml | 4 +- .../org/apache/aries/subsystem/AriesSubsystem.java | 2 +- subsystem/subsystem-bundle/pom.xml | 2 +- subsystem/subsystem-core/pom.xml | 2 +- subsystem/subsystem-gogo-command/pom.xml | 2 +- subsystem/subsystem-itests-api-bundle/pom.xml | 2 +- subsystem/subsystem-itests/pom.xml | 2 +- subsystem/subsystem-modeller/pom.xml | 2 +- subsystem/subsystem-obr/pom.xml | 2 +- transaction/pom.xml | 2 +- transaction/transaction-blueprint/pom.xml | 2 +- transaction/transaction-itests/pom.xml | 2 +- transaction/transaction-jdbc/pom.xml | 5 +-- transaction/transaction-jms/pom.xml | 2 +- .../transaction/jms/PooledConnectionFactory.java | 12 +++--- .../transaction/jms/internal/ConnectionPool.java | 4 +- .../transaction/jms/internal/PooledSession.java | 2 +- transaction/transaction-manager/pom.xml | 27 +++---------- transaction/transaction-testbundle/pom.xml | 2 +- transaction/transaction-testds/pom.xml | 2 +- web/pom.xml | 2 +- web/web-itests/pom.xml | 2 +- web/web-urlhandler/pom.xml | 2 +- 87 files changed, 156 insertions(+), 135 deletions(-) diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-annotation/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/pom.xml index 14414c7bd..5d1b8c42c 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-annotation/pom.xml +++ b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-itest/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/pom.xml index 34aed07e4..f8229a1c1 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-itest/pom.xml +++ b/blueprint-maven-plugin/blueprint-maven-plugin-itest/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/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml index e416a5419..c41323764 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml +++ b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-spi/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-spi/pom.xml index 28d1b46f8..2614e334f 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-spi/pom.xml +++ b/blueprint-maven-plugin/blueprint-maven-plugin-spi/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/pom.xml index 117fa6221..624598ffa 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/pom.xml +++ b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin/pom.xml index d67a36d63..497f9c0a4 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/pom.xml +++ b/blueprint-maven-plugin/blueprint-maven-plugin/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint-maven-plugin/pom.xml b/blueprint-maven-plugin/pom.xml index 7c956cb09..eed288410 100644 --- a/blueprint-maven-plugin/pom.xml +++ b/blueprint-maven-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> diff --git a/blueprint/blueprint-api/pom.xml b/blueprint/blueprint-api/pom.xml index ba7868013..6615b64cc 100644 --- a/blueprint/blueprint-api/pom.xml +++ b/blueprint/blueprint-api/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -55,6 +55,8 @@ org.osgi.framework </aries.osgi.import.pkg> <aries.osgi.private.pkg/> + <!-- Blueprint osgi javadoc has not closed code tag--> + <aries.javadoc.doclint>none</aries.javadoc.doclint> <lastReleaseVersion>1.0.0</lastReleaseVersion> <osgi.core.version>4.3.1</osgi.core.version> diff --git a/blueprint/blueprint-authz/pom.xml b/blueprint/blueprint-authz/pom.xml index 1e06c46ca..74a606570 100644 --- a/blueprint/blueprint-authz/pom.xml +++ b/blueprint/blueprint-authz/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint/blueprint-bundle/pom.xml b/blueprint/blueprint-bundle/pom.xml index 0037ffa47..cf13ef658 100644 --- a/blueprint/blueprint-bundle/pom.xml +++ b/blueprint/blueprint-bundle/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -45,6 +45,7 @@ </scm> <properties> + <aries.javadoc.doclint>none</aries.javadoc.doclint> <aries.osgi.symbolic.name> ${project.artifactId};blueprint.graceperiod:=false </aries.osgi.symbolic.name> @@ -349,7 +350,6 @@ <minmemory>128m</minmemory> <maxmemory>512m</maxmemory> <sourcepath>${project.build.directory}/sources</sourcepath> - <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin> </plugins> diff --git a/blueprint/blueprint-cm/pom.xml b/blueprint/blueprint-cm/pom.xml index 387e87092..9c1eb8e97 100644 --- a/blueprint/blueprint-cm/pom.xml +++ b/blueprint/blueprint-cm/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint/blueprint-compatibility/pom.xml b/blueprint/blueprint-compatibility/pom.xml index 1ddce9a64..e3b24e55e 100644 --- a/blueprint/blueprint-compatibility/pom.xml +++ b/blueprint/blueprint-compatibility/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint/blueprint-core-compatibility/pom.xml b/blueprint/blueprint-core-compatibility/pom.xml index 1ec438a22..1c2674142 100644 --- a/blueprint/blueprint-core-compatibility/pom.xml +++ b/blueprint/blueprint-core-compatibility/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint/blueprint-core/pom.xml b/blueprint/blueprint-core/pom.xml index 30f8ac42a..e2e724766 100644 --- a/blueprint/blueprint-core/pom.xml +++ b/blueprint/blueprint-core/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -46,6 +46,7 @@ </scm> <properties> + <aries.javadoc.doclint>none</aries.javadoc.doclint> <rat.excludesFile>${project.basedir}/rat-excludes.txt</rat.excludesFile> <aries.osgi.activator> org.apache.aries.blueprint.container.BlueprintExtender @@ -289,13 +290,6 @@ <artifactId>maven-release-plugin</artifactId> <version>${maven-release-plugin.version}</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:none</additionalparam> - </configuration> - </plugin> </plugins> </build> diff --git a/blueprint/blueprint-jexl-evaluator/pom.xml b/blueprint/blueprint-jexl-evaluator/pom.xml index b7351ca30..71e36a0fb 100644 --- a/blueprint/blueprint-jexl-evaluator/pom.xml +++ b/blueprint/blueprint-jexl-evaluator/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint/blueprint-noosgi/pom.xml b/blueprint/blueprint-noosgi/pom.xml index f9d9ec8ed..96c1f657a 100644 --- a/blueprint/blueprint-noosgi/pom.xml +++ b/blueprint/blueprint-noosgi/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint/blueprint-parser/pom.xml b/blueprint/blueprint-parser/pom.xml index 12dbf793d..c50938177 100644 --- a/blueprint/blueprint-parser/pom.xml +++ b/blueprint/blueprint-parser/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint/blueprint-repository/pom.xml b/blueprint/blueprint-repository/pom.xml index 8f2514aa0..79e189d25 100644 --- a/blueprint/blueprint-repository/pom.xml +++ b/blueprint/blueprint-repository/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint/blueprint-spring-camel/pom.xml b/blueprint/blueprint-spring-camel/pom.xml index 5657af8f6..4f5c28510 100644 --- a/blueprint/blueprint-spring-camel/pom.xml +++ b/blueprint/blueprint-spring-camel/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint/blueprint-spring-extender/pom.xml b/blueprint/blueprint-spring-extender/pom.xml index 666fe1eb0..12f79c869 100644 --- a/blueprint/blueprint-spring-extender/pom.xml +++ b/blueprint/blueprint-spring-extender/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint/blueprint-spring/pom.xml b/blueprint/blueprint-spring/pom.xml index bac5d308a..6fc04594f 100644 --- a/blueprint/blueprint-spring/pom.xml +++ b/blueprint/blueprint-spring/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint/blueprint-web-osgi/pom.xml b/blueprint/blueprint-web-osgi/pom.xml index 27e51dc40..692fbd2c9 100644 --- a/blueprint/blueprint-web-osgi/pom.xml +++ b/blueprint/blueprint-web-osgi/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint/blueprint-web/pom.xml b/blueprint/blueprint-web/pom.xml index 27999a807..c7555fff3 100644 --- a/blueprint/blueprint-web/pom.xml +++ b/blueprint/blueprint-web/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/blueprint/examples/blueprint-sample-war/pom.xml b/blueprint/examples/blueprint-sample-war/pom.xml index b22c0702d..a7944b786 100644 --- a/blueprint/examples/blueprint-sample-war/pom.xml +++ b/blueprint/examples/blueprint-sample-war/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/blueprint/examples/blueprint-sample/pom.xml b/blueprint/examples/blueprint-sample/pom.xml index aaad44d7b..b9c819df3 100644 --- a/blueprint/examples/blueprint-sample/pom.xml +++ b/blueprint/examples/blueprint-sample/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/blueprint/examples/pom.xml b/blueprint/examples/pom.xml index 86a8c2c58..f731e1e18 100644 --- a/blueprint/examples/pom.xml +++ b/blueprint/examples/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/blueprint/itests/blueprint-itests/pom.xml b/blueprint/itests/blueprint-itests/pom.xml index bbbd3ae04..5929f1f13 100644 --- a/blueprint/itests/blueprint-itests/pom.xml +++ b/blueprint/itests/blueprint-itests/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/blueprint/itests/blueprint-testbundlea/pom.xml b/blueprint/itests/blueprint-testbundlea/pom.xml index f7310ffce..2e6004ce6 100644 --- a/blueprint/itests/blueprint-testbundlea/pom.xml +++ b/blueprint/itests/blueprint-testbundlea/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/blueprint/itests/blueprint-testbundleb/pom.xml b/blueprint/itests/blueprint-testbundleb/pom.xml index b99ea2b09..6d275837c 100644 --- a/blueprint/itests/blueprint-testbundleb/pom.xml +++ b/blueprint/itests/blueprint-testbundleb/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/blueprint/itests/blueprint-testbundlee/pom.xml b/blueprint/itests/blueprint-testbundlee/pom.xml index 9aa8d55d3..69af00883 100644 --- a/blueprint/itests/blueprint-testbundlee/pom.xml +++ b/blueprint/itests/blueprint-testbundlee/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/blueprint/itests/blueprint-testbundles/pom.xml b/blueprint/itests/blueprint-testbundles/pom.xml index 03d57da31..492e2723d 100644 --- a/blueprint/itests/blueprint-testbundles/pom.xml +++ b/blueprint/itests/blueprint-testbundles/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/blueprint/itests/blueprint-testquiescebundle/pom.xml b/blueprint/itests/blueprint-testquiescebundle/pom.xml index 3a1d3c8e5..0e01dd2ec 100644 --- a/blueprint/itests/blueprint-testquiescebundle/pom.xml +++ b/blueprint/itests/blueprint-testquiescebundle/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/blueprint/itests/pom.xml b/blueprint/itests/pom.xml index 90f7409cf..904eff1eb 100644 --- a/blueprint/itests/pom.xml +++ b/blueprint/itests/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/blueprint/pom.xml b/blueprint/pom.xml index abd40a666..0774c0893 100644 --- a/blueprint/pom.xml +++ b/blueprint/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/esa-ant-task/pom.xml b/esa-ant-task/pom.xml index 94da4c1d8..f7625dbed 100644 --- a/esa-ant-task/pom.xml +++ b/esa-ant-task/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> diff --git a/esa-ant-task/src/main/java/org/apache/aries/ant/taskdefs/EsaTask.java b/esa-ant-task/src/main/java/org/apache/aries/ant/taskdefs/EsaTask.java index c8db71920..f7d8cac90 100755 --- a/esa-ant-task/src/main/java/org/apache/aries/ant/taskdefs/EsaTask.java +++ b/esa-ant-task/src/main/java/org/apache/aries/ant/taskdefs/EsaTask.java @@ -100,7 +100,7 @@ public class EsaTask extends Zip { } /** - * @param version + * @param subsystemVersion * the version to set */ public void setVersion(String subsystemVersion) { @@ -109,7 +109,7 @@ public class EsaTask extends Zip { } /** - * @param type + * @param subsystemType * the type to set */ public void setType(String subsystemType) { @@ -118,7 +118,7 @@ public class EsaTask extends Zip { } /** - * @param manifest + * @param manifestFile * file to use the manifest to set */ public void setManifest(File manifestFile) { diff --git a/esa-maven-plugin/pom.xml b/esa-maven-plugin/pom.xml index 654be6a76..f6b0fd53f 100644 --- a/esa-maven-plugin/pom.xml +++ b/esa-maven-plugin/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> diff --git a/jmx/jmx-api/pom.xml b/jmx/jmx-api/pom.xml index 0666acf3f..867f1e2de 100644 --- a/jmx/jmx-api/pom.xml +++ b/jmx/jmx-api/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/jmx/jmx-blueprint-api/pom.xml b/jmx/jmx-blueprint-api/pom.xml index 25b30609d..24e59accc 100644 --- a/jmx/jmx-blueprint-api/pom.xml +++ b/jmx/jmx-blueprint-api/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/jmx/jmx-blueprint-bundle/pom.xml b/jmx/jmx-blueprint-bundle/pom.xml index 60bbebcb5..d73a0e62f 100644 --- a/jmx/jmx-blueprint-bundle/pom.xml +++ b/jmx/jmx-blueprint-bundle/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -38,6 +38,7 @@ </description> <properties> + <aries.javadoc.doclint>none</aries.javadoc.doclint> <aries.osgi.activator> org.apache.aries.jmx.blueprint.impl.Activator </aries.osgi.activator> @@ -193,7 +194,6 @@ <minmemory>128m</minmemory> <maxmemory>512m</maxmemory> <sourcepath>${project.build.directory}/sources</sourcepath> - <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin> </plugins> diff --git a/jmx/jmx-blueprint-core/pom.xml b/jmx/jmx-blueprint-core/pom.xml index 96642d7f8..1342ea6aa 100644 --- a/jmx/jmx-blueprint-core/pom.xml +++ b/jmx/jmx-blueprint-core/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/jmx/jmx-bundle/pom.xml b/jmx/jmx-bundle/pom.xml index cf59a5a23..13616d1f8 100644 --- a/jmx/jmx-bundle/pom.xml +++ b/jmx/jmx-bundle/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -38,6 +38,7 @@ </description> <properties> + <aries.javadoc.doclint>none</aries.javadoc.doclint> <aries.osgi.activator> org.apache.aries.jmx.Activator </aries.osgi.activator> @@ -210,7 +211,6 @@ <minmemory>128m</minmemory> <maxmemory>512m</maxmemory> <sourcepath>${project.build.directory}/sources</sourcepath> - <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin> </plugins> diff --git a/jmx/jmx-core-whiteboard/pom.xml b/jmx/jmx-core-whiteboard/pom.xml index 17c14d6ef..bf3cb9b6c 100644 --- a/jmx/jmx-core-whiteboard/pom.xml +++ b/jmx/jmx-core-whiteboard/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/jmx/jmx-core/pom.xml b/jmx/jmx-core/pom.xml index 21857f269..763e02999 100644 --- a/jmx/jmx-core/pom.xml +++ b/jmx/jmx-core/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/jmx/jmx-itests/pom.xml b/jmx/jmx-itests/pom.xml index e1928efb1..e41d51e54 100644 --- a/jmx/jmx-itests/pom.xml +++ b/jmx/jmx-itests/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/jmx/jmx-mbeanserver-platform/pom.xml b/jmx/jmx-mbeanserver-platform/pom.xml index 2aa3fec1b..bf4496ca7 100644 --- a/jmx/jmx-mbeanserver-platform/pom.xml +++ b/jmx/jmx-mbeanserver-platform/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/jmx/jmx-whiteboard/pom.xml b/jmx/jmx-whiteboard/pom.xml index 58ba4cfa2..198fda355 100644 --- a/jmx/jmx-whiteboard/pom.xml +++ b/jmx/jmx-whiteboard/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/jmx/pom.xml b/jmx/pom.xml index 5f9308a4f..6d3960009 100644 --- a/jmx/pom.xml +++ b/jmx/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/jndi/jndi-api/pom.xml b/jndi/jndi-api/pom.xml index 840249994..7c6be5f02 100644 --- a/jndi/jndi-api/pom.xml +++ b/jndi/jndi-api/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/jndi/jndi-bundle/pom.xml b/jndi/jndi-bundle/pom.xml index 5380919cf..a5edcfc7a 100644 --- a/jndi/jndi-bundle/pom.xml +++ b/jndi/jndi-bundle/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -45,6 +45,7 @@ </scm> <properties> + <aries.javadoc.doclint>none</aries.javadoc.doclint> <!-- Export package versions are maintained in packageinfo files --> <aries.osgi.export.pkg> org.osgi.service.jndi, @@ -245,7 +246,6 @@ <minmemory>128m</minmemory> <maxmemory>512m</maxmemory> <sourcepath>${project.build.directory}/sources</sourcepath> - <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin> </plugins> diff --git a/jndi/jndi-core/pom.xml b/jndi/jndi-core/pom.xml index 9d3ae6893..22e73b88b 100644 --- a/jndi/jndi-core/pom.xml +++ b/jndi/jndi-core/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/jndi/jndi-legacy-support/pom.xml b/jndi/jndi-legacy-support/pom.xml index 726e92243..bc42404c4 100644 --- a/jndi/jndi-legacy-support/pom.xml +++ b/jndi/jndi-legacy-support/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/jndi/jndi-rmi/pom.xml b/jndi/jndi-rmi/pom.xml index 0bf6e9818..21a17899f 100644 --- a/jndi/jndi-rmi/pom.xml +++ b/jndi/jndi-rmi/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/jndi/jndi-url-itest-biz/pom.xml b/jndi/jndi-url-itest-biz/pom.xml index a4e961099..89c0cdf67 100644 --- a/jndi/jndi-url-itest-biz/pom.xml +++ b/jndi/jndi-url-itest-biz/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/jndi/jndi-url-itest-web/pom.xml b/jndi/jndi-url-itest-web/pom.xml index ebbd8fac4..c81844acf 100644 --- a/jndi/jndi-url-itest-web/pom.xml +++ b/jndi/jndi-url-itest-web/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/jndi/jndi-url-itest/pom.xml b/jndi/jndi-url-itest/pom.xml index b6f2e8c5b..38e9d9fd4 100644 --- a/jndi/jndi-url-itest/pom.xml +++ b/jndi/jndi-url-itest/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/jndi/jndi-url/pom.xml b/jndi/jndi-url/pom.xml index 88e62dfcf..08e95ca6c 100644 --- a/jndi/jndi-url/pom.xml +++ b/jndi/jndi-url/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/jndi/pom.xml b/jndi/pom.xml index 6e6e94f04..391db6010 100644 --- a/jndi/pom.xml +++ b/jndi/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/parent/pom.xml b/parent/pom.xml index d27f244a4..a2cca2944 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -178,6 +178,7 @@ <aries.osgi.remove.headers>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</aries.osgi.remove.headers> <aries.osgi.include.resource>{maven-resources}</aries.osgi.include.resource> <aries.javadoc.exclude.packages>${aries.osgi.private.pkg}</aries.javadoc.exclude.packages> + <aries.javadoc.doclint/> <lastReleaseVersion>RELEASE</lastReleaseVersion> <!--Dependencies--> @@ -441,6 +442,9 @@ <configuration> <source>${java.source.version}</source> <quiet>true</quiet> + <doclint>${aries.javadoc.doclint}</doclint> + <!-- + <sourcepath>${project.basedir}/src/main/java/org/apache/aries</sourcepath>--> <excludePackageNames>${aries.javadoc.exclude.packages}</excludePackageNames> <!-- External links are deliberately omitted here: javadoc would fetch the @@ -497,6 +501,28 @@ <name>ThreadSafe</name> <placement>t</placement> </tag> + <!-- + <tag> + <name>noimplement</name> + <placement>t</placement> + </tag> + --> + <tag> + <name>org.apache.xbean.XBean</name> + <placement>t</placement> + </tag> + <tag> + <name>org.apache.xbean.Property</name> + <placement>m</placement> + </tag> + <tag> + <name>org.apache.xbean.InitMethod</name> + <placement>m</placement> + </tag> + <tag> + <name>org.apache.xbean.DestroyMethod</name> + <placement>m</placement> + </tag> </tags> </configuration> <executions> @@ -617,6 +643,7 @@ </reportSets> <configuration> <excludePackageNames>${aries.javadoc.exclude.packages}</excludePackageNames> + <doclint>${aries.javadoc.doclint}</doclint> <quiet>true</quiet> <source>${java.source.version}</source> <links> @@ -672,6 +699,26 @@ <name>ThreadSafe</name> <placement>t</placement> </tag> + <tag> + <name>noimplement</name> + <placement>t</placement> + </tag> + <tag> + <name>org.apache.xbean.XBean</name> + <placement>t</placement> + </tag> + <tag> + <name>org.apache.xbean.Property</name> + <placement>m</placement> + </tag> + <tag> + <name>org.apache.xbean.InitMethod</name> + <placement>m</placement> + </tag> + <tag> + <name>org.apache.xbean.DestroyMethod</name> + <placement>m</placement> + </tag> </tags> </configuration> </plugin> diff --git a/proxy/pom.xml b/proxy/pom.xml index 873cdd4f5..9f91c9ccc 100644 --- a/proxy/pom.xml +++ b/proxy/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/proxy/proxy-api/pom.xml b/proxy/proxy-api/pom.xml index 7a172f0f1..24a1309b0 100644 --- a/proxy/proxy-api/pom.xml +++ b/proxy/proxy-api/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/proxy/proxy-impl/pom.xml b/proxy/proxy-impl/pom.xml index f90e4c58d..cbfa75e13 100644 --- a/proxy/proxy-impl/pom.xml +++ b/proxy/proxy-impl/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -45,6 +45,7 @@ </scm> <properties> + <aries.javadoc.doclint>none</aries.javadoc.doclint> <aries.osgi.export.pkg> org.apache.aries.proxy;, org.apache.aries.proxy.weaving;, @@ -168,13 +169,6 @@ </instructions> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:none</additionalparam> - </configuration> - </plugin> </plugins> </build> diff --git a/proxy/proxy-itests/pom.xml b/proxy/proxy-itests/pom.xml index 6e4f5cb87..21c5c11af 100644 --- a/proxy/proxy-itests/pom.xml +++ b/proxy/proxy-itests/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/subsystem/pom.xml b/subsystem/pom.xml index 36dcd419a..ac5e00c4c 100644 --- a/subsystem/pom.xml +++ b/subsystem/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/subsystem/subsystem-api/pom.xml b/subsystem/subsystem-api/pom.xml index 2b173a250..6b78b667b 100644 --- a/subsystem/subsystem-api/pom.xml +++ b/subsystem/subsystem-api/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -58,6 +58,8 @@ <osgi.annotation.version>8.1.0</osgi.annotation.version> <osgi.core.version>6.0.0</osgi.core.version> <osgi.enterprise.version>5.0.0</osgi.enterprise.version> + <!-- Blueprint osgi javadoc has not closed code tag--> + <aries.javadoc.doclint>none</aries.javadoc.doclint> </properties> <dependencies> diff --git a/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/AriesSubsystem.java b/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/AriesSubsystem.java index 3387eb5a4..a4d1b780c 100644 --- a/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/AriesSubsystem.java +++ b/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/AriesSubsystem.java @@ -32,7 +32,7 @@ public interface AriesSubsystem extends Subsystem { * will be allowed to resolve against matching capabilities that are visible * to the parent subsystems. * - * @param requirement The requirement to add to the sharing policy. + * @param requirements The requirements to add to the sharing policy. * @throws SubsystemException If the requirement did not already exist and * could not be added. * @throws UnsupportedOperationException If this is the root subsystem or diff --git a/subsystem/subsystem-bundle/pom.xml b/subsystem/subsystem-bundle/pom.xml index 76d1df745..2e5383e5a 100644 --- a/subsystem/subsystem-bundle/pom.xml +++ b/subsystem/subsystem-bundle/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/subsystem/subsystem-core/pom.xml b/subsystem/subsystem-core/pom.xml index 5ef3e90eb..8255d6db8 100644 --- a/subsystem/subsystem-core/pom.xml +++ b/subsystem/subsystem-core/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/subsystem/subsystem-gogo-command/pom.xml b/subsystem/subsystem-gogo-command/pom.xml index 33e2f521c..7a6ff6a8f 100644 --- a/subsystem/subsystem-gogo-command/pom.xml +++ b/subsystem/subsystem-gogo-command/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/subsystem/subsystem-itests-api-bundle/pom.xml b/subsystem/subsystem-itests-api-bundle/pom.xml index 6a029dad7..249011c4a 100644 --- a/subsystem/subsystem-itests-api-bundle/pom.xml +++ b/subsystem/subsystem-itests-api-bundle/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/subsystem/subsystem-itests/pom.xml b/subsystem/subsystem-itests/pom.xml index 90abadb9c..e6ff8421f 100644 --- a/subsystem/subsystem-itests/pom.xml +++ b/subsystem/subsystem-itests/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/subsystem/subsystem-modeller/pom.xml b/subsystem/subsystem-modeller/pom.xml index b6fce35fb..400639df7 100644 --- a/subsystem/subsystem-modeller/pom.xml +++ b/subsystem/subsystem-modeller/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/subsystem/subsystem-obr/pom.xml b/subsystem/subsystem-obr/pom.xml index c8328a789..fcd007817 100644 --- a/subsystem/subsystem-obr/pom.xml +++ b/subsystem/subsystem-obr/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/transaction/pom.xml b/transaction/pom.xml index f1c0bc43b..7cb5a1fd5 100644 --- a/transaction/pom.xml +++ b/transaction/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/transaction/transaction-blueprint/pom.xml b/transaction/transaction-blueprint/pom.xml index cce75588d..03e4de67b 100644 --- a/transaction/transaction-blueprint/pom.xml +++ b/transaction/transaction-blueprint/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>2.1.1</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/transaction/transaction-itests/pom.xml b/transaction/transaction-itests/pom.xml index 37e949e39..5cae2d0b9 100644 --- a/transaction/transaction-itests/pom.xml +++ b/transaction/transaction-itests/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>2.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/transaction/transaction-jdbc/pom.xml b/transaction/transaction-jdbc/pom.xml index 484460b88..0a3ded5c0 100644 --- a/transaction/transaction-jdbc/pom.xml +++ b/transaction/transaction-jdbc/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>2.0.1</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -41,6 +41,7 @@ </scm> <properties> + <aries.javadoc.doclint>none</aries.javadoc.doclint> <aries.osgi.export.pkg> org.apache.aries.transaction.jdbc;version="2.1" </aries.osgi.export.pkg> @@ -66,8 +67,6 @@ </aries.osgi.activator> <lastReleaseVersion>1.0.0</lastReleaseVersion> - <additionalparam>-Xdoclint:none</additionalparam> - <geronimo-connector.version>3.1.5</geronimo-connector.version> <maven-antrun-plugin.version>3.2.0</maven-antrun-plugin.version> <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version> diff --git a/transaction/transaction-jms/pom.xml b/transaction/transaction-jms/pom.xml index eaa34615b..4e14d3b88 100644 --- a/transaction/transaction-jms/pom.xml +++ b/transaction/transaction-jms/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>2.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/PooledConnectionFactory.java b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/PooledConnectionFactory.java index 7028e67ce..d56187d8a 100644 --- a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/PooledConnectionFactory.java +++ b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/PooledConnectionFactory.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; * Connections, sessions and producers are returned to a pool after use so that they can be reused later * without having to undergo the cost of creating them again. * - * b>NOTE:</b> while this implementation does allow the creation of a collection of active consumers, + * <b>NOTE:</b> while this implementation does allow the creation of a collection of active consumers, * it does not 'pool' consumers. Pooling makes sense for connections, sessions and producers, which * are expensive to create and can remain idle a minimal cost. Consumers, on the other hand, are usually * just created at startup and left active, handling incoming messages as they come. When a consumer is @@ -155,7 +155,7 @@ public class PooledConnectionFactory implements ConnectionFactory { /** * Sets the ConnectionFactory used to create new pooled Connections. - * <p/> + * <p> * Updates to this value do not affect Connections that were previously created and placed * into the pool. In order to allocate new Connections based off this new ConnectionFactory * it is first necessary to {@link #clear()} the pooled Connections. @@ -365,7 +365,7 @@ public class PooledConnectionFactory implements ConnectionFactory { /** * Gets the Idle timeout value applied to new Connection's that are created by this pool. - * <p/> + * <p> * The idle timeout is used determine if a Connection instance has sat to long in the pool unused * and if so is closed and removed from the pool. The default value is 30 seconds. * @@ -378,7 +378,7 @@ public class PooledConnectionFactory implements ConnectionFactory { /** * Sets the idle timeout value for Connection's that are created by this pool in Milliseconds, * defaults to 30 seconds. - * <p/> + * <p> * For a Connection that is in the pool but has no current users the idle timeout determines how * long the Connection can live before it is eligible for removal from the pool. Normally the * connections are tested when an attempt to check one out occurs so a Connection instance can sit @@ -417,7 +417,7 @@ public class PooledConnectionFactory implements ConnectionFactory { /** * Whether to create a connection on starting this {@link PooledConnectionFactory}. - * <p/> + * <p> * This can be used to warm-up the pool on startup. Notice that any kind of exception * happens during startup is logged at WARN level and ignored. * @@ -468,7 +468,7 @@ public class PooledConnectionFactory implements ConnectionFactory { * When non-positive, no idle object eviction thread will be run, and Connections will only be * checked on borrow to determine if they have sat idle for too long or have failed for some * other reason. - * <p/> + * <p> * By default this value is set to -1 and no expiration thread ever runs. * * @param timeBetweenExpirationCheckMillis diff --git a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/ConnectionPool.java b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/ConnectionPool.java index 10305d096..7b6e7b236 100644 --- a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/ConnectionPool.java +++ b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/ConnectionPool.java @@ -30,7 +30,7 @@ import org.apache.commons.pool.impl.GenericObjectPool; /** * Holds a real JMS connection along with the session pools associated with it. - * <p/> + * <p> * Instances of this class are shared amongst one or more PooledConnection object and must * track the session objects that are loaned out for cleanup on close as well as ensuring * that the temporary destinations of the managed Connection are purged when all references @@ -177,7 +177,7 @@ public class ConnectionPool { /** * Determines if this Connection has expired. - * <p/> + * <p> * A ConnectionPool is considered expired when all references to it are released AND either * the configured idleTimeout has elapsed OR the configured expiryTimeout has elapsed. * Once a ConnectionPool is determined to have expired its underlying Connection is closed. diff --git a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/PooledSession.java b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/PooledSession.java index d6d8fb424..feec52ccd 100644 --- a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/PooledSession.java +++ b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/PooledSession.java @@ -486,7 +486,7 @@ public class PooledSession implements Session, TopicSession, QueueSession, XASes /** * Callback invoked when the consumer is closed. - * <p/> + * <p> * This is used to keep track of an explicit closed consumer created by this * session, by which we know do not need to keep track of the consumer, as * its already closed. diff --git a/transaction/transaction-manager/pom.xml b/transaction/transaction-manager/pom.xml index d72488a2e..e9726d2ef 100644 --- a/transaction/transaction-manager/pom.xml +++ b/transaction/transaction-manager/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>2.0.1</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -68,7 +68,8 @@ </aries.osgi.include.resource> <lastReleaseVersion>1.3.0</lastReleaseVersion> <aries.skip.version.check>false</aries.skip.version.check> - <maven.javadoc.failOnError>false</maven.javadoc.failOnError> + <!-- Excluding org.objectweb.howl additionall since entry from private package does not work fully--> + <aries.javadoc.exclude.packages>org.objectweb.howl*,${aries.osgi.private.pkg}</aries.javadoc.exclude.packages> <commons-io.version>2.22.0</commons-io.version> <geronimo-transaction.version>3.1.4</geronimo-transaction.version> @@ -172,11 +173,11 @@ <execution> <phase>generate-sources</phase> <configuration> - <tasks> + <target name="copy-sources"> <copy todir="${project.build.directory}/sources"> <fileset dir="${basedir}/src/main/java"/> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -197,24 +198,6 @@ </execution> </executions> </plugin> - <!--<plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>package1</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <minmemory>128m</minmemory> - <maxmemory>512m</maxmemory> - <sourcepath>${project.build.directory}/sources</sourcepath> - </configuration> - </execution> - </executions> - </plugin> --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> diff --git a/transaction/transaction-testbundle/pom.xml b/transaction/transaction-testbundle/pom.xml index e75196c71..7bbd6b52f 100644 --- a/transaction/transaction-testbundle/pom.xml +++ b/transaction/transaction-testbundle/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>2.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/transaction/transaction-testds/pom.xml b/transaction/transaction-testds/pom.xml index eab492afc..bdc7e8f17 100644 --- a/transaction/transaction-testds/pom.xml +++ b/transaction/transaction-testds/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>2.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> diff --git a/web/pom.xml b/web/pom.xml index e6cbe3179..eb9950def 100644 --- a/web/pom.xml +++ b/web/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/web/web-itests/pom.xml b/web/web-itests/pom.xml index a5e7b7097..13c70fdee 100644 --- a/web/web-itests/pom.xml +++ b/web/web-itests/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/web/web-urlhandler/pom.xml b/web/web-urlhandler/pom.xml index 041dbd918..fe1d0261a 100644 --- a/web/web-urlhandler/pom.xml +++ b/web/web-urlhandler/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>3.0.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent>
