Update version to 3.0.0-SNAPSHOT

- Updated Java version to 8. - Updated documentation regarding versions.
neo4j · Feb 14, 2017 · 9fe5da2 · 9fe5da2
1 parent f83a2f6
commit 9fe5da2
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 100 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ It aims to simplify development with the Neo4j graph database and like JPA, it u
 If you use Spring to build your applications be sure to check out [Spring Data Neo4j](https://github.com/spring-projects/spring-data-neo4j).
 
 ***The latest OGM version is:*** `2.1.1`.
-***The latest OGM development version is:*** `2.1.2-SNAPSHOT`.
+***The latest OGM development version is:*** `2.1.2-SNAPSHOT` and `3.0.0-SNAPSHOT`.
 
 ##Quick start
 

diff --git a/api/pom.xml b/api/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>neo4j-ogm</artifactId>
     <groupId>org.neo4j</groupId>
-    <version>2.1.2-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/bolt-driver/pom.xml b/bolt-driver/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>neo4j-ogm</artifactId>
         <groupId>org.neo4j</groupId>
-        <version>2.1.2-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-ogm-api</artifactId>
-            <version>2.1.2-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.neo4j.driver</groupId>

diff --git a/compiler/pom.xml b/compiler/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>neo4j-ogm</artifactId>
     <groupId>org.neo4j</groupId>
-    <version>2.1.2-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-ogm-api</artifactId>
-      <version>2.1.2-SNAPSHOT</version>
+      <version>3.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/core/pom.xml b/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>neo4j-ogm</artifactId>
         <groupId>org.neo4j</groupId>
-        <version>2.1.2-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,40 +28,40 @@
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-ogm-api</artifactId>
-            <version>2.1.2-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-ogm-compiler</artifactId>
-            <version>2.1.2-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-ogm-http-driver</artifactId>
-            <version>2.1.2-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-ogm-embedded-driver</artifactId>
-            <version>2.1.2-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-ogm-bolt-driver</artifactId>
-            <version>2.1.2-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-ogm-test</artifactId>
-            <version>2.1.2-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/embedded-driver/pom.xml b/embedded-driver/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>neo4j-ogm</artifactId>
         <groupId>org.neo4j</groupId>
-        <version>2.1.2-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-ogm-api</artifactId>
-            <version>2.1.2-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.neo4j</groupId>

diff --git a/http-driver/pom.xml b/http-driver/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>neo4j-ogm</artifactId>
         <groupId>org.neo4j</groupId>
-        <version>2.1.2-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-ogm-api</artifactId>
-            <version>2.1.2-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

diff --git a/neo4j-ogm-docs/pom.xml b/neo4j-ogm-docs/pom.xml
@@ -19,7 +19,7 @@
 
     <groupId>org.neo4j</groupId>
     <artifactId>neo4j-ogm-docs</artifactId>
-    <version>2.1.2-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
 
     <name>Neo4j OGM Documentation</name>
     <packaging>pom</packaging>

diff --git a/neo4j-ogm-docs/src/main/asciidoc/introduction/index.adoc b/neo4j-ogm-docs/src/main/asciidoc/introduction/index.adoc
@@ -116,9 +116,9 @@ The connection to Neo4j handled by a driver layer, which can use the binary prot
 [[introduction:requirements]]
 == Requirements
 
-Neo4j OGM 2.1.x at minimum, requires:
+Neo4j OGM 3.0.x at minimum, requires:
 
-* JDK Version 7 and above.
+* JDK Version 8 and above.
 * Neo4j Database 2.3.x / 3.0.x / 3.1.x and above.
 
 

diff --git a/neo4j-ogm-docs/src/main/asciidoc/reference/getting-started.adoc b/neo4j-ogm-docs/src/main/asciidoc/reference/getting-started.adoc
@@ -9,6 +9,7 @@ Consult the version table to determine which version of the OGM to use with a pa
 [frame="topbot",options="header"]
 |======================
 |Neo4j-OGM Version   |Neo4j Version       | Bolt Version^#^ | Spring Data Neo4j Version | Spring Boot Version
+|3.0.0+              |3.0.x, 3.1.x        | 1.1.0+          | 5.0.0+                    | 2.0.0+
 |2.1.0+              |2.3.x, 3.0.x, 3.1.x | 1.1.0+          | 4.2.0+                    | 1.5.0+
 |2.0.2+              |2.3.x, 3.0.x        | 1.0.0+          | 4.1.2 - 4.1.6+            | 1.4.x
 |2.0.1^*^            |2.2.x, 2.3.x        | 1.0.0-RC1       | 4.1.0 - 4.1.1             | 1.4.x

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.neo4j</groupId>
     <artifactId>neo4j-ogm</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.2-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
 
     <modules>
         <module>api</module>
@@ -35,8 +35,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <commonslang>3.4</commonslang>
         <commonscodec>1.10</commonscodec>
         <commonsio>2.4</commonsio>
@@ -50,7 +50,7 @@
         <!-- default for build, if no profiles invoked -->
         <neo4j>3.1.1</neo4j>
         <bolt>1.1.0</bolt>
-        <ogm.properties>ogm-http.properties</ogm.properties>
+        <ogm.properties>ogm-bolt.properties</ogm.properties>
     </properties>
 
     <dependencyManagement>
@@ -308,78 +308,6 @@
 
     <profiles>
 
-        <profile>
-            <id>2.2</id>
-            <properties>
-                <neo4j>2.2.10</neo4j>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.18.1</version>
-                        <executions>
-                            <execution>
-                                <id>default-test</id>
-                                <configuration>
-                                    <forkMode>once</forkMode>
-                                    <includes>
-                                        <include>**/*.java</include>
-                                    </includes>
-                                    <excludes>
-                                        <exclude>**/defects/**</exclude>
-                                        <exclude>**/BoltDriverTest.java</exclude>
-                                    </excludes>
-                                    <systemPropertyVariables>
-                                        <ogm.properties>${ogm.properties}</ogm.properties>
-                                    </systemPropertyVariables>
-
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-
-        </profile>
-
-        <profile>
-            <id>2.3</id>
-            <properties>
-                <neo4j>2.3.9</neo4j>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.18.1</version>
-                        <executions>
-                            <execution>
-                                <id>default-test</id>
-                                <configuration>
-                                    <forkMode>once</forkMode>
-                                    <includes>
-                                        <include>**/*.java</include>
-                                    </includes>
-                                    <excludes>
-                                        <exclude>**/defects/**</exclude>
-                                        <exclude>**/BoltDriverTest.java</exclude>
-                                    </excludes>
-                                    <systemPropertyVariables>
-                                        <ogm.properties>${ogm.properties}</ogm.properties>
-                                    </systemPropertyVariables>
-
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-
-        </profile>
-
         <profile>
             <id>3.0</id>
             <properties>

diff --git a/test/pom.xml b/test/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-ogm</artifactId>
-        <version>2.1.2-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,19 +29,19 @@
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-ogm-http-driver</artifactId>
-            <version>2.1.2-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-ogm-embedded-driver</artifactId>
-            <version>2.1.2-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-ogm-bolt-driver</artifactId>
-            <version>2.1.2-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>