Merge branch 'master' into scala-2.11

mduerig · Apr 27, 2018 · 9fa06b7 · 9fa06b7
2 parents aca28c3 + dfd50ed
commit 9fa06b7
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>michid</groupId>
     <artifactId>script-oak-parent_2.11</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3</version>
     <relativePath>./script-oak-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/script-oak-core-test/pom.xml b/script-oak-core-test/pom.xml
@@ -8,15 +8,15 @@
   <parent>
     <groupId>michid</groupId>
     <artifactId>script-oak-parent_2.11</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3</version>
     <relativePath>../script-oak-parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>script-oak-core-test_2.11</artifactId>
   <name>Script Oak Core Test</name>
 
   <properties>
-    <oak.version>1.10-SNAPSHOT</oak.version>
+    <oak.version>1.9.0</oak.version>
   </properties>
 
   <build>
@@ -54,7 +54,7 @@
     </dependency>
     <dependency>
       <groupId>michid</groupId>
-      <artifactId>script-oak-1.10_2.11</artifactId>
+      <artifactId>script-oak-1.9.0_2.11</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/script-oak-core/pom.xml b/script-oak-core/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>michid</groupId>
     <artifactId>script-oak-parent_2.11</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3</version>
     <relativePath>../script-oak-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/script-oak-fixture-reactor/pom.xml b/script-oak-fixture-reactor/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>michid</groupId>
     <artifactId>script-oak-parent_2.11</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3</version>
     <relativePath>../script-oak-parent/pom.xml</relativePath>
   </parent>
 
@@ -15,6 +15,6 @@
 
   <modules>
     <module>script-oak-fixtures</module>
-    <module>script-oak-1.10</module>
+    <module>script-oak-1.9.0</module>
   </modules>
 </project>
diff --git a/...k-fixture-reactor/script-oak-1.10/pom.xml → ...-fixture-reactor/script-oak-1.9.0/pom.xml b/...k-fixture-reactor/script-oak-1.10/pom.xml → ...-fixture-reactor/script-oak-1.9.0/pom.xml
@@ -8,16 +8,15 @@
   <parent>
     <groupId>michid</groupId>
     <artifactId>script-oak-parent_2.11</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3</version>
     <relativePath>../../script-oak-parent/pom.xml</relativePath>
   </parent>
 
-  <artifactId>script-oak-1.10_2.11</artifactId>
-  <name>Script Oak 1.10 Fixture</name>
+  <artifactId>script-oak-1.9.0_2.11</artifactId>
+  <name>Script Oak 1.9.0 Fixture</name>
 
   <properties>
-    <!-- michid depend on released version of oak-segment-tar with tool api -->
-    <oak.fixture.version>1.10-SNAPSHOT</oak.fixture.version>
+    <oak.fixture.version>1.9.0</oak.fixture.version>
   </properties>
 
   <build>

diff --git a/.../oak/fixture/BasicReadOnlyBlobStore.scala → .../oak/fixture/BasicReadOnlyBlobStore.scala b/.../oak/fixture/BasicReadOnlyBlobStore.scala → .../oak/fixture/BasicReadOnlyBlobStore.scala
diff --git a/...a/michid/script/oak/fixture/package.scala → ...a/michid/script/oak/fixture/package.scala b/...a/michid/script/oak/fixture/package.scala → ...a/michid/script/oak/fixture/package.scala
diff --git a/script-oak-fixture-reactor/script-oak-fixtures/pom.xml b/script-oak-fixture-reactor/script-oak-fixtures/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>michid</groupId>
     <artifactId>script-oak-parent_2.11</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3</version>
     <relativePath>../../script-oak-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/...xture-reactor/script-oak-fixtures/src/main/scala/michid/script/oak/fixtures/package.scala b/...xture-reactor/script-oak-fixtures/src/main/scala/michid/script/oak/fixtures/package.scala
@@ -30,13 +30,13 @@ package object fixtures {
   }
 
   val oakFixtures: Map[String, OakFixture] = Map(
-    oak_1_10.oakVersion -> oak_1_10
+    oak_1_9_0.oakVersion -> oak_1_9_0
   )
 
-  val latest: OakFixture = oak_1_10
+  val latest: OakFixture = oak_1_9_0
 
-  object oak_1_10 extends OakFixture {
-    val oakVersion = "oak-1.10"
+  object oak_1_9_0 extends OakFixture {
+    val oakVersion = "oak-1.9.0"
 
     override def toString: String = oakVersion
 

diff --git a/script-oak-parent/pom.xml b/script-oak-parent/pom.xml
@@ -5,7 +5,7 @@
   <groupId>michid</groupId>
   <artifactId>script-oak-parent_2.11</artifactId>
   <name>Script Oak Parent POM</name>
-  <version>1.3-SNAPSHOT</version>
+  <version>1.3</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -104,7 +104,7 @@
       <dependency>
         <groupId>org.apache.jackrabbit</groupId>
         <artifactId>oak-tooling-api</artifactId>
-        <version>1.0-SNAPSHOT</version> <!-- michid remove snapshot dependency -->
+        <version>1.0</version>
       </dependency>
 
       <!-- Misc -->

diff --git a/script-oak-shell/pom.xml b/script-oak-shell/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>michid</groupId>
     <artifactId>script-oak-parent_2.11</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3</version>
     <relativePath>../script-oak-parent/pom.xml</relativePath>
   </parent>