You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2012/05/04 00:19:36 UTC
svn commit: r1333660 - in
/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release:
phase/AbstractRewritePomsPhase.java phase/RewritePomsForReleasePhase.java
scm/GitScmTranslator.java scm/HgScmTranslator.java
Author: struberg
Date: Thu May 3 22:19:36 2012
New Revision: 1333660
URL: http://svn.apache.org/viewvc?rev=1333660&view=rev
Log:
MRELEASE-723 add ScmTranslators for Hg and Git
Thanks to Mirko Friedenhagen and Robert Scholte for the help!
Added:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/GitScmTranslator.java (with props)
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java?rev=1333660&r1=1333659&r2=1333660&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java Thu May 3 22:19:36 2012
@@ -307,7 +307,7 @@ public abstract class AbstractRewritePom
String commonBasedir;
try
{
- commonBasedir = ReleaseUtil.getCommonBasedir( reactorProjects );
+ commonBasedir = ReleaseUtil.getCommonBasedir( reactorProjects );
}
catch ( IOException e )
{
@@ -827,4 +827,4 @@ public abstract class AbstractRewritePom
}
return scm;
}
-}
\ No newline at end of file
+}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java?rev=1333660&r1=1333659&r2=1333660&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java Thu May 3 22:19:36 2012
@@ -110,7 +110,7 @@ public class RewritePomsForReleasePhase
Namespace namespace, ScmRepository scmRepository, ReleaseResult relResult,
String commonBasedir ) throws IOException
{
- ScmTranslator translator = (ScmTranslator) scmTranslators.get( scmRepository.getProvider() );
+ ScmTranslator translator = scmTranslators.get( scmRepository.getProvider() );
boolean result = false;
if ( translator != null )
{
Added: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/GitScmTranslator.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/GitScmTranslator.java?rev=1333660&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/GitScmTranslator.java (added)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/GitScmTranslator.java Thu May 3 22:19:36 2012
@@ -0,0 +1,45 @@
+package org.apache.maven.shared.release.scm;
+
+/*
+ * 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.
+ */
+
+/**
+ * @plexus.component role="org.apache.maven.shared.release.scm.ScmTranslator" role-hint="git"
+ */
+public class GitScmTranslator implements ScmTranslator
+{
+
+ /** {@inheritDoc} */
+ public String translateBranchUrl( String url, String branchName, String branchBase )
+ {
+ return url;
+ }
+
+ /** {@inheritDoc} */
+ public String translateTagUrl( String url, String tag, String tagBase )
+ {
+ return url;
+ }
+
+ /** {@inheritDoc} */
+ public String resolveTag( String tag )
+ {
+ return tag;
+ }
+}
Propchange: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/GitScmTranslator.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java?rev=1333660&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java (added)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java Thu May 3 22:19:36 2012
@@ -0,0 +1,45 @@
+package org.apache.maven.shared.release.scm;
+
+/*
+ * 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.
+ */
+
+/**
+ * @plexus.component role="org.apache.maven.shared.release.scm.ScmTranslator" role-hint="hg"
+ */
+public class HgScmTranslator implements ScmTranslator
+{
+
+ /** {@inheritDoc} */
+ public String translateBranchUrl( String url, String branchName, String branchBase )
+ {
+ return url;
+ }
+
+ /** {@inheritDoc} */
+ public String translateTagUrl( String url, String tag, String tagBase )
+ {
+ return url;
+ }
+
+ /** {@inheritDoc} */
+ public String resolveTag( String tag )
+ {
+ return tag;
+ }
+}