final version for embedded db

Sfurti-yb · May 18, 2021 · 20f8620 · 20f8620
1 parent 766c306
commit 20f8620
Show file tree

Hide file tree

Showing 46 changed files with 3 additions and 100 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -93,7 +93,7 @@ jobs:
           path: build/spock-reports
 
       - name: Derby Test Run
-        run: mvn -Dtest=LiquibaseHarnessSuiteTest -DdbName=derby -DdbVersion=10.14.2.0 -Dmaven.test.failure.ignore=true test
+        run: mvn -Dtest=LiquibaseHarnessSuiteTest -DdbName=derby -Dmaven.test.failure.ignore=true test
 
       - name: Archive Derby test results
         uses: actions/upload-artifact@v2
@@ -130,20 +130,3 @@ jobs:
         with:
           name: cockroachdb-test-results
           path: build/spock-reports
-
-      - name: Build derby test infra
-        working-directory: src/test/resources/docker/derby
-        run: docker-compose -f docker-compose.yml up -d
-
-      - name: derby Test Run
-        run: mvn -Dtest=LiquibaseHarnessSuiteTest -DdbName=derby -DdbVersion=10.12.1.1,10.15.1.3 test
-
-      - name: Archive derby test results
-        uses: actions/upload-artifact@v2
-        with:
-          name: derby-test-results
-          path: build/spock-reports
-
-      - name: Tear down derby test infra
-        working-directory: src/test/resources/docker/derby
-        run: docker-compose -f docker-compose.yml down --volumes
diff --git a/README.md b/README.md
@@ -139,7 +139,7 @@ gracefully and to allow the tests to start from a clean slate on the next run.
 | EDB | `9.5, 9.6, 10, 11, 12, 13` |
 | H2 | `1.4.200` |
 | SQLite | `3.34.0` |
-| Apache Derby | `10.12.1.1`, `10.15.1.3` |
+| Apache Derby | `10.14.2.0` |
 
 
 
diff --git a/src/test/resources/derby/lbcat/db.lck b/src/test/resources/derby/lbcat/db.lck
diff --git a/src/test/resources/derby/lbcat/log/log.ctrl b/src/test/resources/derby/lbcat/log/log.ctrl
diff --git a/src/test/resources/derby/lbcat/log/logmirror.ctrl b/src/test/resources/derby/lbcat/log/logmirror.ctrl
diff --git a/src/test/resources/derby/lbcat/seg0/c101.dat b/src/test/resources/derby/lbcat/seg0/c101.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c111.dat b/src/test/resources/derby/lbcat/seg0/c111.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c121.dat b/src/test/resources/derby/lbcat/seg0/c121.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c130.dat b/src/test/resources/derby/lbcat/seg0/c130.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c141.dat b/src/test/resources/derby/lbcat/seg0/c141.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c150.dat b/src/test/resources/derby/lbcat/seg0/c150.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c161.dat b/src/test/resources/derby/lbcat/seg0/c161.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c171.dat b/src/test/resources/derby/lbcat/seg0/c171.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c180.dat b/src/test/resources/derby/lbcat/seg0/c180.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c191.dat b/src/test/resources/derby/lbcat/seg0/c191.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c1a1.dat b/src/test/resources/derby/lbcat/seg0/c1a1.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c1b1.dat b/src/test/resources/derby/lbcat/seg0/c1b1.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c1c0.dat b/src/test/resources/derby/lbcat/seg0/c1c0.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c1d1.dat b/src/test/resources/derby/lbcat/seg0/c1d1.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c20.dat b/src/test/resources/derby/lbcat/seg0/c20.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c200.dat b/src/test/resources/derby/lbcat/seg0/c200.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c211.dat b/src/test/resources/derby/lbcat/seg0/c211.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c221.dat b/src/test/resources/derby/lbcat/seg0/c221.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c2d0.dat b/src/test/resources/derby/lbcat/seg0/c2d0.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c2e1.dat b/src/test/resources/derby/lbcat/seg0/c2e1.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c31.dat b/src/test/resources/derby/lbcat/seg0/c31.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c400.dat b/src/test/resources/derby/lbcat/seg0/c400.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c41.dat b/src/test/resources/derby/lbcat/seg0/c41.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c411.dat b/src/test/resources/derby/lbcat/seg0/c411.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c421.dat b/src/test/resources/derby/lbcat/seg0/c421.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c4f0.dat b/src/test/resources/derby/lbcat/seg0/c4f0.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c51.dat b/src/test/resources/derby/lbcat/seg0/c51.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c510.dat b/src/test/resources/derby/lbcat/seg0/c510.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c60.dat b/src/test/resources/derby/lbcat/seg0/c60.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c71.dat b/src/test/resources/derby/lbcat/seg0/c71.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c81.dat b/src/test/resources/derby/lbcat/seg0/c81.dat
diff --git a/src/test/resources/derby/lbcat/seg0/c90.dat b/src/test/resources/derby/lbcat/seg0/c90.dat
diff --git a/src/test/resources/derby/lbcat/seg0/ca1.dat b/src/test/resources/derby/lbcat/seg0/ca1.dat
diff --git a/src/test/resources/derby/lbcat/seg0/cb1.dat b/src/test/resources/derby/lbcat/seg0/cb1.dat
diff --git a/src/test/resources/derby/lbcat/seg0/cf0.dat b/src/test/resources/derby/lbcat/seg0/cf0.dat
diff --git a/src/test/resources/docker/derby/README.md b/src/test/resources/docker/derby/README.md
diff --git a/src/test/resources/docker/derby/derby-10.12.1.1-init.sh b/src/test/resources/docker/derby/derby-10.12.1.1-init.sh
diff --git a/src/test/resources/docker/derby/derby-10.15.1.3-init.sh b/src/test/resources/docker/derby/derby-10.15.1.3-init.sh
diff --git a/src/test/resources/docker/derby/docker-compose.yml b/src/test/resources/docker/derby/docker-compose.yml
diff --git a/src/test/resources/docker/derby/input-for-ij.txt b/src/test/resources/docker/derby/input-for-ij.txt
diff --git a/src/test/resources/harness-config.yml b/src/test/resources/harness-config.yml
@@ -141,14 +141,6 @@ databasesUnderTest:
     version: 3.34.0
     url: jdbc:sqlite:./src/test/resources/sqlite/sqlite.db
 
-  - name: derby
-    version: 10.12.1.1
-    url: jdbc:derby://localhost:1527/lbcat
-
   - name: derby
     version: 10.14.2.0
-    url: jdbc:derby:./src/test/resources/derby/lbcat
-
-  - name: derby
-    version: 10.15.1.3
-    url: jdbc:derby://localhost:1526/lbcat
+    url: jdbc:derby:./src/test/resources/derby/lbcat