Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Github Actions build, remove bad xml-apis dependency, and fix MockSiteService #67

Merged
merged 1 commit into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions scorm-impl/pack/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -643,4 +643,9 @@ public boolean willArchiveMerge()
{
return SiteService.super.willArchiveMerge();
}

@Override
public String idFromSiteReference(String ref) {
throw new UnsupportedOperationException( "Not supported yet." );
}
}