Skip to content

Commit d430b85

Browse files
Merge branch 'next'
2 parents b635e56 + dbb64eb commit d430b85

File tree

3 files changed

+57
-28
lines changed

3 files changed

+57
-28
lines changed

.github/workflows/m2.yml

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,39 @@ jobs:
1515
- name: Set up a compatible Java version
1616
uses: actions/setup-java@v4
1717
with:
18-
distribution: zulu
19-
java-version: 11
18+
distribution: temurin
19+
java-version: 17
2020
cache: maven
2121

22+
- name: See if we have the Opencast artifacts
23+
id: exists
24+
run: |
25+
if [ -d ~/.m2/repository/org/opencastproject/base/17.0 ]
26+
then
27+
echo exists=true >> "$GITHUB_OUTPUT"
28+
else
29+
echo exists=false >> "$GITHUB_OUTPUT"
30+
fi
31+
32+
- name: Potentially check out Opencast
33+
if: steps.exists.outputs.exists == 'false'
34+
uses: actions/checkout@v4
35+
with:
36+
repository: opencast/opencast
37+
ref: "17.0"
38+
path: opencast
39+
40+
- name: Potentially build Opencast
41+
if: steps.exists.outputs.exists == 'false'
42+
run: |
43+
cd opencast
44+
./mvnw clean install -Pnone \
45+
--batch-mode \
46+
-Dmaven.test.skip \
47+
-DskipTests \
48+
-Dcheckstyle.skip \
49+
-Dmdep.analyze.skip
50+
2251
- name: Potentially restore node from cache
2352
uses: actions/cache@v3
2453
with:

opencast-backend/annotation-impl/pom.xml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -141,21 +141,16 @@
141141
<plugin>
142142
<groupId>org.apache.maven.plugins</groupId>
143143
<artifactId>maven-dependency-plugin</artifactId>
144-
<executions>
145-
<execution>
146-
<id>analyze</id>
147-
<configuration>
148-
<ignoredUnusedDeclaredDependencies>
149-
<ignoredUnusedDeclaredDependency>
150-
org.eclipse.persistence:org.eclipse.persistence.asm
151-
</ignoredUnusedDeclaredDependency>
152-
<!-- Test logging and database providers -->
153-
<ignoredUnusedDeclaredDependency>org.slf4j:slf4j-reload4j</ignoredUnusedDeclaredDependency>
154-
<ignoredUnusedDeclaredDependency>com.h2database:h2</ignoredUnusedDeclaredDependency>
155-
</ignoredUnusedDeclaredDependencies>
156-
</configuration>
157-
</execution>
158-
</executions>
144+
<configuration>
145+
<ignoredUnusedDeclaredDependencies combine.children="append">
146+
<ignoredUnusedDeclaredDependency>
147+
org.eclipse.persistence:org.eclipse.persistence.asm
148+
</ignoredUnusedDeclaredDependency>
149+
<!-- Test logging and database providers -->
150+
<ignoredUnusedDeclaredDependency>org.slf4j:slf4j-reload4j</ignoredUnusedDeclaredDependency>
151+
<ignoredUnusedDeclaredDependency>com.h2database:h2</ignoredUnusedDeclaredDependency>
152+
</ignoredUnusedDeclaredDependencies>
153+
</configuration>
159154
</plugin>
160155
<plugin>
161156
<groupId>org.apache.felix</groupId>

opencast-backend/pom.xml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,20 @@
2222

2323
<name>Opencast Annotation Tool :: Backend</name>
2424

25-
<properties>
26-
<maven.compiler.release>11</maven.compiler.release>
27-
</properties>
28-
2925
<dependencies>
3026
<dependency>
3127
<groupId>org.opencastproject</groupId>
3228
<artifactId>opencast-common</artifactId>
3329
<version>${opencast.build.version}</version>
3430
<scope>provided</scope>
3531
</dependency>
32+
<!-- TODO Without this, we get compiler warnings during the build
33+
We might need a runtime counterpart as well, but let's first see how this goes -->
34+
<dependency>
35+
<groupId>javax.xml.bind</groupId>
36+
<artifactId>jaxb-api</artifactId>
37+
<version>2.3.1</version>
38+
</dependency>
3639
</dependencies>
3740

3841
<build>
@@ -49,7 +52,7 @@
4952
<configuration>
5053
<rules>
5154
<requireJavaVersion>
52-
<version>11</version>
55+
<version>17</version>
5356
</requireJavaVersion>
5457
</rules>
5558
</configuration>
@@ -60,17 +63,18 @@
6063
<groupId>org.apache.maven.plugins</groupId>
6164
<artifactId>maven-dependency-plugin</artifactId>
6265
<version>3.6.0</version>
66+
<configuration>
67+
<failOnWarning>true</failOnWarning>
68+
<ignoredUnusedDeclaredDependencies>
69+
<ignoredUnusedDeclaredDependency>javax.xml.bind:jaxb-api</ignoredUnusedDeclaredDependency>
70+
</ignoredUnusedDeclaredDependencies>
71+
</configuration>
6372
<executions>
6473
<execution>
6574
<id>analyze</id>
6675
<goals>
67-
<goal>
68-
analyze-only
69-
</goal>
76+
<goal>analyze-only</goal>
7077
</goals>
71-
<configuration>
72-
<failOnWarning>true</failOnWarning>
73-
</configuration>
7478
</execution>
7579
</executions>
7680
</plugin>
@@ -102,6 +106,7 @@
102106
<configuration>
103107
<failOnWarning>true</failOnWarning>
104108
<compilerArgument>-Xlint:all</compilerArgument>
109+
<release>17</release>
105110
</configuration>
106111
</plugin>
107112
<plugin>

0 commit comments

Comments
 (0)