You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/10/18 15:50:49 UTC
[maven-scm] branch SCM-969 updated (46d333c -> 430caa4)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch SCM-969
in repository https://gitbox.apache.org/repos/asf/maven-scm.git.
from 46d333c [SCM-969] Remove all deprecated providers
new 8527140 a
new 430caa4 Revert "[SCM-737] can't build CVS provider from source release zip file due to missing CVS test repository"
The 2 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:
.../main/java/org/apache/maven/scm/ChangeFile.java | 2 +-
.../scm/command/diff/AbstractDiffCommand.java | 4 +-
.../maven/scm/manager/AbstractScmManager.java | 2 +-
.../org/apache/maven/scm/manager/ScmManager.java | 12 +--
.../org/apache/maven/scm/provider/ScmProvider.java | 4 +-
.../org/apache/maven/scm/provider/ScmUrlUtils.java | 4 +-
.../main/resources/META-INF/plexus/components.xml | 55 +-------------
.../apt/examples/bootstrapping-with-pom.apt.vm | 2 +-
.../site/apt/examples/scm-advance-features.apt.vm | 8 +-
maven-scm-plugin/src/site/apt/usage.apt.vm | 2 +-
pom.xml | 24 ------
src/main/assemblies/scm-source-release.xml | 85 ----------------------
src/site/apt/guide/new_provider.apt | 2 +-
13 files changed, 22 insertions(+), 184 deletions(-)
delete mode 100644 src/main/assemblies/scm-source-release.xml
[maven-scm] 01/02: a
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SCM-969
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 8527140a130ec96499e1421f4e1c4f418390c1fc
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Oct 18 17:45:56 2021 +0200
a
---
.../main/java/org/apache/maven/scm/ChangeFile.java | 2 +-
.../scm/command/diff/AbstractDiffCommand.java | 4 +-
.../maven/scm/manager/AbstractScmManager.java | 2 +-
.../org/apache/maven/scm/manager/ScmManager.java | 12 ++---
.../org/apache/maven/scm/provider/ScmProvider.java | 4 +-
.../org/apache/maven/scm/provider/ScmUrlUtils.java | 4 +-
.../main/resources/META-INF/plexus/components.xml | 55 +---------------------
.../apt/examples/bootstrapping-with-pom.apt.vm | 2 +-
.../site/apt/examples/scm-advance-features.apt.vm | 8 ++--
maven-scm-plugin/src/site/apt/usage.apt.vm | 2 +-
src/site/apt/guide/new_provider.apt | 2 +-
11 files changed, 22 insertions(+), 75 deletions(-)
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeFile.java b/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeFile.java
index f8a504c..301e150 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeFile.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeFile.java
@@ -22,7 +22,7 @@ package org.apache.maven.scm;
import java.io.Serializable;
/**
- * A set of information about revisions of a file as returned by CVS's log
+ * A set of information about revisions of a file as returned by SCM's log
* command
*
* @author <a href="mailto:dion@multitask.com.au">dIon Gillard </a>
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/AbstractDiffCommand.java b/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/AbstractDiffCommand.java
index 2880a1c..53049e7 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/AbstractDiffCommand.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/AbstractDiffCommand.java
@@ -30,8 +30,8 @@ import org.apache.maven.scm.provider.ScmProviderRepository;
/**
* TODO: Better support for entire filesets.
- * TODO: Better support for entire changesets (ie consistency between revision handling in CVS and SVN).
- * TODO: Consistent handling of revisions, tags and dates - currently only revisions supported, though tags will work for CVS
+ * TODO: Better support for entire changesets (ie consistency between revision handling in SVN).
+ * TODO: Consistent handling of revisions, tags and dates - currently only revisions supported
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java b/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
index f393ac9..996bbcb 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
@@ -91,7 +91,7 @@ public abstract class AbstractScmManager
* Set a provider to be used for a type of SCM.
* If there was already a designed provider for that type it will be replaced.
*
- * @param providerType the type of SCM, eg. <code>svn</code>, <code>cvs</code>
+ * @param providerType the type of SCM, eg. <code>svn</code>, <code>git</code>
* @param provider the provider that will be used for that SCM type
*/
public void setScmProvider( String providerType, ScmProvider provider )
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java b/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java
index 697f6b7..009c527 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java
@@ -93,9 +93,9 @@ public interface ScmManager
/**
* Returns the default provider registered for this providerType or a specific implementation if the
* 'maven.scm.provider.providerType.implementation' system property is defined. For example:
- * maven.scm.provider.cvs.implementation=cvs_native
+ * maven.scm.provider.git.implementation=git
*
- * @param providerType The provider type (cvs, svn...)
+ * @param providerType The provider type (git, svn...)
* @return The scm provider
* @throws NoSuchScmProviderException if the provider doesn't exist
*/
@@ -109,7 +109,7 @@ public interface ScmManager
* Set a provider to be used for a type of SCM. If there was already a designed provider for that type it will be
* replaced.
*
- * @param providerType the type of SCM, eg. <code>svn</code>, <code>cvs</code>
+ * @param providerType the type of SCM, eg. <code>svn</code>, <code>git</code>
* @param provider the provider that will be used for that SCM type
*/
void setScmProvider( String providerType, ScmProvider provider );
@@ -117,9 +117,9 @@ public interface ScmManager
/**
* Set the provider implementation
*
- * @param providerType The provider type, eg. <code>cvs</code>
- * @param providerImplementation The provider implementation (the role-hint of the provider), eg. <code>cvs</code>,
- * <code>cvs_native</code>
+ * @param providerType The provider type, eg. <code>git</code>
+ * @param providerImplementation The provider implementation (the role-hint of the provider), eg. <code>git</code>,
+ * <code>svn</code>
*/
void setScmProviderImplementation( String providerType, String providerImplementation );
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java b/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
index 5e0d79f..8dd61cc 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
@@ -91,7 +91,7 @@ public interface ScmProvider
List<String> validateScmUrl( String scmSpecificUrl, char delimiter );
/**
- * Returns the scm reserved file name where the SCM stores information like 'CVS', '.svn'.
+ * Returns the scm reserved file name where the SCM stores information like '.git', '.svn'.
*
* @return the scm reserved file name
*/
@@ -106,7 +106,7 @@ public interface ScmProvider
boolean validateTagName( String tag );
/**
- * Given a tag name, make it suitable for this SCM provider. For example, CVS converts "." into "_"
+ * Given a tag name, make it suitable for this SCM provider.
*
* @param tag input tag name
* @return sanitized tag name
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmUrlUtils.java b/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmUrlUtils.java
index 32afa85..e2f6634 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmUrlUtils.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmUrlUtils.java
@@ -27,8 +27,8 @@ import java.util.List;
* <strong>not</strong> scm provider specific.
* <p/>
* If you need methods that work for a specific scm provider, please create a
- * similar class for that provider. E.g. create the class CvsScmUrlUtils if
- * you need cvs specific checking/parsing.
+ * similar class for that provider. E.g. create the class SvnScmUrlUtils if
+ * you need Subversion-specific checking/parsing.
* </p>
*
* @author <a href="mailto:dennisl@apache.org">Dennis Lundberg</a>
diff --git a/maven-scm-client/src/main/resources/META-INF/plexus/components.xml b/maven-scm-client/src/main/resources/META-INF/plexus/components.xml
index 33544d2..e9b9d94 100644
--- a/maven-scm-client/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-scm-client/src/main/resources/META-INF/plexus/components.xml
@@ -33,26 +33,9 @@ under the License.
<component>
<role>org.apache.maven.scm.provider.ScmProvider</role>
- <role-hint>accurev</role-hint>
- <implementation>org.apache.maven.scm.provider.accurev.AccuRevScmProvider</implementation>
- <description>Implementation of Accurev integration with Maven SCM</description>
- </component>
- <component>
- <role>org.apache.maven.scm.provider.ScmProvider</role>
- <role-hint>bazaar</role-hint>
- <implementation>org.apache.maven.scm.provider.bazaar.BazaarScmProvider</implementation>
- <description>Bazaar NG http://bazaar-vcs.</description>
- </component>
- <component>
- <role>org.apache.maven.scm.provider.ScmProvider</role>
- <role-hint>clearcase</role-hint>
- <implementation>org.apache.maven.scm.provider.clearcase.ClearCaseScmProvider</implementation>
- </component>
- <component>
- <role>org.apache.maven.scm.provider.ScmProvider</role>
<role-hint>hg</role-hint>
<implementation>org.apache.maven.scm.provider.hg.HgScmProvider</implementation>
- <description>Mercurial (HG) is a decentralized revision control system.</description>
+ <description>Mercurial (Hg) is a decentralized revision control system.</description>
</component>
<component>
<role>org.apache.maven.scm.provider.ScmProvider</role>
@@ -61,21 +44,6 @@ under the License.
</component>
<component>
<role>org.apache.maven.scm.provider.ScmProvider</role>
- <role-hint>perforce</role-hint>
- <implementation>org.apache.maven.scm.provider.perforce.PerforceScmProvider</implementation>
- </component>
- <component>
- <role>org.apache.maven.scm.provider.ScmProvider</role>
- <role-hint>cvs_native</role-hint>
- <implementation>org.apache.maven.scm.provider.cvslib.cvsexe.CvsExeScmProvider</implementation>
- </component>
- <component>
- <role>org.apache.maven.scm.provider.ScmProvider</role>
- <role-hint>cvs</role-hint>
- <implementation>org.apache.maven.scm.provider.cvslib.cvsjava.CvsJavaScmProvider</implementation>
- </component>
- <component>
- <role>org.apache.maven.scm.provider.ScmProvider</role>
<role-hint>git</role-hint>
<implementation>org.apache.maven.scm.provider.git.gitexe.GitExeScmProvider</implementation>
</component>
@@ -84,26 +52,5 @@ under the License.
<role-hint>svn</role-hint>
<implementation>org.apache.maven.scm.provider.svn.svnexe.SvnExeScmProvider</implementation>
</component>
- <component>
- <role>org.apache.maven.scm.provider.ScmProvider</role>
- <role-hint>starteam</role-hint>
- <implementation>org.apache.maven.scm.provider.starteam.StarteamScmProvider</implementation>
- </component>
- <component>
- <role>org.apache.maven.scm.provider.ScmProvider</role>
- <role-hint>synergy</role-hint>
- <implementation>org.apache.maven.scm.provider.synergy.SynergyScmProvider</implementation>
- </component>
- <component>
- <role>org.apache.maven.scm.provider.ScmProvider</role>
- <role-hint>vss</role-hint>
- <implementation>org.apache.maven.scm.provider.vss.VssScmProvider</implementation>
- </component>
- <component>
- <role>org.apache.maven.scm.provider.ScmProvider</role>
- <role-hint>jazz</role-hint>
- <implementation>org.apache.maven.scm.provider.jazz.JazzScmProvider</implementation>
- <description>A Maven SCM Provider for IBM Jazz SCM (http://jazz.net/).</description>
- </component>
</components>
</component-set>
diff --git a/maven-scm-plugin/src/site/apt/examples/bootstrapping-with-pom.apt.vm b/maven-scm-plugin/src/site/apt/examples/bootstrapping-with-pom.apt.vm
index bc2acca..0a5869e 100644
--- a/maven-scm-plugin/src/site/apt/examples/bootstrapping-with-pom.apt.vm
+++ b/maven-scm-plugin/src/site/apt/examples/bootstrapping-with-pom.apt.vm
@@ -44,7 +44,7 @@ Bootstrapping a Project Using a POM
<scm>
<connection>scm:svn:http://somerepository.com/svn_repo/trunk</connection>
<developerConnection>scm:svn:https://somerepository.com/svn_repo/trunk</developerConnection>
- <url>http://somerepository.com/view.cvs</url>
+ <url>http://somerepository.com/view.cgi</url>
</scm>
...
<build>
diff --git a/maven-scm-plugin/src/site/apt/examples/scm-advance-features.apt.vm b/maven-scm-plugin/src/site/apt/examples/scm-advance-features.apt.vm
index 2ff7d43..e662167 100644
--- a/maven-scm-plugin/src/site/apt/examples/scm-advance-features.apt.vm
+++ b/maven-scm-plugin/src/site/apt/examples/scm-advance-features.apt.vm
@@ -40,14 +40,14 @@ Other SCM Commands
<scm>
<connection>scm:svn:http://somerepository.com/svn_repo/trunk</connection>
<developerConnection>scm:svn:https://somerepository.com/svn_repo/trunk</developerConnection>
- <url>http://somerepository.com/view.cvs</url>
+ <url>http://somerepository.com/view.cgi</url>
</scm>
...
</project>
+---------+
- If you want to change the default scm provider implementation, for exemple you want to use the native cvs
- instead of the pure java implementation, you must configure your plugin like that:
+ If you want to change the default scm provider implementation, for exemple you want to use the native Git
+ instead of the pure Java implementation, you must configure your plugin like that:
+-----------+
<project>
@@ -61,7 +61,7 @@ Other SCM Commands
<version>${project.version}</version>
<configuration>
<providerImplementations>
- <cvs>cvs_native</cvs>
+ <git>git</git>
</providerImplementations>
</configuration>
</plugin>
diff --git a/maven-scm-plugin/src/site/apt/usage.apt.vm b/maven-scm-plugin/src/site/apt/usage.apt.vm
index 0305e49..983c4a4 100644
--- a/maven-scm-plugin/src/site/apt/usage.apt.vm
+++ b/maven-scm-plugin/src/site/apt/usage.apt.vm
@@ -55,7 +55,7 @@ Configuring SCM
<scm>
<connection>scm:svn:http://somerepository.com/svn_repo/trunk</connection>
<developerConnection>scm:svn:https://somerepository.com/svn_repo/trunk</developerConnection>
- <url>http://somerepository.com/view.cvs</url>
+ <url>http://somerepository.com/view.cgi</url>
</scm>
...
</project>
diff --git a/src/site/apt/guide/new_provider.apt b/src/site/apt/guide/new_provider.apt
index d7fafe3..1d10177 100644
--- a/src/site/apt/guide/new_provider.apt
+++ b/src/site/apt/guide/new_provider.apt
@@ -193,7 +193,7 @@ public class MyCheckoutCommand
CheckOutScmResult result = new CheckOutScmResult();
//Add the code there to run the command
- //If you need to run a native commandline like cvs/svn/cleartool..., look at other providers how to launch it and parse the output
+ //If you need to run a native commandline like git/svn/..., look at other providers how to launch it and parse the output
return result;
}
[maven-scm] 02/02: Revert "[SCM-737] can't build CVS provider from
source release zip file due to missing CVS test repository"
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SCM-969
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 430caa4ab8abc450bb464888046422ea2b3848ab
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Oct 18 17:47:28 2021 +0200
Revert "[SCM-737] can't build CVS provider from source release zip file due to missing CVS test repository"
This reverts commit e250cd544e6d2a0e06769e66f28ad8073cea62a3.
---
pom.xml | 24 ---------
src/main/assemblies/scm-source-release.xml | 85 ------------------------------
2 files changed, 109 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5fba10b..4f17f70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -472,30 +472,6 @@
</profile>
<profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>source-release-assembly</id>
- <configuration>
- <!-- SCM-737 -->
- <descriptorRefs combine.self="override" />
- <descriptors>
- <descriptor>src/main/assemblies/scm-source-release.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
<id>only-eclipse</id>
<activation>
<property>
diff --git a/src/main/assemblies/scm-source-release.xml b/src/main/assemblies/scm-source-release.xml
deleted file mode 100644
index 4f8e2da..0000000
--- a/src/main/assemblies/scm-source-release.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?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.
--->
-
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>source-release</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>.</directory>
-
- <!-- START SNIPPET: SCM-737 -->
- <useDefaultExcludes>false</useDefaultExcludes>
- <includes>
- <include>**/CVS</include>
- <include>**/CVS/**</include>
- <include>**/.cvsignore</include>
- </includes>
- <!-- END SNIPPET: SCM-737 -->
-
- <!-- SCM-737 requires same excludes within fileSet at 'assemblies/source-shared.xml' -->
- <excludes>
- <!-- build output -->
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
-
- <!-- NOTE: Most of the following excludes should not be required
- if the standard release process is followed. This is because the
- release plugin checks out project sources into a location like
- target/checkout, then runs the build from there. The result is
- a source-release archive that comes from a pretty clean directory
- structure.
-
- HOWEVER, if the release plugin is configured to run extra goals
- or generate a project website, it's definitely possible that some
- of these files will be present. So, it's safer to exclude them.
- -->
-
- <!-- IDEs -->
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?out(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
-
- <!-- misc -->
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
-
- <!-- release-plugin temp files -->
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- <componentDescriptors>
- <componentDescriptor>assemblies/source-shared.xml</componentDescriptor>
- </componentDescriptors>
-</assembly>
\ No newline at end of file