Author: evenisse
Date: Wed Apr 18 02:55:47 2007
New Revision: 529940
URL: http://svn.apache.org/viewvc?view=rev&rev=529940
Log:
[MRELEASE-122] Allow extensions without defined version
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-without-extension-version/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-without-extension-version/expected-pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-without-extension-version/pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-without-extension-version/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-without-extension-version/expected-pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-without-extension-version/pom.xml
(with props)
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/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.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?view=diff&rev=529940&r1=529939&r2=529940
==============================================================================
---
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
Wed Apr 18 02:55:47 2007
@@ -372,9 +372,12 @@
{
Extension extension = (Extension) i.next();
- updateDomVersion( extension.getGroupId(),
extension.getArtifactId(), mappedVersions,
- resolvedSnapshotDependencies,
extension.getVersion(), originalVersions, "extensions",
- "extension", extensionRoot, projectId,
properties, result );
+ if ( extension.getVersion() != null )
+ {
+ updateDomVersion( extension.getGroupId(),
extension.getArtifactId(), mappedVersions,
+ resolvedSnapshotDependencies,
extension.getVersion(), originalVersions,
+ "extensions", "extension",
extensionRoot, projectId, properties, result );
+ }
}
}
}
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java?view=diff&rev=529940&r1=529939&r2=529940
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
Wed Apr 18 02:55:47 2007
@@ -371,6 +371,17 @@
assertTrue( compareFiles( reactorProjects ) );
}
+ public void testRewritePomExtensionUndefinedVersion()
+ throws Exception
+ {
+ List reactorProjects = createReactorProjects(
"pom-without-extension-version" );
+ ReleaseDescriptor config = createDefaultConfiguration( reactorProjects
);
+
+ phase.execute( config, null, reactorProjects );
+
+ assertTrue( compareFiles( reactorProjects ) );
+ }
+
public void testRewriteBasicPomWithEditMode()
throws Exception
{
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-without-extension-version/expected-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-without-extension-version/expected-pom.xml?view=auto&rev=529940
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-without-extension-version/expected-pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-without-extension-version/expected-pom.xml
Wed Apr 18 02:55:47 2007
@@ -0,0 +1,35 @@
+<!--
+ ~ 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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.1-SNAPSHOT</version>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>groupId</groupId>
+ <artifactId>something</artifactId>
+ </extension>
+ </extensions>
+ </build>
+</project>
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-without-extension-version/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-without-extension-version/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-without-extension-version/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-without-extension-version/pom.xml?view=auto&rev=529940
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-without-extension-version/pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-without-extension-version/pom.xml
Wed Apr 18 02:55:47 2007
@@ -0,0 +1,35 @@
+<!--
+ ~ 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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>groupId</groupId>
+ <artifactId>something</artifactId>
+ </extension>
+ </extensions>
+ </build>
+</project>
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-without-extension-version/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-without-extension-version/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-without-extension-version/expected-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-without-extension-version/expected-pom.xml?view=auto&rev=529940
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-without-extension-version/expected-pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-without-extension-version/expected-pom.xml
Wed Apr 18 02:55:47 2007
@@ -0,0 +1,35 @@
+<!--
+ ~ 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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>groupId</groupId>
+ <artifactId>something</artifactId>
+ </extension>
+ </extensions>
+ </build>
+</project>
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-without-extension-version/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-without-extension-version/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-without-extension-version/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-without-extension-version/pom.xml?view=auto&rev=529940
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-without-extension-version/pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-without-extension-version/pom.xml
Wed Apr 18 02:55:47 2007
@@ -0,0 +1,35 @@
+<!--
+ ~ 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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>groupId</groupId>
+ <artifactId>something</artifactId>
+ </extension>
+ </extensions>
+ </build>
+</project>
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-without-extension-version/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-without-extension-version/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
