diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-annotation/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/pom.xml index 14414c7bd4..5d1b8c42c2 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 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-itest/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/pom.xml index 34aed07e4d..f8229a1c19 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 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml 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 e416a5419b..c413237645 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 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-spi/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-spi/pom.xml index 28d1b46f82..2614e334f1 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 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml 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 117fa62216..624598ffa9 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 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin/pom.xml index d67a36d632..497f9c0a40 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/pom.xml +++ b/blueprint-maven-plugin/blueprint-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint-maven-plugin/pom.xml b/blueprint-maven-plugin/pom.xml index 7c956cb095..eed2884105 100644 --- a/blueprint-maven-plugin/pom.xml +++ b/blueprint-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../parent/pom.xml diff --git a/blueprint/blueprint-api/pom.xml b/blueprint/blueprint-api/pom.xml index ba7868013a..6615b64ccb 100644 --- a/blueprint/blueprint-api/pom.xml +++ b/blueprint/blueprint-api/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml @@ -55,6 +55,8 @@ org.osgi.framework + + none 1.0.0 4.3.1 diff --git a/blueprint/blueprint-authz/pom.xml b/blueprint/blueprint-authz/pom.xml index 1e06c46ca6..74a606570e 100644 --- a/blueprint/blueprint-authz/pom.xml +++ b/blueprint/blueprint-authz/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint/blueprint-bundle/pom.xml b/blueprint/blueprint-bundle/pom.xml index 0037ffa47a..cf13ef6583 100644 --- a/blueprint/blueprint-bundle/pom.xml +++ b/blueprint/blueprint-bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml @@ -45,6 +45,7 @@ + none ${project.artifactId};blueprint.graceperiod:=false @@ -349,7 +350,6 @@ 128m 512m ${project.build.directory}/sources - -Xdoclint:none diff --git a/blueprint/blueprint-cm/pom.xml b/blueprint/blueprint-cm/pom.xml index 387e870925..9c1eb8e973 100644 --- a/blueprint/blueprint-cm/pom.xml +++ b/blueprint/blueprint-cm/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint/blueprint-compatibility/pom.xml b/blueprint/blueprint-compatibility/pom.xml index 1ddce9a649..e3b24e55ef 100644 --- a/blueprint/blueprint-compatibility/pom.xml +++ b/blueprint/blueprint-compatibility/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint/blueprint-core-compatibility/pom.xml b/blueprint/blueprint-core-compatibility/pom.xml index 1ec438a22b..1c26741423 100644 --- a/blueprint/blueprint-core-compatibility/pom.xml +++ b/blueprint/blueprint-core-compatibility/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint/blueprint-core/pom.xml b/blueprint/blueprint-core/pom.xml index 30f8ac42a6..e2e7247664 100644 --- a/blueprint/blueprint-core/pom.xml +++ b/blueprint/blueprint-core/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml @@ -46,6 +46,7 @@ + none ${project.basedir}/rat-excludes.txt org.apache.aries.blueprint.container.BlueprintExtender @@ -289,13 +290,6 @@ maven-release-plugin ${maven-release-plugin.version} - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - diff --git a/blueprint/blueprint-jexl-evaluator/pom.xml b/blueprint/blueprint-jexl-evaluator/pom.xml index b7351ca300..71e36a0fb7 100644 --- a/blueprint/blueprint-jexl-evaluator/pom.xml +++ b/blueprint/blueprint-jexl-evaluator/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint/blueprint-noosgi/pom.xml b/blueprint/blueprint-noosgi/pom.xml index f9d9ec8ed4..96c1f657ac 100644 --- a/blueprint/blueprint-noosgi/pom.xml +++ b/blueprint/blueprint-noosgi/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint/blueprint-parser/pom.xml b/blueprint/blueprint-parser/pom.xml index 12dbf793d4..c50938177a 100644 --- a/blueprint/blueprint-parser/pom.xml +++ b/blueprint/blueprint-parser/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint/blueprint-repository/pom.xml b/blueprint/blueprint-repository/pom.xml index 8f2514aa06..79e189d250 100644 --- a/blueprint/blueprint-repository/pom.xml +++ b/blueprint/blueprint-repository/pom.xml @@ -22,7 +22,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint/blueprint-spring-camel/pom.xml b/blueprint/blueprint-spring-camel/pom.xml index 5657af8f69..4f5c28510a 100644 --- a/blueprint/blueprint-spring-camel/pom.xml +++ b/blueprint/blueprint-spring-camel/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint/blueprint-spring-extender/pom.xml b/blueprint/blueprint-spring-extender/pom.xml index 666fe1eb03..12f79c869c 100644 --- a/blueprint/blueprint-spring-extender/pom.xml +++ b/blueprint/blueprint-spring-extender/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint/blueprint-spring/pom.xml b/blueprint/blueprint-spring/pom.xml index bac5d308af..6fc04594f1 100644 --- a/blueprint/blueprint-spring/pom.xml +++ b/blueprint/blueprint-spring/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint/blueprint-web-osgi/pom.xml b/blueprint/blueprint-web-osgi/pom.xml index 27e51dc404..692fbd2c9e 100644 --- a/blueprint/blueprint-web-osgi/pom.xml +++ b/blueprint/blueprint-web-osgi/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint/blueprint-web/pom.xml b/blueprint/blueprint-web/pom.xml index 27999a807f..c7555fff3e 100644 --- a/blueprint/blueprint-web/pom.xml +++ b/blueprint/blueprint-web/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint/examples/blueprint-sample-war/pom.xml b/blueprint/examples/blueprint-sample-war/pom.xml index b22c0702d4..a7944b786b 100644 --- a/blueprint/examples/blueprint-sample-war/pom.xml +++ b/blueprint/examples/blueprint-sample-war/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../../../parent/pom.xml diff --git a/blueprint/examples/blueprint-sample/pom.xml b/blueprint/examples/blueprint-sample/pom.xml index aaad44d7b4..b9c819df3d 100644 --- a/blueprint/examples/blueprint-sample/pom.xml +++ b/blueprint/examples/blueprint-sample/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../../../parent/pom.xml diff --git a/blueprint/examples/pom.xml b/blueprint/examples/pom.xml index 86a8c2c58c..f731e1e180 100644 --- a/blueprint/examples/pom.xml +++ b/blueprint/examples/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint/itests/blueprint-itests/pom.xml b/blueprint/itests/blueprint-itests/pom.xml index bbbd3ae042..5929f1f132 100644 --- a/blueprint/itests/blueprint-itests/pom.xml +++ b/blueprint/itests/blueprint-itests/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../../../parent/pom.xml diff --git a/blueprint/itests/blueprint-testbundlea/pom.xml b/blueprint/itests/blueprint-testbundlea/pom.xml index f7310ffce9..2e6004ce65 100644 --- a/blueprint/itests/blueprint-testbundlea/pom.xml +++ b/blueprint/itests/blueprint-testbundlea/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../../../parent/pom.xml diff --git a/blueprint/itests/blueprint-testbundleb/pom.xml b/blueprint/itests/blueprint-testbundleb/pom.xml index b99ea2b098..6d275837c1 100644 --- a/blueprint/itests/blueprint-testbundleb/pom.xml +++ b/blueprint/itests/blueprint-testbundleb/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../../../parent/pom.xml diff --git a/blueprint/itests/blueprint-testbundlee/pom.xml b/blueprint/itests/blueprint-testbundlee/pom.xml index 9aa8d55d35..69af00883f 100644 --- a/blueprint/itests/blueprint-testbundlee/pom.xml +++ b/blueprint/itests/blueprint-testbundlee/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../../../parent/pom.xml diff --git a/blueprint/itests/blueprint-testbundles/pom.xml b/blueprint/itests/blueprint-testbundles/pom.xml index 03d57da31c..492e2723df 100644 --- a/blueprint/itests/blueprint-testbundles/pom.xml +++ b/blueprint/itests/blueprint-testbundles/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../../../parent/pom.xml diff --git a/blueprint/itests/blueprint-testquiescebundle/pom.xml b/blueprint/itests/blueprint-testquiescebundle/pom.xml index 3a1d3c8e55..0e01dd2ec2 100644 --- a/blueprint/itests/blueprint-testquiescebundle/pom.xml +++ b/blueprint/itests/blueprint-testquiescebundle/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../../../parent/pom.xml diff --git a/blueprint/itests/pom.xml b/blueprint/itests/pom.xml index 90f7409cfa..904eff1eba 100644 --- a/blueprint/itests/pom.xml +++ b/blueprint/itests/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/blueprint/pom.xml b/blueprint/pom.xml index abd40a6664..0774c08935 100644 --- a/blueprint/pom.xml +++ b/blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../parent/pom.xml diff --git a/esa-ant-task/pom.xml b/esa-ant-task/pom.xml index 94da4c1d8e..f7625dbed3 100644 --- a/esa-ant-task/pom.xml +++ b/esa-ant-task/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../parent/pom.xml 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 c8db719206..f7d8cac900 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 void setName(String name) { } /** - * @param version + * @param subsystemVersion * the version to set */ public void setVersion(String subsystemVersion) { @@ -109,7 +109,7 @@ public void setVersion(String subsystemVersion) { } /** - * @param type + * @param subsystemType * the type to set */ public void setType(String subsystemType) { @@ -118,7 +118,7 @@ public void setType(String subsystemType) { } /** - * @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 654be6a765..f6b0fd53f8 100644 --- a/esa-maven-plugin/pom.xml +++ b/esa-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../parent/pom.xml diff --git a/jmx/jmx-api/pom.xml b/jmx/jmx-api/pom.xml index 0666acf3fc..8f15ad0d5f 100644 --- a/jmx/jmx-api/pom.xml +++ b/jmx/jmx-api/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml @@ -52,6 +52,7 @@ * + none 1.1.5 diff --git a/jmx/jmx-blueprint-api/pom.xml b/jmx/jmx-blueprint-api/pom.xml index 25b30609df..24e59acccf 100644 --- a/jmx/jmx-blueprint-api/pom.xml +++ b/jmx/jmx-blueprint-api/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/jmx/jmx-blueprint-bundle/pom.xml b/jmx/jmx-blueprint-bundle/pom.xml index 60bbebcb58..d73a0e62f4 100644 --- a/jmx/jmx-blueprint-bundle/pom.xml +++ b/jmx/jmx-blueprint-bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml @@ -38,6 +38,7 @@ + none org.apache.aries.jmx.blueprint.impl.Activator @@ -193,7 +194,6 @@ 128m 512m ${project.build.directory}/sources - -Xdoclint:none diff --git a/jmx/jmx-blueprint-core/pom.xml b/jmx/jmx-blueprint-core/pom.xml index 96642d7f82..1342ea6aa0 100644 --- a/jmx/jmx-blueprint-core/pom.xml +++ b/jmx/jmx-blueprint-core/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/jmx/jmx-bundle/pom.xml b/jmx/jmx-bundle/pom.xml index cf59a5a236..13616d1f89 100644 --- a/jmx/jmx-bundle/pom.xml +++ b/jmx/jmx-bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml @@ -38,6 +38,7 @@ + none org.apache.aries.jmx.Activator @@ -210,7 +211,6 @@ 128m 512m ${project.build.directory}/sources - -Xdoclint:none diff --git a/jmx/jmx-core-whiteboard/pom.xml b/jmx/jmx-core-whiteboard/pom.xml index 17c14d6ef8..bf3cb9b6cd 100644 --- a/jmx/jmx-core-whiteboard/pom.xml +++ b/jmx/jmx-core-whiteboard/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/jmx/jmx-core/pom.xml b/jmx/jmx-core/pom.xml index 21857f2693..763e02999d 100644 --- a/jmx/jmx-core/pom.xml +++ b/jmx/jmx-core/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/jmx/jmx-itests/pom.xml b/jmx/jmx-itests/pom.xml index e1928efb16..e41d51e545 100644 --- a/jmx/jmx-itests/pom.xml +++ b/jmx/jmx-itests/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/jmx/jmx-mbeanserver-platform/pom.xml b/jmx/jmx-mbeanserver-platform/pom.xml index 2aa3fec1b4..bf4496ca79 100644 --- a/jmx/jmx-mbeanserver-platform/pom.xml +++ b/jmx/jmx-mbeanserver-platform/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/jmx/jmx-whiteboard/pom.xml b/jmx/jmx-whiteboard/pom.xml index 58ba4cfa2c..198fda3558 100644 --- a/jmx/jmx-whiteboard/pom.xml +++ b/jmx/jmx-whiteboard/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/jmx/pom.xml b/jmx/pom.xml index 5f9308a4f1..6d39600098 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../parent/pom.xml diff --git a/jndi/jndi-api/pom.xml b/jndi/jndi-api/pom.xml index 8402499942..7c6be5f02c 100644 --- a/jndi/jndi-api/pom.xml +++ b/jndi/jndi-api/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/jndi/jndi-bundle/pom.xml b/jndi/jndi-bundle/pom.xml index 5380919cf7..a5edcfc7a7 100644 --- a/jndi/jndi-bundle/pom.xml +++ b/jndi/jndi-bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml @@ -45,6 +45,7 @@ + none org.osgi.service.jndi, @@ -245,7 +246,6 @@ 128m 512m ${project.build.directory}/sources - -Xdoclint:none diff --git a/jndi/jndi-core/pom.xml b/jndi/jndi-core/pom.xml index 9d3ae6893c..22e73b88be 100644 --- a/jndi/jndi-core/pom.xml +++ b/jndi/jndi-core/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/jndi/jndi-legacy-support/pom.xml b/jndi/jndi-legacy-support/pom.xml index 726e922436..bc42404c4a 100644 --- a/jndi/jndi-legacy-support/pom.xml +++ b/jndi/jndi-legacy-support/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/jndi/jndi-rmi/pom.xml b/jndi/jndi-rmi/pom.xml index 0bf6e98189..21a17899f3 100644 --- a/jndi/jndi-rmi/pom.xml +++ b/jndi/jndi-rmi/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/jndi/jndi-url-itest-biz/pom.xml b/jndi/jndi-url-itest-biz/pom.xml index a4e961099d..89c0cdf67c 100644 --- a/jndi/jndi-url-itest-biz/pom.xml +++ b/jndi/jndi-url-itest-biz/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/jndi/jndi-url-itest-web/pom.xml b/jndi/jndi-url-itest-web/pom.xml index ebbd8fac42..c81844acfa 100644 --- a/jndi/jndi-url-itest-web/pom.xml +++ b/jndi/jndi-url-itest-web/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/jndi/jndi-url-itest/pom.xml b/jndi/jndi-url-itest/pom.xml index b6f2e8c5be..38e9d9fd4f 100644 --- a/jndi/jndi-url-itest/pom.xml +++ b/jndi/jndi-url-itest/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/jndi/jndi-url/pom.xml b/jndi/jndi-url/pom.xml index 88e62dfcf8..08e95ca6cd 100644 --- a/jndi/jndi-url/pom.xml +++ b/jndi/jndi-url/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/jndi/pom.xml b/jndi/pom.xml index 6e6e94f044..391db60104 100644 --- a/jndi/pom.xml +++ b/jndi/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index d27f244a45..cbdd2c8318 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -178,6 +178,7 @@ Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL {maven-resources} ${aries.osgi.private.pkg} + RELEASE @@ -441,6 +442,7 @@ ${java.source.version} true + ${aries.javadoc.doclint} ${aries.javadoc.exclude.packages} + none 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 3387eb5a49..a4d1b780c7 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 76d1df745e..2e5383e5a0 100644 --- a/subsystem/subsystem-bundle/pom.xml +++ b/subsystem/subsystem-bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/subsystem/subsystem-core/pom.xml b/subsystem/subsystem-core/pom.xml index 5ef3e90eb1..8255d6db82 100644 --- a/subsystem/subsystem-core/pom.xml +++ b/subsystem/subsystem-core/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/subsystem/subsystem-gogo-command/pom.xml b/subsystem/subsystem-gogo-command/pom.xml index 33e2f521ce..7a6ff6a8ff 100644 --- a/subsystem/subsystem-gogo-command/pom.xml +++ b/subsystem/subsystem-gogo-command/pom.xml @@ -22,7 +22,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/subsystem/subsystem-itests-api-bundle/pom.xml b/subsystem/subsystem-itests-api-bundle/pom.xml index 6a029dad74..249011c4a0 100644 --- a/subsystem/subsystem-itests-api-bundle/pom.xml +++ b/subsystem/subsystem-itests-api-bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/subsystem/subsystem-itests/pom.xml b/subsystem/subsystem-itests/pom.xml index 90abadb9c4..e6ff8421fd 100644 --- a/subsystem/subsystem-itests/pom.xml +++ b/subsystem/subsystem-itests/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/subsystem/subsystem-modeller/pom.xml b/subsystem/subsystem-modeller/pom.xml index b6fce35fb4..400639df7a 100644 --- a/subsystem/subsystem-modeller/pom.xml +++ b/subsystem/subsystem-modeller/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/subsystem/subsystem-obr/pom.xml b/subsystem/subsystem-obr/pom.xml index c8328a7898..fcd0078175 100644 --- a/subsystem/subsystem-obr/pom.xml +++ b/subsystem/subsystem-obr/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/transaction/pom.xml b/transaction/pom.xml index f1c0bc43bd..7cb5a1fd5e 100644 --- a/transaction/pom.xml +++ b/transaction/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../parent/pom.xml diff --git a/transaction/transaction-blueprint/pom.xml b/transaction/transaction-blueprint/pom.xml index cce75588de..03e4de67be 100644 --- a/transaction/transaction-blueprint/pom.xml +++ b/transaction/transaction-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 2.1.1 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/transaction/transaction-itests/pom.xml b/transaction/transaction-itests/pom.xml index 37e949e39d..5cae2d0b9d 100644 --- a/transaction/transaction-itests/pom.xml +++ b/transaction/transaction-itests/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 2.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/transaction/transaction-jdbc/pom.xml b/transaction/transaction-jdbc/pom.xml index 484460b88e..0a3ded5c06 100644 --- a/transaction/transaction-jdbc/pom.xml +++ b/transaction/transaction-jdbc/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 2.0.1 + 3.1.1-SNAPSHOT ../../parent/pom.xml @@ -41,6 +41,7 @@ + none org.apache.aries.transaction.jdbc;version="2.1" @@ -66,8 +67,6 @@ 1.0.0 - -Xdoclint:none - 3.1.5 3.2.0 5.1.9 diff --git a/transaction/transaction-jms/pom.xml b/transaction/transaction-jms/pom.xml index eaa34615b9..4e14d3b88a 100644 --- a/transaction/transaction-jms/pom.xml +++ b/transaction/transaction-jms/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 2.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml 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 7028e67ce1..d56187d8aa 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 @@ * 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: while this implementation does allow the creation of a collection of active consumers, + * NOTE: 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 ConnectionFactory getConnectionFactory() { /** * Sets the ConnectionFactory used to create new pooled Connections. - *

+ *

* 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 void setMaxConnections(int maxConnections) { /** * Gets the Idle timeout value applied to new Connection's that are created by this pool. - *

+ *

* 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 int getIdleTimeout() { /** * Sets the idle timeout value for Connection's that are created by this pool in Milliseconds, * defaults to 30 seconds. - *

+ *

* 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 boolean isCreateConnectionOnStartup() { /** * Whether to create a connection on starting this {@link PooledConnectionFactory}. - *

+ *

* 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 @@ protected GenericKeyedObjectPool getConnectionsPo * 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. - *

+ *

* 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 10305d0963..7b6e7b2361 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 @@ /** * Holds a real JMS connection along with the session pools associated with it. - *

+ *

* 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 synchronized void decrementReferenceCount() { /** * Determines if this Connection has expired. - *

+ *

* 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 d6d8fb424d..feec52ccd0 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 String toString() { /** * Callback invoked when the consumer is closed. - *

+ *

* 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 d72488a2e0..e9726d2efd 100644 --- a/transaction/transaction-manager/pom.xml +++ b/transaction/transaction-manager/pom.xml @@ -22,7 +22,7 @@ org.apache.aries parent - 2.0.1 + 3.1.1-SNAPSHOT ../../parent/pom.xml @@ -68,7 +68,8 @@ 1.3.0 false - false + + org.objectweb.howl*,${aries.osgi.private.pkg} 2.22.0 3.1.4 @@ -172,11 +173,11 @@ generate-sources - + - + run @@ -197,24 +198,6 @@ - org.apache.maven.plugins maven-shade-plugin diff --git a/transaction/transaction-testbundle/pom.xml b/transaction/transaction-testbundle/pom.xml index e75196c71f..7bbd6b52fe 100644 --- a/transaction/transaction-testbundle/pom.xml +++ b/transaction/transaction-testbundle/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 2.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/transaction/transaction-testds/pom.xml b/transaction/transaction-testds/pom.xml index eab492afc8..bdc7e8f17a 100644 --- a/transaction/transaction-testds/pom.xml +++ b/transaction/transaction-testds/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 2.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index e6cbe31791..eb9950def6 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../parent/pom.xml diff --git a/web/web-itests/pom.xml b/web/web-itests/pom.xml index a5e7b7097d..13c70fdeed 100644 --- a/web/web-itests/pom.xml +++ b/web/web-itests/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.1.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml diff --git a/web/web-urlhandler/pom.xml b/web/web-urlhandler/pom.xml index 041dbd918c..fe1d0261a4 100644 --- a/web/web-urlhandler/pom.xml +++ b/web/web-urlhandler/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 3.0.0 + 3.1.1-SNAPSHOT ../../parent/pom.xml