You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/03/30 20:17:59 UTC
[maven-release] branch MRELEASE-1040 created (now a0a2ca0)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MRELEASE-1040
in repository https://gitbox.apache.org/repos/asf/maven-release.git.
at a0a2ca0 [MRELEASE-1040] Required class missing org/eclipse/aether/util/version/GenericVersionScheme
This branch includes the following new commits:
new a0a2ca0 [MRELEASE-1040] Required class missing org/eclipse/aether/util/version/GenericVersionScheme
The 1 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.
[maven-release] 01/01: [MRELEASE-1040] Required class missing
org/eclipse/aether/util/version/GenericVersionScheme
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MRELEASE-1040
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit a0a2ca07652cfe503afd98aace421358e0eda109
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon Mar 30 22:17:49 2020 +0200
[MRELEASE-1040] Required class missing org/eclipse/aether/util/version/GenericVersionScheme
---
maven-release-plugin/pom.xml | 15 ++++++
.../src/it/projects/prepare/oddeven-policy/pom.xml | 54 ++++++++++++++++++++++
.../src/it/projects/prepare/semver-policy/pom.xml | 54 ++++++++++++++++++++++
.../maven-release-oddeven-policy/pom.xml | 11 ++---
pom.xml | 2 +-
5 files changed, 129 insertions(+), 7 deletions(-)
diff --git a/maven-release-plugin/pom.xml b/maven-release-plugin/pom.xml
index f9d4212..3bf479e 100644
--- a/maven-release-plugin/pom.xml
+++ b/maven-release-plugin/pom.xml
@@ -80,6 +80,21 @@
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
</dependency>
+
+ <!-- verified with ITs -->
+ <dependency>
+ <groupId>org.apache.maven.release</groupId>
+ <artifactId>maven-release-oddeven-policy</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.release</groupId>
+ <artifactId>maven-release-semver-policy</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <optional>true</optional>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/maven-release-plugin/src/it/projects/prepare/oddeven-policy/pom.xml b/maven-release-plugin/src/it/projects/prepare/oddeven-policy/pom.xml
new file mode 100644
index 0000000..2d0e7d8
--- /dev/null
+++ b/maven-release-plugin/src/it/projects/prepare/oddeven-policy/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugin.release.it</groupId>
+ <artifactId>oddversion-policy</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scm>
+ <connection>scm:dummy|nul</connection>
+ <developerConnection>scm:dummy|nul</developerConnection>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <projectVersionPolicyId>OddEvenVersionPolicy</projectVersionPolicyId>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>maven-scm-provider-dummy</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.release</groupId>
+ <artifactId>maven-release-oddeven-policy</artifactId>
+ <version>@project.version@</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/maven-release-plugin/src/it/projects/prepare/semver-policy/pom.xml b/maven-release-plugin/src/it/projects/prepare/semver-policy/pom.xml
new file mode 100644
index 0000000..df9eec7
--- /dev/null
+++ b/maven-release-plugin/src/it/projects/prepare/semver-policy/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugin.release.it</groupId>
+ <artifactId>oddversion-policy</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scm>
+ <connection>scm:dummy|nul</connection>
+ <developerConnection>scm:dummy|nul</developerConnection>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <projectVersionPolicyId>SemVerVersionPolicy</projectVersionPolicyId>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>maven-scm-provider-dummy</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.release</groupId>
+ <artifactId>maven-release-semver-policy</artifactId>
+ <version>@project.version@</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/maven-release-policies/maven-release-oddeven-policy/pom.xml b/maven-release-policies/maven-release-oddeven-policy/pom.xml
index 37b23c6..8c8eb2c 100644
--- a/maven-release-policies/maven-release-oddeven-policy/pom.xml
+++ b/maven-release-policies/maven-release-oddeven-policy/pom.xml
@@ -47,6 +47,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-util</artifactId>
+ <version>1.0.0.v20140518</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
<optional>true</optional>
@@ -57,12 +62,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-util</artifactId>
- <version>1.0.0.v20140518</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index 472b061..0d5f7cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,9 +39,9 @@
<modules>
<module>maven-release-api</module>
<module>maven-release-manager</module>
- <module>maven-release-plugin</module>
<module>maven-release-policies/maven-release-oddeven-policy</module>
<module>maven-release-policies/maven-release-semver-policy</module>
+ <module>maven-release-plugin</module>
</modules>
<scm>