Update Accessing MongoDB recipe for Virgo 3.7.0.RELEASE
* Mongo Java Driver 2.14.3
* Spring Data MongoDB 1.9.8 (Spring Framework 4.2.9.RELEASE)
* MongoDB 3.4.3
diff --git a/recipe-accessing-data-mongodb/.gitignore b/recipe-accessing-data-mongodb/.gitignore
index 5fb40ad..c18fe1b 100644
--- a/recipe-accessing-data-mongodb/.gitignore
+++ b/recipe-accessing-data-mongodb/.gitignore
@@ -1 +1,3 @@
**/META-INF/MANIFEST.MF
+.idea/
+
diff --git a/recipe-accessing-data-mongodb/build.gradle b/recipe-accessing-data-mongodb/build.gradle
index 79799e1..5ca56fd 100644
--- a/recipe-accessing-data-mongodb/build.gradle
+++ b/recipe-accessing-data-mongodb/build.gradle
@@ -7,7 +7,7 @@
}
dependencies {
classpath "gradle.plugin.org.eclipse.virgo.bundlor:bundlor-plugin:0.2"
- classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.8.1"
+ classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.8.2"
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
}
}
@@ -38,8 +38,6 @@
apply plugin: 'eclipse'
apply plugin: 'eclipse-wtp'
- version = '0.3.0.BUILD-SNAPSHOT'
-
repositories {
mavenCentral()
}
@@ -147,9 +145,6 @@
createLocalCopy = System.properties['local.build'] == 'true'
removeAdminConsole = System.properties['local.build'] != 'true'
removeSplash = System.properties['local.build'] != 'true'
-
- virgoFlavour = 'VTS'
- virgoVersion = '3.7.0.M04'
}
dockerize.dependsOn configurations.repositoryExt
diff --git a/recipe-accessing-data-mongodb/gradle.properties b/recipe-accessing-data-mongodb/gradle.properties
index 2ac3083..7320cc2 100644
--- a/recipe-accessing-data-mongodb/gradle.properties
+++ b/recipe-accessing-data-mongodb/gradle.properties
@@ -1,3 +1,5 @@
+version = 0.3.0.BUILD-SNAPSHOT
+
springframeworkVersion = 4.2.9.RELEASE
# Eclipse Mars.1 bundle from Maven Central provided by Tycho
@@ -7,9 +9,9 @@
# org.eclipse.osgi.services_3.5.0.v20150519-2006.jar
osgiServicesVersion = 3.5.0.v20150519-2006
-mongoJavaDriverVersion = 2.13.3
-springDataCommonsVersion = 1.11.4.RELEASE
-springDataMongodbVersion = 1.8.4.RELEASE
+mongoJavaDriverVersion = 2.14.3
+springDataCommonsVersion = 1.12.8.RELEASE
+springDataMongodbVersion = 1.9.8.RELEASE
# test dependencies
junitVersion = 4.12
diff --git a/recipe-accessing-data-mongodb/org.eclipse.virgo.samples.recipe.data.mongodb/template.mf b/recipe-accessing-data-mongodb/org.eclipse.virgo.samples.recipe.data.mongodb/template.mf
index 25a8f87..ec80833 100644
--- a/recipe-accessing-data-mongodb/org.eclipse.virgo.samples.recipe.data.mongodb/template.mf
+++ b/recipe-accessing-data-mongodb/org.eclipse.virgo.samples.recipe.data.mongodb/template.mf
@@ -1,4 +1,5 @@
-Bundle-Version: 0.1
+Bundle-ManifestVersion: 2
+Bundle-Version: ${version}
Bundle-Name: Virgo Recipe MongoDB
Bundle-SymbolicName: org.eclipse.virgo.samples.recipe.data.mongodb
Import-Bundle: org.springframework.aop,
@@ -6,6 +7,6 @@
org.springframework.data.core,
org.springframework.data.mongodb
Excluded-Imports: org.springframework.*
-Import-Package: com.mongodb;version="[2.13,3)",
+Import-Package: com.mongodb;version="[2.14.3,3)",
javax.annotation;version="0",
org.aopalliance.aop;version="1"
diff --git a/recipe-accessing-data-mongodb/src/docs/asciidoc/08_dockerize_recipe.adoc b/recipe-accessing-data-mongodb/src/docs/asciidoc/08_dockerize_recipe.adoc
index bb782fe..6ecb020 100644
--- a/recipe-accessing-data-mongodb/src/docs/asciidoc/08_dockerize_recipe.adoc
+++ b/recipe-accessing-data-mongodb/src/docs/asciidoc/08_dockerize_recipe.adoc
@@ -25,7 +25,7 @@
[source,sh]
----
-$ docker run --rm -it --net=recipe_nw --name mongodb mongo:2.6.12
+$ docker run --rm -it --net=recipe_nw --name mongodb mongo:3.4.3
----
then run the application with the environment variable `mongodb.host` set to the container name used in the command above:
