[MOD] Merged with 'next' branch, switched to 8.6 beta

BaseXdb · Oct 7, 2016 · 8cc5d4e · 8cc5d4e
1 parent bb490ca
commit 8cc5d4e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/basex-api/pom.xml b/basex-api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.basex</groupId>
     <artifactId>basex-parent</artifactId>
-    <version>8.5.4-SNAPSHOT</version>
+    <version>8.6-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/basex-core/pom.xml b/basex-core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.basex</groupId>
     <artifactId>basex-parent</artifactId>
-    <version>8.5.4-SNAPSHOT</version>
+    <version>8.6-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/basex-core/src/main/java/org/basex/util/Prop.java b/basex-core/src/main/java/org/basex/util/Prop.java
@@ -45,7 +45,7 @@ public final class Prop {
   /** Project name. */
   public static final String NAME = "BaseX";
   /** Code version (may contain major, minor and optional patch number). */
-  public static final String VERSION = version("8.5.4 beta");
+  public static final String VERSION = version("8.6 beta");
   /** Main author. */
   public static final String AUTHOR = "Christian Gr\u00FCn";
   /** Co-authors (1). */

diff --git a/basex-core/src/test/java/org/basex/core/LocalConcurrencyTest.java b/basex-core/src/test/java/org/basex/core/LocalConcurrencyTest.java
@@ -45,7 +45,7 @@ public void run() {
         }.start();
       }
     } finally {
-      while(counter.get() < runs && error[0] == null) Thread.yield();
+      while(counter.get() < runs) Thread.yield();
       execute(new DropDB("store"));
       execute(new DropUser("user"));
 

diff --git a/basex-examples/pom.xml b/basex-examples/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.basex</groupId>
     <artifactId>basex-parent</artifactId>
-    <version>8.5.4-SNAPSHOT</version>
+    <version>8.6-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/basex-tests/pom.xml b/basex-tests/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.basex</groupId>
     <artifactId>basex-parent</artifactId>
-    <version>8.5.4-SNAPSHOT</version>
+    <version>8.6-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <!-- Artifact information -->
   <groupId>org.basex</groupId>
   <artifactId>basex-parent</artifactId>
-  <version>8.5.4-SNAPSHOT</version>
+  <version>8.6-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>