From 0de414a8d9d638639d5fccba99db2956e42ccfd6 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 7 Jun 2022 16:53:35 -0400 Subject: [PATCH] Bump CASE-unstable and UCO-unstable pointers for Java upgrade No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/373 Signed-off-by: Alex Nelson --- .github/workflows/ci.yml | 6 +++--- Makefile | 5 ++--- dependencies/CASE-unstable | 2 +- dependencies/UCO-unstable | 2 +- examples/illustrations/src/illustration-nosrc.mk | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3feb7fec..e53a55dd 100644 --- 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 index e2c8838a..8464a4b3 100644 --- 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 index dbc3bd10..dda243d4 160000 --- a/dependencies/CASE-unstable +++ b/dependencies/CASE-unstable @@ -1 +1 @@ -Subproject commit dbc3bd109377c019596e0bc10cd4e1d007fcfe55 +Subproject commit dda243d4ed99aa425c13aec48c5c39ee43979db7 diff --git a/dependencies/UCO-unstable b/dependencies/UCO-unstable index df922e67..314c2524 160000 --- a/dependencies/UCO-unstable +++ b/dependencies/UCO-unstable @@ -1 +1 @@ -Subproject commit df922e67be643e2f2a58c0b024cab6817e0b6c24 +Subproject commit 314c2524337abc6b5d3c22e86597be89dac2ac52 diff --git a/examples/illustrations/src/illustration-nosrc.mk b/examples/illustrations/src/illustration-nosrc.mk index 29130829..18a7c871 100644 --- 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)