You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/01/25 20:18:13 UTC
[maven-enforcer] branch master updated (50a5457 -> b49bd3b)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git.
from 50a5457 Merge pull request #82 from apache/ver
new a3d57a4 Remove Travis config
new 2742cb4 [MENFORCER-371] Require Maven 3.1.1
new d0349eb [MENFORCER-371] Update dependency to maven-compat
new b49bd3b [MENFORCER-371] Drop dep to old plexus-container-default - use default new org.eclipse.sisu.inject one
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 33 ----------------------
enforcer-api/pom.xml | 5 ----
enforcer-rules/pom.xml | 2 ++
.../maven/plugins/enforcer/EnforcerTestUtils.java | 3 +-
pom.xml | 7 +++--
5 files changed, 7 insertions(+), 43 deletions(-)
delete mode 100644 .travis.yml
[maven-enforcer] 03/04: [MENFORCER-371] Update dependency to
maven-compat
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit d0349eb6844452714d09b009536f93a1294bf0af
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Jan 23 10:03:19 2021 +0100
[MENFORCER-371] Update dependency to maven-compat
---
enforcer-rules/pom.xml | 2 ++
.../java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java | 3 +--
pom.xml | 8 ++------
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/enforcer-rules/pom.xml b/enforcer-rules/pom.xml
index 3fb4426..349d713 100644
--- a/enforcer-rules/pom.xml
+++ b/enforcer-rules/pom.xml
@@ -103,9 +103,11 @@
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-util</artifactId>
</dependency>
+ <!-- needed for ArtifactCollector and maven-dependency-tree 2.2 -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java
index f87a348..763a2a5 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java
@@ -36,7 +36,6 @@ import org.apache.maven.plugins.enforcer.utils.MockEnforcerExpressionEvaluator;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
-import org.eclipse.aether.RepositorySystemSession;
/**
* The Class EnforcerTestUtils.
@@ -62,7 +61,7 @@ public final class EnforcerTestUtils
when( mer.getSystemProperties() ).thenReturn( systemProperties );
MavenExecutionResult meresult = mock( MavenExecutionResult.class );
- return new MavenSession( mock, (RepositorySystemSession) null, mer, meresult );
+ return new MavenSession( mock, null, mer, meresult );
}
/**
diff --git a/pom.xml b/pom.xml
index 8c27143..fb9de5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
<version>34</version>
+ <relativePath />
</parent>
<groupId>org.apache.maven.enforcer</groupId>
<artifactId>enforcer</artifactId>
@@ -107,14 +108,9 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${maven.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-api</artifactId>
- <version>0.9.0.M2</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
<version>3.1.0</version>
[maven-enforcer] 01/04: Remove Travis config
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit a3d57a47d3030e0ff9dfe54a9d00381eae43e520
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Jan 25 21:10:35 2021 +0100
Remove Travis config
---
.travis.yml | 33 ---------------------------------
1 file changed, 33 deletions(-)
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index e00391c..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,33 +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.
-
-language: java
-sudo: false
-
-cache:
- directories:
- - "$HOME/.m2"
-
-jobs:
- include:
- - stage: test
- jdk: openjdk11
- script: mvn verify -Prun-its
-
-branches:
- only:
- - master
[maven-enforcer] 04/04: [MENFORCER-371] Drop dep to old
plexus-container-default - use default new org.eclipse.sisu.inject one
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit b49bd3b8fd20816773c2971c31bbbf737c5987ba
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Jan 23 10:05:07 2021 +0100
[MENFORCER-371] Drop dep to old plexus-container-default - use default new org.eclipse.sisu.inject one
---
enforcer-api/pom.xml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/enforcer-api/pom.xml b/enforcer-api/pom.xml
index c27ddd6..0858cfc 100644
--- a/enforcer-api/pom.xml
+++ b/enforcer-api/pom.xml
@@ -41,11 +41,6 @@
<artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-9</version>
- </dependency>
- <dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.0</version>
[maven-enforcer] 02/04: [MENFORCER-371] Require Maven 3.1.1
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit 2742cb4ff124d5225eed92fad1e586e14c3fbd6e
Author: KroArtem <ar...@gmail.com>
AuthorDate: Fri Jan 15 01:39:20 2021 +0300
[MENFORCER-371] Require Maven 3.1.1
Closes #85
---
.../org/apache/maven/plugins/enforcer/EnforcerTestUtils.java | 2 +-
pom.xml | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java
index 29014a5..f87a348 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java
@@ -36,7 +36,7 @@ import org.apache.maven.plugins.enforcer.utils.MockEnforcerExpressionEvaluator;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
-import org.sonatype.aether.RepositorySystemSession;
+import org.eclipse.aether.RepositorySystemSession;
/**
* The Class EnforcerTestUtils.
diff --git a/pom.xml b/pom.xml
index 04d1444..8c27143 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
</distributionManagement>
<properties>
- <maven.version>3.0</maven.version>
+ <maven.version>3.1.1</maven.version>
<maven.site.path>enforcer-archives/enforcer-LATEST</maven.site.path>
<javaVersion>7</javaVersion>
<project.build.outputTimestamp>2020-04-17T21:04:00Z</project.build.outputTimestamp>
@@ -108,6 +108,11 @@
<artifactId>maven-compat</artifactId>
<version>${maven.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ <version>0.9.0.M2</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -148,7 +153,7 @@
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>2.1</version>
+ <version>3.1.0</version>
<scope>test</scope>
</dependency>
<dependency>