Author: cschneider
Date: Mon Oct 6 11:00:51 2014
New Revision: 1629612
URL: http://svn.apache.org/r1629612
Log:
Fix build problems and some warnings
Modified:
aries/trunk/blueprint/blueprint-core/pom.xml
aries/trunk/blueprint/blueprint-itests/pom.xml
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/ManagedServiceFactoryUseSystemBundleTest.java
aries/trunk/jndi/jndi-url/pom.xml
Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1629612&r1=1629611&r2=1629612&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Mon Oct 6 11:00:51 2014
@@ -104,7 +104,7 @@
<id>dev</id>
<properties>
<blueprint.annotation.api.version>1.0.1-SNAPSHOT</blueprint.annotation.api.version>
- <blueprint.api.version>1.0.1-SNAPSHOT</blueprint.api.version>
+ <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version>
<blueprint.parser.version>1.2.1-SNAPSHOT</blueprint.parser.version>
<proxy.api.version>1.0.0</proxy.api.version>
<proxy.impl.version>1.0.0</proxy.impl.version>
Modified: aries/trunk/blueprint/blueprint-itests/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/pom.xml?rev=1629612&r1=1629611&r2=1629612&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-itests/pom.xml Mon Oct 6 11:00:51 2014
@@ -62,12 +62,12 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.4.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-parser</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/ManagedServiceFactoryUseSystemBundleTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/ManagedServiceFactoryUseSystemBundleTest.java?rev=1629612&r1=1629611&r2=1629612&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/ManagedServiceFactoryUseSystemBundleTest.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/ManagedServiceFactoryUseSystemBundleTest.java
Mon Oct 6 11:00:51 2014
@@ -56,6 +56,7 @@ import org.osgi.framework.hooks.service.
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
+@SuppressWarnings({"rawtypes", "unchecked"})
public class ManagedServiceFactoryUseSystemBundleTest extends
AbstractBlueprintIntegrationTest {
private static final String CM_BUNDLE = "org.apache.aries.blueprint.cm";
private static final String TEST_BUNDLE =
"org.apache.aries.blueprint.cm.test.b1";
@@ -145,7 +146,6 @@ public class ManagedServiceFactoryUseSys
props.put("a", "5");
cf.update(props);
- @SuppressWarnings("rawtypes")
ServiceReference sr = getServiceRef(Foo.class, "(key=foo1)");
Foo foo = (Foo)context().getService(sr);
assertNotNull(foo);
@@ -176,7 +176,6 @@ public class ManagedServiceFactoryUseSys
props.put("a", "5");
cf.update(props);
- @SuppressWarnings("rawtypes")
ServiceReference sr = getServiceRef(Foo.class, "(key=foo2)");
Foo foo = (Foo)context().getService(sr);
assertNotNull(foo);
@@ -209,7 +208,6 @@ public class ManagedServiceFactoryUseSys
props.put("a", "5");
cf.update(props);
- @SuppressWarnings("rawtypes")
ServiceReference sr = getServiceRef(Foo.class,
"(&(key=foo3)(a=5))");
assertNotNull(sr);
Foo foo = (Foo) context().getService(sr);
@@ -235,7 +233,6 @@ public class ManagedServiceFactoryUseSys
cf.delete();
}
- @SuppressWarnings("rawtypes")
@Test
public void testCreateAndUpdate() throws Exception {
Configuration cf =
ca.createFactoryConfiguration("blueprint-sample-managed-service-factory3",
null);
@@ -295,8 +292,7 @@ public class ManagedServiceFactoryUseSys
cf2.delete();
}
- @SuppressWarnings("rawtypes")
-@Test
+ @Test
public void testCreateAndUpdateUsingUpdateMethod() throws Exception {
Configuration cf =
ca.createFactoryConfiguration("blueprint-sample-managed-service-factory4",
null);
Hashtable<String, String> props = new Hashtable<String, String>();
@@ -360,7 +356,6 @@ public class ManagedServiceFactoryUseSys
props.put("a", "5");
cf.update(props);
- @SuppressWarnings("rawtypes")
ServiceReference sr = getServiceRef(Foo.class, "(key=foo5)");
Foo foo = (Foo) context().getService(sr);
assertNotNull(foo);
@@ -384,7 +379,6 @@ public class ManagedServiceFactoryUseSys
assertNull(sr.getProperty("b"));
}
- @SuppressWarnings("rawtypes")
private ServiceReference getServiceRef(Class serviceInterface, String
filter) throws InvalidSyntaxException {
int tries = 0;
do {
Modified: aries/trunk/jndi/jndi-url/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url/pom.xml?rev=1629612&r1=1629611&r2=1629612&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url/pom.xml (original)
+++ aries/trunk/jndi/jndi-url/pom.xml Mon Oct 6 11:00:51 2014
@@ -70,7 +70,7 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
<scope>provided</scope>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
