Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint-maven-plugin/blueprint-maven-plugin-spi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint-maven-plugin/blueprint-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 3 additions & 1 deletion blueprint/blueprint-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion blueprint/blueprint-authz/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions blueprint/blueprint-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down Expand Up @@ -349,7 +350,6 @@
<minmemory>128m</minmemory>
<maxmemory>512m</maxmemory>
<sourcepath>${project.build.directory}/sources</sourcepath>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion blueprint/blueprint-cm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/blueprint-compatibility/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/blueprint-core-compatibility/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
10 changes: 2 additions & 8 deletions blueprint/blueprint-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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
Expand Down Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/blueprint-jexl-evaluator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/blueprint-noosgi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/blueprint-parser/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/blueprint-repository/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/blueprint-spring-camel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/blueprint-spring-extender/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/blueprint-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/blueprint-web-osgi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/blueprint-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/examples/blueprint-sample-war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/examples/blueprint-sample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/itests/blueprint-itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/itests/blueprint-testbundlea/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/itests/blueprint-testbundleb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/itests/blueprint-testbundlee/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/itests/blueprint-testbundles/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/itests/blueprint-testquiescebundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blueprint/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion esa-ant-task/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public void setName(String name) {
}

/**
* @param version
* @param subsystemVersion
* the version to set
*/
public void setVersion(String subsystemVersion) {
Expand All @@ -109,7 +109,7 @@ public void setVersion(String subsystemVersion) {
}

/**
* @param type
* @param subsystemType
* the type to set
*/
public void setType(String subsystemType) {
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion esa-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Loading
Loading