Index: oak-examples/standalone/pom.xml
===================================================================
--- oak-examples/standalone/pom.xml (revision 1717222)
+++ oak-examples/standalone/pom.xml (working copy)
@@ -88,13 +88,11 @@
io.dropwizard.metrics
metrics-core
- 3.1.0
true
org.mongodb
mongo-java-driver
- 2.13.3
true
@@ -152,9 +150,14 @@
com.googlecode.json-simple
json-simple
- 1.1
+
+ org.apache.felix
+ org.apache.felix.scr.annotations
+ provided
+
+
org.apache.felix
@@ -181,7 +184,6 @@
org.codehaus.groovy
groovy-all
- 2.3.6
@@ -218,7 +220,6 @@
maven-clean-plugin
- 2.5
Index: oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RemotingInitializer.java
===================================================================
--- oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RemotingInitializer.java (revision 1717222)
+++ oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RemotingInitializer.java (working copy)
@@ -21,7 +21,6 @@
import javax.jcr.Repository;
-import org.apache.jackrabbit.server.remoting.davex.DavexServletService;
import org.apache.jackrabbit.server.remoting.davex.JcrRemotingServlet;
import org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet;
import org.springframework.beans.factory.annotation.Autowired;
Index: oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/WebConsoleSupport.java
===================================================================
--- oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/WebConsoleSupport.java (revision 1717222)
+++ oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/WebConsoleSupport.java (working copy)
@@ -76,7 +76,7 @@
}
@Bean
- public ServletListenerRegistrationBean felixListener() {
+ public ServletListenerRegistrationBean felixListener() {
return new ServletListenerRegistrationBean(new ProxyListener());
}
Index: oak-examples/standalone
===================================================================
--- oak-examples/standalone (revision 1717222)
+++ oak-examples/standalone (working copy)
Property changes on: oak-examples/standalone
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,3 ##
+target
+.*
+