Bump CASE-unstable and UCO-unstable pointers for Java upgrade

A follow-on patch will regenerate Make-managed files. References: * ucoProject/UCO#373 Signed-off-by: Alex Nelson <[email protected]>
casework · Jun 7, 2022 · 5fb9b46 · 5fb9b46
1 parent eb17a25
commit 5fb9b46
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/web_resources.yml b/.github/workflows/web_resources.yml
@@ -29,10 +29,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-java@v2
+    - uses: actions/setup-java@v3
       with:
-        distribution: 'adopt'
-        java-version: '8'
+        distribution: 'temurin'
+        java-version: '11'
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:

diff --git a/Makefile b/Makefile
@@ -47,9 +47,10 @@ all: \
   .gitmodules
 	git submodule init
 	git submodule update
+	# TODO - After release of CASE 0.7.0 and UCO 0.9.0, rdf-toolkit.jar references should adjust to UCO-develop.
 	$(MAKE) \
-	  --directory dependencies/CASE-Utilities-Python \
-	  .git_submodule_init.done.log
+	  --directory dependencies/CASE-unstable \
+	  .lib.done.log
 	touch $@
 
 .venv.done.log: \

diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable
diff --git a/dependencies/UCO-unstable b/dependencies/UCO-unstable
diff --git a/examples/src/example-src.mk b/examples/src/example-src.mk
@@ -18,7 +18,7 @@ SHELL := /bin/bash
 # ${top_srcdir}/examples/${example}/src/
 top_srcdir := $(shell cd ../../.. ; pwd)
 
-RDF_TOOLKIT_JAR := $(top_srcdir)/dependencies/CASE-Utilities-Python/dependencies/CASE/lib/rdf-toolkit.jar
+RDF_TOOLKIT_JAR := $(top_srcdir)/dependencies/CASE-unstable/dependencies/UCO/lib/rdf-toolkit.jar
 
 examples_srcdir := $(top_srcdir)/examples
+4 −0		.github/workflows/ci.yml
+4 −3		Makefile
+1 −1		dependencies/UCO
+0 −1		lib/.gitignore
+0 −46		lib/Makefile
+0 −1		lib/rdf-toolkit.jar.sha512
+1 −1		ontology/investigation/Makefile
+1 −1		ontology/master/Makefile
+1 −1		ontology/vocabulary/Makefile
+1 −1		tests/Makefile
+1 −1		tests/examples/Makefile
+3 −3		.github/workflows/ci.yml
+3 −9		lib/Makefile
+1 −1		lib/rdf-toolkit.jar.sha512
+86 −288		ontology/observable/observable.ttl