Author: chetanm
Date: Mon Nov 30 14:30:51 2015
New Revision: 1717261
URL: http://svn.apache.org/viewvc?rev=1717261&view=rev
Log:
OAK-3687 - Oak standalone application example based on Spring Boot
Applying a slightly modified patch from Alex
-- Added a mongo.driver.version in oak-parent to specify Mongo driver version
at a single place
-- Add dep on org.apache.felix.scr.annotations to workaround superfluous
warning in Eclipse for SCR annotations
-- For json-simple, groovy-all, metrics-core rely on spring-boot-dependencies
to provide required versions
Modified:
jackrabbit/oak/trunk/oak-examples/standalone/pom.xml
jackrabbit/oak/trunk/oak-parent/pom.xml
Modified: jackrabbit/oak/trunk/oak-examples/standalone/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/standalone/pom.xml?rev=1717261&r1=1717260&r2=1717261&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/standalone/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-examples/standalone/pom.xml Mon Nov 30 14:30:51
2015
@@ -83,6 +83,12 @@
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- For colored console logging -->
<dependency>
<groupId>org.fusesource.jansi</groupId>
@@ -93,13 +99,12 @@
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
- <version>3.1.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
- <version>2.13.3</version>
+ <version>${mongo.driver.version}</version>
<optional>true</optional>
</dependency>
@@ -157,7 +162,6 @@
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
- <version>1.1</version>
</dependency>
<!-- Required for Felix WebConsole -->
@@ -186,7 +190,6 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>2.3.6</version>
</dependency>
<dependency>
@@ -258,7 +261,6 @@
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.5</version>
<configuration>
<filesets>
<fileset>
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1717261&r1=1717260&r2=1717261&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Mon Nov 30 14:30:51 2015
@@ -49,6 +49,7 @@
<mongo.db2>MongoMKDB2</mongo.db2>
<segment.db>SegmentMK</segment.db>
<lucene.version>4.7.1</lucene.version>
+ <mongo.driver.version>2.13.3</mongo.driver.version>
<!-- Note that we're using SLF4J API version 1.7 when compiling -->
<!-- core Oak components but more recent SLF4J and Logback versions -->
<!-- when compiling and running test cases and the oak-run jar. -->
@@ -387,7 +388,7 @@
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
- <version>2.13.3</version>
+ <version>${mongo.driver.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
