Update to parent pom 29
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1765936 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 6e949ec..9eb954e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>29</version>
<relativePath />
</parent>
@@ -87,11 +87,13 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>1.5.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -121,7 +123,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.8.2</version>
+ <version>1.10.19</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java b/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java
index ee47135..0d0fbe0 100644
--- a/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java
+++ b/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java
@@ -26,6 +26,7 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Collection;
import java.util.Dictionary;
import java.util.HashMap;
import java.util.HashSet;
@@ -40,7 +41,9 @@
import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkListener;
import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceFactory;
import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceObjects;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
@@ -179,52 +182,62 @@
this.runModes = rm;
}
+ @Override
public void addBundleListener(BundleListener listener) {
// TODO Auto-generated method stub
}
+ @Override
public void addFrameworkListener(FrameworkListener listener) {
// TODO Auto-generated method stub
}
+ @Override
public void addServiceListener(ServiceListener listener, String filter)
throws InvalidSyntaxException {
// TODO Auto-generated method stub
}
+ @Override
public void addServiceListener(ServiceListener listener) {
// TODO Auto-generated method stub
}
+ @Override
public Filter createFilter(String filter) throws InvalidSyntaxException {
// TODO Auto-generated method stub
return null;
}
+ @Override
public ServiceReference[] getAllServiceReferences(String clazz,
String filter) throws InvalidSyntaxException {
// TODO Auto-generated method stub
return null;
}
+ @Override
public Bundle getBundle() {
// TODO Auto-generated method stub
return null;
}
+ @Override
public Bundle getBundle(long id) {
// TODO Auto-generated method stub
return null;
}
+ @Override
public Bundle[] getBundles() {
return new Bundle[0];
}
+ @Override
public File getDataFile(String filename) {
File f = files.get(filename);
if ( f == null ) {
@@ -239,6 +252,7 @@
return f;
}
+ @Override
public String getProperty(String key) {
if ( key.equals(SlingSettingsService.RUN_MODES_PROPERTY) ) {
return runModes;
@@ -250,51 +264,100 @@
return null;
}
+ @Override
public Object getService(ServiceReference reference) {
return null;
}
+ @Override
public ServiceReference getServiceReference(String clazz) {
return null;
}
+ @Override
public ServiceReference[] getServiceReferences(String clazz,
String filter) throws InvalidSyntaxException {
return null;
}
+ @Override
public Bundle installBundle(String location, InputStream input)
throws BundleException {
return null;
}
+ @Override
public Bundle installBundle(String location) throws BundleException {
return null;
}
+ @Override
@SuppressWarnings("unchecked")
public ServiceRegistration registerService(String clazz,
Object service, Dictionary properties) {
return null;
}
+ @Override
@SuppressWarnings("unchecked")
public ServiceRegistration registerService(String[] clazzes,
Object service, Dictionary properties) {
return null;
}
+ @Override
public void removeBundleListener(BundleListener listener) {
}
+ @Override
public void removeFrameworkListener(FrameworkListener listener) {
}
+ @Override
public void removeServiceListener(ServiceListener listener) {
}
+ @Override
public boolean ungetService(ServiceReference reference) {
return false;
}
+
+ @Override
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ?> properties) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory,
+ Dictionary<String, ?> properties) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public <S> ServiceReference<S> getServiceReference(Class<S> clazz) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter)
+ throws InvalidSyntaxException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Bundle getBundle(String location) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
}
\ No newline at end of file
