Switch to 1.6.1: added last studio as plugin, now ant install creates the "GratefulDeadConcerts" database

lvca · lvca · commit 15d207bfad2b · 2013-11-20T16:13:04.000+01:00
diff --git a/.travis.yml b/.travis.yml
diff --git a/build.xml b/build.xml
@@ -5,7 +5,7 @@
     <property environment="env"/>
     <property name="vendor" value="NuvolaBase Ltd"/>
     <property name="product" value="OrientDB"/>
-    <property name="version" value="1.6.1-SNAPSHOT"/>
+    <property name="version" value="1.6.1"/>
     <condition property="community.release" value="${releaseHome}/orientdb-community-${version}"
                else="../releases/orientdb-community-${version}">
         <isset property="releaseHome"/>
@@ -65,9 +65,9 @@
      <echo>           ,::::,,,. `:   ,,   :::::    :     :   .:    :::::::::     ::::::::::</echo>
      <echo>           ,,:` `,,.                                  </echo>
      <echo>          ,,,    .,`                                  </echo>
-     <echo>         ,,.     `,                                          GRAPH DATABASE   </echo>
-     <echo>       ``        `.                                   </echo>
-     <echo>                 ``                                   </echo>
+     <echo>         ,,.     `,                                          GRAPH DATABASE</echo>
+     <echo>       ``        `.                                        COMMUNITY  EDITION</echo>
+     <echo>                 ``                                         www.orientdb.org</echo>
      <echo>                 `                                    </echo>
 
         <mkdir dir="${community.release}"/>
@@ -148,6 +148,11 @@
                 <filter token="BUILD" value="${build.number}"/>
             </filterset>
         </copy>
+        <chmod perm="u+x" verbose="yes">
+            <fileset dir="${community.release}/bin">
+                <include name="**/*.sh"/>
+            </fileset>
+        </chmod>
 
         <copy todir="${community.release}/www/">
             <fileset dir="server/src/site"/>
@@ -174,6 +179,12 @@
             <fileset dir="." includes="server/benchmarks/*"/>
         </copy>
 
+        <delete dir="${community.release}/databases"/>
+    	<java fork="true" dir="graphdb" classname="com.orientechnologies.orient.graph.blueprints.TestLoadGraph">
+            <classpath>
+            	<fileset dir="${community.release}/lib" includes="*.jar"/>
+            </classpath>
+        </java>
 
         <copy todir="${community.release}/databases/GratefulDeadConcerts" failonerror="false">
             <fileset dir="graphdb/target/databases/GratefulDeadConcerts/" includes="*"/>
@@ -247,8 +258,15 @@
         <delete file="../releases/orientdb-community-${version}.zip"/>
         <zip destfile="../releases/orientdb-community-${version}.zip" basedir="../releases" level="9" update="false"
              includes="orientdb-community-${version}/" excludes="**/*.log.*"/>
-        <tar destfile="../releases/orientdb-community-${version}.tar.gz" basedir="../releases" compression="gzip"
-             includes="orientdb-community-${version}/" excludes="**/*.log.*"/>
+        <tar destfile="../releases/orientdb-community-${version}.tar.gz" compression="gzip">
+            <tarfileset dir="../releases/orientdb-community-${version}">
+                <include name="**"/>
+                <exclude name="**/*.sh"/>
+            </tarfileset>
+            <tarfileset dir="../releases/orientdb-community-${version}" mode="755">
+                <include name="**/*.sh"/>
+            </tarfileset>
+         </tar>
     </target>
 
 </project>
diff --git a/client/pom.xml b/client/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.1</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/commons/pom.xml b/commons/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.1</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/core/pom.xml b/core/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.1</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/core/src/main/java/com/orientechnologies/orient/core/OConstants.java b/core/src/main/java/com/orientechnologies/orient/core/OConstants.java
@@ -16,7 +16,7 @@
 package com.orientechnologies.orient.core;
 
 public class OConstants {
-  public static final String ORIENT_VERSION = "1.6.1-SNAPSHOT";
+  public static final String ORIENT_VERSION = "1.6.1";
   public static final String ORIENT_URL     = "www.orientechnologies.com";
 
   public static String getVersion() {
diff --git a/distributed/pom.xml b/distributed/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.1</version>
     </parent>
 
     <artifactId>orientdb-distributed</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.1</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/enterprise/pom.xml b/enterprise/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.1</version>
     </parent>
 
     <artifactId>orientdb-enterprise</artifactId>
diff --git a/graphdb/pom.xml b/graphdb/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.1</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/graphdb/src/test/java/com/orientechnologies/orient/graph/blueprints/TestLoadGraph.java b/graphdb/src/test/java/com/orientechnologies/orient/graph/blueprints/TestLoadGraph.java
@@ -6,7 +6,7 @@
 
 import com.orientechnologies.orient.client.db.ODatabaseHelper;
 import com.orientechnologies.orient.core.config.OGlobalConfiguration;
-import com.orientechnologies.orient.core.db.graph.OGraphDatabase;
+import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.tinkerpop.blueprints.impls.orient.OrientBaseGraph;
 import com.tinkerpop.blueprints.impls.orient.OrientGraphNoTx;
 import com.tinkerpop.blueprints.util.io.graphml.GraphMLReader;
@@ -35,7 +35,7 @@ public TestLoadGraph(final String[] args) {
   public void testImport() throws IOException, FileNotFoundException {
     OGlobalConfiguration.STORAGE_KEEP_OPEN.setValue(false);
 
-    OGraphDatabase db = new OGraphDatabase(DBURL);
+    ODatabaseDocumentTx db = new ODatabaseDocumentTx(DBURL);
     ODatabaseHelper.deleteDatabase(db, "plocal");
 
     OrientBaseGraph g = new OrientGraphNoTx(dbURL);
diff --git a/history.txt b/history.txt
@@ -24,6 +24,13 @@
 
 ***************************************************************************************************
 This document contains the last changes to the OrientDB project.
+
+---------------------------------------------------------------------------------------------------
+VERSION 1.6.1 - (November, 20th 2013)
+---------------------------------------------------------------------------------------------------
+- Bug fixing
+
+Full list: https://github.com/orientechnologies/orientdb/issues?milestone=10&page=1&state=closed
 
 ---------------------------------------------------------------------------------------------------
 VERSION 1.6 - (October, 31nd 2013)
diff --git a/nativeos/pom.xml b/nativeos/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>orientdb-parent</artifactId>
         <groupId>com.orientechnologies</groupId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.1</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/object/pom.xml b/object/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.1</version>
     </parent>
 
     <artifactId>orientdb-object</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
 
     <groupId>com.orientechnologies</groupId>
     <artifactId>orientdb-parent</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.1</version>
     <packaging>pom</packaging>
 
     <name>OrientDB</name>
diff --git a/server/plugins/studio-1.6.1.zip b/server/plugins/studio-1.6.1.zip
diff --git a/server/pom.xml b/server/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.1</version>
     </parent>
 
     <artifactId>orientdb-server</artifactId>
diff --git a/tests/pom.xml b/tests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.1</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/tools/pom.xml b/tools/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.1</version>
         <relativePath>../</relativePath>
     </parent>
 
