This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
The following commit(s) were added to refs/heads/master by this push:
new 676ecc8 Cleanup dependencies (#105)
676ecc8 is described below
commit 676ecc894f89d9c24fbea91acace83ce1346eed0
Author: Guillaume Nodet <[email protected]>
AuthorDate: Mon Jun 24 20:26:33 2024 +0200
Cleanup dependencies (#105)
---
pom.xml | 55 +++++++++++++++++-----
.../filtering/IncrementalResourceFilteringTest.xml | 27 -----------
2 files changed, 44 insertions(+), 38 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6b2dd0a..7678e1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,9 +63,15 @@
<properties>
<javaVersion>17</javaVersion>
<mavenVersion>4.0.0-beta-3</mavenVersion>
+
+ <junitVersion>5.10.1</junitVersion>
+ <mockitoVersion>5.12.0</mockitoVersion>
<slf4jVersion>2.0.13</slf4jVersion>
<plexusBuildApiVersion>0.0.7</plexusBuildApiVersion>
+ <plexusInterpolationVersion>1.26</plexusInterpolationVersion>
+
<mavenPluginTestingVersion>4.0.0-alpha-3-SNAPSHOT</mavenPluginTestingVersion>
<project.build.outputTimestamp>2023-03-21T10:54:20Z</project.build.outputTimestamp>
+ <hamcrestVersion>2.2</hamcrestVersion>
</properties>
<dependencies>
@@ -74,6 +80,26 @@
<artifactId>maven-api-core</artifactId>
<version>${mavenVersion}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-api-di</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-api-model</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-api-meta</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-api-settings</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -87,41 +113,52 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
- <version>1.26</version>
+ <version>${plexusInterpolationVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>4.0.0-alpha-3-SNAPSHOT</version>
+ <version>${mavenPluginTestingVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-di</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
- <version>4.7.0</version>
+ <version>${mockitoVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockitoVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <version>5.9.2</version>
+ <artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
- <version>2.2</version>
+ <version>${hamcrestVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -149,10 +186,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.sisu</groupId>
- <artifactId>sisu-maven-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
diff --git
a/src/test/resources/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.xml
b/src/test/resources/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.xml
deleted file mode 100644
index 551b1b4..0000000
---
a/src/test/resources/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (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
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<component-set>
- <components>
- <component>
- <role>org.sonatype.plexus.build.incremental.BuildContext</role>
- <role-hint>default</role-hint>
-
<implementation>org.sonatype.plexus.build.incremental.ThreadBuildContext</implementation>
- </component>
- </components>
-</component-set>
