Update to parent POM 42 (#932)

Changes:
* parent POM 42
* unset release where needed (makes com.sun pkg unreachable)
* explicitly index as parent disables "implicit" AP
* remove redundtant stuff
* update dependabot to take care of workflow as well (as mvnd uses own)
This commit is contained in:
Tamas Cservenak
2024-04-18 19:40:05 +02:00
committed by GitHub
parent a1ac6660ec
commit d23e0e88f6
7 changed files with 60 additions and 28 deletions

View File

@@ -1,9 +1,10 @@
# #
# Copyright 2022 the original author or authors. # Licensed to the Apache Software Foundation (ASF) under one or more
# # contributor license agreements. See the NOTICE file distributed with
# Licensed under the Apache License, Version 2.0 (the "License"); # this work for additional information regarding copyright ownership.
# you may not use this file except in compliance with the License. # The ASF licenses this file to You under the Apache License, Version 2.0
# You may obtain a copy of the License at # (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
@@ -13,13 +14,17 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
version: 2 version: 2
updates: updates:
- package-ecosystem: maven - package-ecosystem: maven
directory: '/' directory: "/"
schedule: schedule:
interval: daily interval: daily
# see https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates#open-pull-requests-limit time: '04:00'
# open-pull-requests-limit: 10 open-pull-requests-limit: 10
versioning-strategy: increase
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"

View File

@@ -30,6 +30,11 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven Daemon - Common</name> <name>Maven Daemon - Common</name>
<properties>
<!-- If using release, sun.misc is not reachable (see SignalHelper) -->
<maven.compiler.release />
</properties>
<dependencies> <dependencies>
<dependency> <dependency>

View File

@@ -47,4 +47,13 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

View File

@@ -47,4 +47,13 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

View File

@@ -30,6 +30,11 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven Daemon - Daemon</name> <name>Maven Daemon - Daemon</name>
<properties>
<!-- If using release, sun.misc is not reachable (see SignalHelper) -->
<maven.compiler.release />
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.maven.daemon</groupId> <groupId>org.apache.maven.daemon</groupId>
@@ -104,6 +109,10 @@
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>

View File

@@ -57,6 +57,10 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>

15
pom.xml
View File

@@ -23,7 +23,7 @@
<parent> <parent>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId> <artifactId>maven-parent</artifactId>
<version>40</version> <version>42</version>
<relativePath /> <relativePath />
</parent> </parent>
@@ -68,8 +68,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
<maven-dist.required.jdk>8</maven-dist.required.jdk> <maven-dist.required.jdk>8</maven-dist.required.jdk>
<project.build.outputTimestamp>2023-10-26T05:45:19Z</project.build.outputTimestamp> <project.build.outputTimestamp>2023-10-26T05:45:19Z</project.build.outputTimestamp>
<trimStackTrace>false</trimStackTrace> <trimStackTrace>false</trimStackTrace>
@@ -87,7 +87,6 @@
<jakarta.inject.version>1.0</jakarta.inject.version> <jakarta.inject.version>1.0</jakarta.inject.version>
<jansi.version>2.4.0</jansi.version> <jansi.version>2.4.0</jansi.version>
<jline.version>3.24.0</jline.version> <jline.version>3.24.0</jline.version>
<junit.jupiter.version>5.9.2</junit.jupiter.version>
<maven.version>4.0.0-alpha-8</maven.version> <maven.version>4.0.0-alpha-8</maven.version>
<maven3.version>3.9.6</maven3.version> <maven3.version>3.9.6</maven3.version>
<maven4.version>${maven.version}</maven4.version> <maven4.version>${maven.version}</maven4.version>
@@ -154,14 +153,6 @@
<version>${graalvm.version}</version> <version>${graalvm.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit.jupiter.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency> <dependency>
<groupId>jakarta.inject</groupId> <groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId> <artifactId>jakarta.inject-api</artifactId>