maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfscho...@apache.org
Subject svn commit: r1669818 - in /maven/release/trunk: maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ maven-release-plugin/src/it/projects/prepare/MRELEASE-834/
Date Sat, 28 Mar 2015 18:34:22 GMT
Author: rfscholte
Date: Sat Mar 28 18:34:22 2015
New Revision: 1669818

URL: http://svn.apache.org/r1669818
Log:
[MRELEASE-834] release:prepare fails when a system property starting with dependency is given

Added:
    maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-834/
    maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-834/pom.xml
    maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-834/test.properties
Modified:
    maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java?rev=1669818&r1=1669817&r2=1669818&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
(original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
Sat Mar 28 18:34:22 2015
@@ -252,11 +252,16 @@ public class ReleaseUtils
                     endIndex = propertyName.lastIndexOf( ".development" );
                     versionType = ReleaseDescriptor.DEVELOPMENT_KEY;
                 }
-                else
+                else if ( propertyName.indexOf( ".release" ) != -1 )
                 {
                     endIndex = propertyName.lastIndexOf( ".release" );
                     versionType = ReleaseDescriptor.RELEASE_KEY;
                 }
+                else
+                {
+                    // MRELEASE-834, probably a maven-dependency-plugin property
+                    continue;
+                }
 
                 artifactVersionlessKey = propertyName.substring( startIndex, endIndex );
 

Added: maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-834/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-834/pom.xml?rev=1669818&view=auto
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-834/pom.xml
(added)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-834/pom.xml
Sat Mar 28 18:34:22 2015
@@ -0,0 +1,44 @@
+<?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.its</groupId>
+  <artifactId>mrelease-834</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <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>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.its.release</groupId>
+            <artifactId>maven-scm-provider-dummy</artifactId>
+            <version>1.0</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file

Added: maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-834/test.properties
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-834/test.properties?rev=1669818&view=auto
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-834/test.properties
(added)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-834/test.properties
Sat Mar 28 18:34:22 2015
@@ -0,0 +1,18 @@
+# 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.
+
+dependency.locations.enabled=false
\ No newline at end of file



Mime
View raw message