You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by da...@apache.org on 2015/08/26 12:22:31 UTC
svn commit: r1697872 - in /aries/trunk/jmx: ./ jmx-api/ jmx-blueprint-api/
jmx-blueprint-bundle/ jmx-blueprint-core/ jmx-bundle/ jmx-core-whiteboard/
jmx-core/ jmx-itests/ jmx-parent/ jmx-whiteboard/
Author: davidb
Date: Wed Aug 26 10:22:31 2015
New Revision: 1697872
URL: http://svn.apache.org/r1697872
Log:
Prepare Aries JMX for releasing all subcomponents in one go.
Added:
aries/trunk/jmx/jmx-parent/
aries/trunk/jmx/jmx-parent/pom.xml
Modified:
aries/trunk/jmx/jmx-api/pom.xml
aries/trunk/jmx/jmx-blueprint-api/pom.xml
aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
aries/trunk/jmx/jmx-blueprint-core/pom.xml
aries/trunk/jmx/jmx-bundle/pom.xml
aries/trunk/jmx/jmx-core-whiteboard/pom.xml
aries/trunk/jmx/jmx-core/pom.xml
aries/trunk/jmx/jmx-itests/pom.xml
aries/trunk/jmx/jmx-whiteboard/pom.xml
aries/trunk/jmx/pom.xml
Modified: aries/trunk/jmx/jmx-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-api/pom.xml?rev=1697872&r1=1697871&r2=1697872&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-api/pom.xml (original)
+++ aries/trunk/jmx/jmx-api/pom.xml Wed Aug 26 10:22:31 2015
@@ -22,17 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.0</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.parent</artifactId>
+ <version>1.1.4-SNAPSHOT</version>
+ <relativePath>../jmx-parent</relativePath>
+ </parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX API</name>
- <version>1.1.2-SNAPSHOT</version>
<description>
This bundle contains the JMX 1.1.0 API
</description>
@@ -58,7 +57,7 @@
*
</aries.osgi.import>
<aries.osgi.private.pkg />
- <lastReleaseVersion>1.1.0</lastReleaseVersion>
+ <lastReleaseVersion>1.1.1</lastReleaseVersion>
</properties>
<build>
Modified: aries/trunk/jmx/jmx-blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-api/pom.xml?rev=1697872&r1=1697871&r2=1697872&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-blueprint-api/pom.xml (original)
+++ aries/trunk/jmx/jmx-blueprint-api/pom.xml Wed Aug 26 10:22:31 2015
@@ -22,17 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.0</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.parent</artifactId>
+ <version>1.1.4-SNAPSHOT</version>
+ <relativePath>../jmx-parent</relativePath>
+ </parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Blueprint API</name>
- <version>1.1.1-SNAPSHOT</version>
<description>
This bundle contains the JMX Blueprint API
</description>
Modified: aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml?rev=1697872&r1=1697871&r2=1697872&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-blueprint-bundle/pom.xml (original)
+++ aries/trunk/jmx/jmx-blueprint-bundle/pom.xml Wed Aug 26 10:22:31 2015
@@ -22,17 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.0</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.parent</artifactId>
+ <version>1.1.4-SNAPSHOT</version>
+ <relativePath>../jmx-parent</relativePath>
+ </parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Blueprint Bundle</name>
- <version>1.1.2-SNAPSHOT</version>
<description>
This bundle contains the standalone implementation of the along with the API.
</description>
@@ -75,12 +74,12 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
- <version>1.1.0</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
- <version>1.1.0</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/jmx/jmx-blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-core/pom.xml?rev=1697872&r1=1697871&r2=1697872&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-blueprint-core/pom.xml (original)
+++ aries/trunk/jmx/jmx-blueprint-core/pom.xml Wed Aug 26 10:22:31 2015
@@ -22,17 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.0</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.parent</artifactId>
+ <version>1.1.4-SNAPSHOT</version>
+ <relativePath>../jmx-parent</relativePath>
+ </parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Blueprint Core</name>
- <version>1.1.1-SNAPSHOT</version>
<description>
This bundle contains the core implementation of the JMX Blueprint API
</description>
@@ -64,12 +63,12 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
- <version>1.1.0</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>1.0.0</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/jmx/jmx-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-bundle/pom.xml?rev=1697872&r1=1697871&r2=1697872&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-bundle/pom.xml (original)
+++ aries/trunk/jmx/jmx-bundle/pom.xml Wed Aug 26 10:22:31 2015
@@ -22,17 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.0</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.parent</artifactId>
+ <version>1.1.4-SNAPSHOT</version>
+ <relativePath>../jmx-parent</relativePath>
+ </parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Bundle</name>
- <version>1.1.2-SNAPSHOT</version>
<description>
This bundle contains the standalone implementation of the along with the API.
</description>
@@ -92,12 +91,12 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
- <version>1.1.1</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>1.1.2</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/jmx/jmx-core-whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core-whiteboard/pom.xml?rev=1697872&r1=1697871&r2=1697872&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-core-whiteboard/pom.xml (original)
+++ aries/trunk/jmx/jmx-core-whiteboard/pom.xml Wed Aug 26 10:22:31 2015
@@ -22,17 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.0</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.parent</artifactId>
+ <version>1.1.4-SNAPSHOT</version>
+ <relativePath>../jmx-parent</relativePath>
+ </parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core.whiteboard</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Core via Whiteboards</name>
- <version>1.1.2-SNAPSHOT</version>
<description>
This bundle contains an implementation of the JMX Core specification which registers the
MBeans as services in the service registry. This allows the whiteboard module to be
@@ -73,12 +72,12 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
- <version>1.1.0</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>1.1.4-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -93,7 +92,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>1.0.0</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Modified: aries/trunk/jmx/jmx-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/pom.xml?rev=1697872&r1=1697871&r2=1697872&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-core/pom.xml (original)
+++ aries/trunk/jmx/jmx-core/pom.xml Wed Aug 26 10:22:31 2015
@@ -22,17 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.0</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.parent</artifactId>
+ <version>1.1.4-SNAPSHOT</version>
+ <relativePath>../jmx-parent</relativePath>
+ </parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Core</name>
- <version>1.1.4-SNAPSHOT</version>
<description>
This bundle contains the core implementation
of the JMX Control specification
@@ -82,7 +81,7 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
- <version>1.1.0</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -97,7 +96,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>1.0.0</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Modified: aries/trunk/jmx/jmx-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/pom.xml?rev=1697872&r1=1697871&r2=1697872&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-itests/pom.xml (original)
+++ aries/trunk/jmx/jmx-itests/pom.xml Wed Aug 26 10:22:31 2015
@@ -22,17 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.0</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.parent</artifactId>
+ <version>1.1.4-SNAPSHOT</version>
+ <relativePath>../jmx-parent</relativePath>
+ </parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.itests</artifactId>
<packaging>jar</packaging>
<name>Apache Aries JMX integration tests</name>
- <version>1.1.0-SNAPSHOT</version>
<description>
Integration tests for the JMX component (using the standalone composite jmx-bundle)
</description>
@@ -52,36 +51,36 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
- <version>1.1.1</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>1.1.2</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.whiteboard</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core.whiteboard</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -114,8 +113,8 @@
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <artifactId>org.apache.aries.proxy.impl</artifactId>
+ <version>1.0.4</version>
<scope>test</scope>
</dependency>
<dependency>
Added: aries/trunk/jmx/jmx-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-parent/pom.xml?rev=1697872&view=auto
==============================================================================
--- aries/trunk/jmx/jmx-parent/pom.xml (added)
+++ aries/trunk/jmx/jmx-parent/pom.xml Wed Aug 26 10:22:31 2015
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.0.0</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.parent</artifactId>
+ <version>1.1.4-SNAPSHOT</version>
+
+ <name>Apache Aries JMX parent</name>
+ <packaging>pom</packaging>
+</project>
Modified: aries/trunk/jmx/jmx-whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-whiteboard/pom.xml?rev=1697872&r1=1697871&r2=1697872&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-whiteboard/pom.xml (original)
+++ aries/trunk/jmx/jmx-whiteboard/pom.xml Wed Aug 26 10:22:31 2015
@@ -22,17 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.0</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.parent</artifactId>
+ <version>1.1.4-SNAPSHOT</version>
+ <relativePath>../jmx-parent</relativePath>
+ </parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.whiteboard</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Whiteboard support for JMX DynamicMBean services</name>
- <version>1.1.0-SNAPSHOT</version>
<description>
This bundle implements whiteboard pattern support for DynamicMBean
services registered with the OSGi service registry. Each DynamicMBean
@@ -133,7 +132,7 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>1.1.0</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
Modified: aries/trunk/jmx/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/pom.xml?rev=1697872&r1=1697871&r2=1697872&view=diff
==============================================================================
--- aries/trunk/jmx/pom.xml (original)
+++ aries/trunk/jmx/pom.xml Wed Aug 26 10:22:31 2015
@@ -22,20 +22,20 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.0</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.parent</artifactId>
+ <version>1.1.4-SNAPSHOT</version>
+ <relativePath>jmx-parent</relativePath>
</parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
<name>Apache Aries JMX</name>
<packaging>pom</packaging>
- <version>1.1.0-SNAPSHOT</version>
<description>Implementation of the JMX Management Model Specification - reactor pom</description>
<modules>
+ <module>jmx-parent</module>
<module>jmx-api</module>
<module>jmx-blueprint-api</module>
<module>jmx-core</module>