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

No effects were observed on Make-managed files. References: * ucoProject/UCO#373 Signed-off-by: Alex Nelson <[email protected]>
casework · Jun 7, 2022 · 0de414a · 0de414a
1 parent e5fa41e
commit 0de414a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,10 +24,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
@@ -58,10 +58,9 @@ all: \
 	test -r dependencies/UCO-unstable/README.md \
 	  || (echo "ERROR:Makefile:UCO-unstable submodule README.md file not found, even though UCO-unstable submodule initialized." >&2 ; exit 2)
 	# Retrieve rdf-toolkit.jar.
-	cd dependencies/CASE-Utilities-Python \
-	  && git submodule update --init dependencies/CASE
+	# 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/dependencies/CASE \
+	  --directory dependencies/CASE-unstable \
 	  .lib.done.log
 	touch $@
 

diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable
diff --git a/dependencies/UCO-unstable b/dependencies/UCO-unstable
diff --git a/examples/illustrations/src/illustration-nosrc.mk b/examples/illustrations/src/illustration-nosrc.mk
@@ -23,7 +23,7 @@ SHELL := /bin/bash
 # The expected execution context is in any sibling directory of this Makefile's directory.
 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
 
 example_name := $(shell basename $$PWD)
+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