You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/12/18 19:11:49 UTC
svn commit: r1423562 - in /karaf/eik/trunk: ./
features/org.apache.karaf.eik.wtp.feature/ plugins/org.apache.aries.jmx.api/
plugins/org.apache.aries.jmx.api/META-INF/ plugins/org.apache.aries.jmx.core/
plugins/org.apache.aries.jmx.core/META-INF/ plugin...
Author: jbonofre
Date: Tue Dec 18 18:11:48 2012
New Revision: 1423562
URL: http://svn.apache.org/viewvc?rev=1423562&view=rev
Log:
[KARAF-1922] Upgrade to Aries JMX 1.0.0
Modified:
karaf/eik/trunk/features/org.apache.karaf.eik.wtp.feature/feature.xml
karaf/eik/trunk/plugins/org.apache.aries.jmx.api/META-INF/MANIFEST.MF
karaf/eik/trunk/plugins/org.apache.aries.jmx.api/build.properties
karaf/eik/trunk/plugins/org.apache.aries.jmx.api/pom.xml
karaf/eik/trunk/plugins/org.apache.aries.jmx.core/META-INF/MANIFEST.MF
karaf/eik/trunk/plugins/org.apache.aries.jmx.core/build.properties
karaf/eik/trunk/plugins/org.apache.aries.jmx.core/pom.xml
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/META-INF/MANIFEST.MF
karaf/eik/trunk/pom.xml
Modified: karaf/eik/trunk/features/org.apache.karaf.eik.wtp.feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/features/org.apache.karaf.eik.wtp.feature/feature.xml?rev=1423562&r1=1423561&r2=1423562&view=diff
==============================================================================
--- karaf/eik/trunk/features/org.apache.karaf.eik.wtp.feature/feature.xml (original)
+++ karaf/eik/trunk/features/org.apache.karaf.eik.wtp.feature/feature.xml Tue Dec 18 18:11:48 2012
@@ -27,7 +27,7 @@
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.jst.common.project.facet.core" version="1.4.0" match="greaterOrEqual"/>
- <import plugin="org.apache.aries.jmx.api" version="0.3" match="greaterOrEqual"/>
+ <import plugin="org.apache.aries.jmx.api" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.wst.common.project.facet.ui" version="1.1.0" match="compatible"/>
<import plugin="org.eclipse.wst.server.ui" version="1.0.204" match="compatible"/>
Modified: karaf/eik/trunk/plugins/org.apache.aries.jmx.api/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.aries.jmx.api/META-INF/MANIFEST.MF?rev=1423562&r1=1423561&r2=1423562&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.aries.jmx.api/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.aries.jmx.api/META-INF/MANIFEST.MF Tue Dec 18 18:11:48 2012
@@ -8,14 +8,14 @@ Export-Package: org.osgi.jmx;uses:="java
ervice.useradmin;uses:="org.osgi.jmx,javax.management.openmbean";vers
ion="1.1.0"
Implementation-Title: Apache Aries
-Implementation-Version: 0.3
-Built-By: zoe
+Implementation-Version: 1.0.0
+Built-By: Apache Software Foundation
Tool: Bnd-1.15.0
Bundle-Name: Apache Aries JMX API
Created-By: Apache Maven Bundle Plugin
Bundle-Vendor: The Apache Software Foundation
Build-Jdk: 1.6.0_22
-Bundle-Version: 0.3
+Bundle-Version: 1.0.0
Bnd-LastModified: 1295786529768
Bundle-ManifestVersion: 2
Bundle-Description: This bundle contains the JMX 1.0.0 API
@@ -24,5 +24,5 @@ Bundle-DocURL: http://www.apache.org
Bundle-SymbolicName: org.apache.aries.jmx.api
Import-Package: javax.management.openmbean
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ClassPath: lib/org.apache.aries.jmx.api-0.3.jar,.
+Bundle-ClassPath: lib/org.apache.aries.jmx.api-1.0.0.jar,.
Modified: karaf/eik/trunk/plugins/org.apache.aries.jmx.api/build.properties
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.aries.jmx.api/build.properties?rev=1423562&r1=1423561&r2=1423562&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.aries.jmx.api/build.properties (original)
+++ karaf/eik/trunk/plugins/org.apache.aries.jmx.api/build.properties Tue Dec 18 18:11:48 2012
@@ -1,6 +1,6 @@
bin.includes = META-INF/,\
.,\
lib/,\
- lib/org.apache.aries.jmx.api-0.3.jar
-bin.excludes = lib/org.apache.aries.jmx.api-0.3-javadoc.jar
-src.includes = lib/org.apache.aries.jmx.api-0.3-sources.jar
+ lib/org.apache.aries.jmx.api-1.0.0.jar
+bin.excludes = lib/org.apache.aries.jmx.api-1.0.0-javadoc.jar
+src.includes = lib/org.apache.aries.jmx.api-1.0.0-sources.jar
Modified: karaf/eik/trunk/plugins/org.apache.aries.jmx.api/pom.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.aries.jmx.api/pom.xml?rev=1423562&r1=1423561&r2=1423562&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.aries.jmx.api/pom.xml (original)
+++ karaf/eik/trunk/plugins/org.apache.aries.jmx.api/pom.xml Tue Dec 18 18:11:48 2012
@@ -30,7 +30,7 @@
<groupId>org.apache.karaf.eik.plugins</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
- <version>0.3</version>
+ <version>1.0.0</version>
<packaging>eclipse-plugin</packaging>
<name>Apache Karaf :: EIK :: Plugins :: OSGi JMX RFC Wrapper</name>
Modified: karaf/eik/trunk/plugins/org.apache.aries.jmx.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.aries.jmx.core/META-INF/MANIFEST.MF?rev=1423562&r1=1423561&r2=1423562&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.aries.jmx.core/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.aries.jmx.core/META-INF/MANIFEST.MF Tue Dec 18 18:11:48 2012
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.apache.aries.jmx.core
Bundle-SymbolicName: org.apache.aries.jmx.core
-Bundle-Version: 0.3
+Bundle-Version: 1.0.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ClassPath: lib/org.apache.aries.jmx.core-0.3.jar,
+Bundle-ClassPath: lib/org.apache.aries.jmx.core-1.0.0.jar,
.
-Export-Package: org.apache.aries.jmx.codec;version="0.3"
+Export-Package: org.apache.aries.jmx.codec;version="1.0.0"
Import-Package: javax.management,
javax.management.openmbean,
org.osgi.framework;version="1.5.0",
Modified: karaf/eik/trunk/plugins/org.apache.aries.jmx.core/build.properties
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.aries.jmx.core/build.properties?rev=1423562&r1=1423561&r2=1423562&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.aries.jmx.core/build.properties (original)
+++ karaf/eik/trunk/plugins/org.apache.aries.jmx.core/build.properties Tue Dec 18 18:11:48 2012
@@ -1,6 +1,6 @@
bin.includes = META-INF/,\
.,\
lib/,\
- lib/org.apache.aries.jmx.core-0.3.jar
-bin.excludes = lib/org.apache.aries.jmx.core-0.3-javadoc.jar
-src.includes = lib/org.apache.aries.jmx.core-0.3-sources.jar
+ lib/org.apache.aries.jmx.core-1.0.0.jar
+bin.excludes = lib/org.apache.aries.jmx.core-1.0.0-javadoc.jar
+src.includes = lib/org.apache.aries.jmx.core-1.0.0-sources.jar
Modified: karaf/eik/trunk/plugins/org.apache.aries.jmx.core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.aries.jmx.core/pom.xml?rev=1423562&r1=1423561&r2=1423562&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.aries.jmx.core/pom.xml (original)
+++ karaf/eik/trunk/plugins/org.apache.aries.jmx.core/pom.xml Tue Dec 18 18:11:48 2012
@@ -30,7 +30,7 @@
<groupId>org.apache.karaf.eik.plugins</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>0.3</version>
+ <version>1.0.0</version>
<packaging>eclipse-plugin</packaging>
<name>Apache Karaf :: EIK :: Plugins :: Apache Aries JMX Integration Wrapper</name>
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/META-INF/MANIFEST.MF?rev=1423562&r1=1423561&r2=1423562&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/META-INF/MANIFEST.MF Tue Dec 18 18:11:48 2012
@@ -16,8 +16,8 @@ Require-Bundle: org.eclipse.jst.server.c
org.apache.karaf.eik.core;bundle-version="0.9.0",
org.apache.karaf.eik.ui;bundle-version="0.9.0",
org.apache.karaf.eik.workbench;bundle-version="0.9.0",
- org.apache.aries.jmx.api;bundle-version="0.3.0",
- org.apache.aries.jmx.core;bundle-version="0.3.0"
+ org.apache.aries.jmx.api;bundle-version="1.0.0",
+ org.apache.aries.jmx.core;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.apache.karaf.eik.wtp.core
Modified: karaf/eik/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/pom.xml?rev=1423562&r1=1423561&r2=1423562&view=diff
==============================================================================
--- karaf/eik/trunk/pom.xml (original)
+++ karaf/eik/trunk/pom.xml Tue Dec 18 18:11:48 2012
@@ -42,7 +42,7 @@
</swtbot-site>
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository</orbit-site>
<tycho-version>0.13.0</tycho-version>
- <aries.jmx.version>0.3</aries.jmx.version>
+ <aries.jmx.version>1.0.0</aries.jmx.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-lang.version>2.6</commons-lang.version>
<jansi.version>1.7</jansi.version>