Skip to content

Commit 3de3878

Browse files
Raise required Java version
1 parent 311266d commit 3de3878

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

opencast-backend/annotation-impl/pom.xml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -147,21 +147,16 @@
147147
<plugin>
148148
<groupId>org.apache.maven.plugins</groupId>
149149
<artifactId>maven-dependency-plugin</artifactId>
150-
<executions>
151-
<execution>
152-
<id>analyze</id>
153-
<configuration>
154-
<ignoredUnusedDeclaredDependencies>
155-
<ignoredUnusedDeclaredDependency>
156-
org.eclipse.persistence:org.eclipse.persistence.asm
157-
</ignoredUnusedDeclaredDependency>
158-
<!-- Test logging and database providers -->
159-
<ignoredUnusedDeclaredDependency>org.slf4j:slf4j-reload4j</ignoredUnusedDeclaredDependency>
160-
<ignoredUnusedDeclaredDependency>com.h2database:h2</ignoredUnusedDeclaredDependency>
161-
</ignoredUnusedDeclaredDependencies>
162-
</configuration>
163-
</execution>
164-
</executions>
150+
<configuration>
151+
<ignoredUnusedDeclaredDependencies combine.children="append">
152+
<ignoredUnusedDeclaredDependency>
153+
org.eclipse.persistence:org.eclipse.persistence.asm
154+
</ignoredUnusedDeclaredDependency>
155+
<!-- Test logging and database providers -->
156+
<ignoredUnusedDeclaredDependency>org.slf4j:slf4j-reload4j</ignoredUnusedDeclaredDependency>
157+
<ignoredUnusedDeclaredDependency>com.h2database:h2</ignoredUnusedDeclaredDependency>
158+
</ignoredUnusedDeclaredDependencies>
159+
</configuration>
165160
</plugin>
166161
<plugin>
167162
<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)