Author: cschneider
Date: Wed Oct 26 15:27:32 2016
New Revision: 1766693
URL: http://svn.apache.org/viewvc?rev=1766693&view=rev
Log:
[ARIES-1630] Fix configadmin problem. Use current snapshots
Modified:
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-core/src/main/java/org/apache/aries/jmx/agent/JMXAgentImpl.java
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/StateConfig.java
aries/trunk/jmx/jmx-itests/pom.xml
aries/trunk/jmx/jmx-whiteboard/pom.xml
Modified: aries/trunk/jmx/jmx-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-bundle/pom.xml?rev=1766693&r1=1766692&r2=1766693&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-bundle/pom.xml (original)
+++ aries/trunk/jmx/jmx-bundle/pom.xml Wed Oct 26 15:27:32 2016
@@ -56,7 +56,7 @@
!org.osgi.service.framework,
!org.eclipse*,
org.osgi.framework;version="[1.6,2)",
- org.osgi.service.cm;version="[1.4,2)";resolution:="optional",
+ org.osgi.service.cm;version="[1.4,2)",
org.osgi.service.permissionadmin;version="[1.2,2)";resolution:="optional",
org.osgi.service.provisioning;version="[1.2,2)";resolution:="optional",
org.osgi.service.useradmin;version="[1.1,2)";resolution:="optional",
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.1.8-SNAPSHOT</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=1766693&r1=1766692&r2=1766693&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-core-whiteboard/pom.xml (original)
+++ aries/trunk/jmx/jmx-core-whiteboard/pom.xml Wed Oct 26 15:27:32 2016
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.1.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/jmx/jmx-core/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/pom.xml?rev=1766693&r1=1766692&r2=1766693&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-core/pom.xml (original)
+++ aries/trunk/jmx/jmx-core/pom.xml Wed Oct 26 15:27:32 2016
@@ -51,7 +51,7 @@
<aries.osgi.import>
!org.apache.aries.jmx*,
org.osgi.framework;version="[1.6,2)",
- org.osgi.service.cm;version="[1.4,2)";resolution:="optional",
+ org.osgi.service.cm;version="[1.4,2)",
org.osgi.service.permissionadmin;version="[1.2,2)";resolution:="optional",
org.osgi.service.provisioning;version="[1.2,2)";resolution:="optional",
org.osgi.service.useradmin;version="[1.1,2)";resolution:="optional",
Modified:
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/agent/JMXAgentImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/agent/JMXAgentImpl.java?rev=1766693&r1=1766692&r2=1766693&view=diff
==============================================================================
---
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/agent/JMXAgentImpl.java
(original)
+++
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/agent/JMXAgentImpl.java
Wed Oct 26 15:27:32 2016
@@ -16,12 +16,8 @@
*/
package org.apache.aries.jmx.agent;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.IdentityHashMap;
-import java.util.List;
import java.util.Map;
-import java.util.Set;
import javax.management.InstanceAlreadyExistsException;
import javax.management.InstanceNotFoundException;
Modified:
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/StateConfig.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/StateConfig.java?rev=1766693&r1=1766692&r2=1766693&view=diff
==============================================================================
---
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/StateConfig.java
(original)
+++
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/StateConfig.java
Wed Oct 26 15:27:32 2016
@@ -17,9 +17,6 @@
package org.apache.aries.jmx.framework;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedService;
Modified: aries/trunk/jmx/jmx-itests/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/pom.xml?rev=1766693&r1=1766692&r2=1766693&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-itests/pom.xml (original)
+++ aries/trunk/jmx/jmx-itests/pom.xml Wed Oct 26 15:27:32 2016
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.1.8-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/trunk/jmx/jmx-whiteboard/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-whiteboard/pom.xml?rev=1766693&r1=1766692&r2=1766693&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-whiteboard/pom.xml (original)
+++ aries/trunk/jmx/jmx-whiteboard/pom.xml Wed Oct 26 15:27:32 2016
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.1.8-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
