diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 352095b1..f4dc79cd 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,19 +5,19 @@ name: Java CI with Maven on: pull_request: - branches: [ master, 20.x, 21.x, 22.x, 23.x ] jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Git Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 11 - architecture: x64 + distribution: 'temurin' + cache: 'maven' - name: Build with Maven env: MAVEN_OPTS: -Djava.awt.headless=true -Dorg.slf4j.simpleLogger.defaultLogLevel=info -Dmaven.wagon.http.retryHandler.count=2 -Dmaven.wagon.http.pool=true diff --git a/scorm-impl/pack/pom.xml b/scorm-impl/pack/pom.xml index 444f1e7f..d44c5a64 100644 --- a/scorm-impl/pack/pom.xml +++ b/scorm-impl/pack/pom.xml @@ -63,12 +63,6 @@ xmlParserAPIs runtime - - xml-apis - xml-apis - jar - runtime - diff --git a/scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockSiteService.java b/scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockSiteService.java index 6e270295..db1170bd 100644 --- a/scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockSiteService.java +++ b/scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockSiteService.java @@ -643,4 +643,9 @@ public boolean willArchiveMerge() { return SiteService.super.willArchiveMerge(); } + + @Override + public String idFromSiteReference(String ref) { + throw new UnsupportedOperationException( "Not supported yet." ); + } }