Fix master builds (#67)

(cherry picked from commit d433525)
sakaicontrib · Jan 10, 2024 · c20f715 · c20f715
1 parent 044961f
commit c20f715
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git 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
@@ -63,12 +63,6 @@
             <artifactId>xmlParserAPIs</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <type>jar</type>
-            <scope>runtime</scope>
-        </dependency>
     </dependencies>
 
     <build />

diff --git a/...mpl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockSiteService.java b/...mpl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockSiteService.java
@@ -134,6 +134,12 @@ public boolean allowUpdateGroupMembership( String id )
         return false;
     }
 
+    @Override
+    public boolean allowUpdateGroupMembership(String siteId, String groupId)
+    {
+        return false;
+    }
+
     @Override
     public boolean allowUpdateSite( String id )
     {
@@ -625,4 +631,9 @@ public boolean willArchiveMerge()
     {
         return SiteService.super.willArchiveMerge();
     }
+
+    @Override
+    public String idFromSiteReference(String ref) {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
 }