You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/12/26 17:48:37 UTC
svn commit: r729508 - in /maven/components/trunk/maven-project/src/test:
java/org/apache/maven/project/builder/
resources-project-builder/unprefixed-expression-interpolation/
resources-project-builder/unprefixed-expression-interpolation/child/
Author: bentmann
Date: Fri Dec 26 08:48:36 2008
New Revision: 729508
URL: http://svn.apache.org/viewvc?rev=729508&view=rev
Log:
o Created UT from MNG-3831
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/ (with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/ (with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml (with props)
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=729508&r1=729507&r2=729508&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java Fri Dec 26 08:48:36 2008
@@ -357,6 +357,39 @@
}
}
+ public void testInterpolationOfLegacyExpressionsThatDontIncludeTheProjectPrefix()
+ throws Exception
+ {
+ PomTestWrapper pom = buildPom( "unprefixed-expression-interpolation/child" );
+ assertEquals( pom.getBasedir(), new File( pom.getValue( "properties/projectDir" ).toString() ) );
+
+ assertEquals( "org.apache.maven.its.mng3831.child", pom.getValue( "properties/projectGroupId" ) );
+ assertEquals( "child", pom.getValue( "properties/projectArtifactId" ) );
+ assertEquals( "2.0-alpha-1", pom.getValue( "properties/projectVersion" ) );
+ assertEquals( "jar", pom.getValue( "properties/projectPackaging" ) );
+
+ assertEquals( "child-name", pom.getValue( "properties/projectName" ) );
+ assertEquals( "child-desc", pom.getValue( "properties/projectDesc" ) );
+ assertEquals( "http://child.org/", pom.getValue( "properties/projectUrl" ) );
+ assertEquals( "2008", pom.getValue( "properties/projectYear" ) );
+ assertEquals( "child-org-name", pom.getValue( "properties/projectOrgName" ) );
+
+ assertEquals( "2.0.0", pom.getValue( "properties/projectPrereqMvn" ) );
+ assertEquals( "http://scm.org/", pom.getValue( "properties/projectScmUrl" ) );
+ assertEquals( "http://issue.org/", pom.getValue( "properties/projectIssueUrl" ) );
+ assertEquals( "http://ci.org/", pom.getValue( "properties/projectCiUrl" ) );
+ assertEquals( "child-dist-repo", pom.getValue( "properties/projectDistRepoName" ) );
+ assertEquals( "http://dist.org/", pom.getValue( "properties/projectDistRepoUrl" ) );
+ assertEquals( "http://site.org/", pom.getValue( "properties/projectDistSiteUrl" ) );
+
+ assertEquals( "org.apache.maven.its.mng3831", pom.getValue( "properties/parentGroupId" ) );
+ assertEquals( "parent", pom.getValue( "properties/parentArtifactId" ) );
+ assertEquals( "1.0", pom.getValue( "properties/parentVersion" ) );
+
+ assertTrue( pom.getValue( "properties/projectBuildOut" ).toString().endsWith( "bin" ) );
+ assertTrue( pom.getValue( "properties/projectSiteOut" ).toString().endsWith( "doc" ) );
+ }
+
private PomArtifactResolver artifactResolver( String basedir )
{
return new FileBasedPomArtifactResolver( new File( BASE_POM_DIR, basedir ) );
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml?rev=729508&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml Fri Dec 26 08:48:36 2008
@@ -0,0 +1,104 @@
+<?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>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng3831</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>org.apache.maven.its.mng3831.child</groupId>
+ <artifactId>child</artifactId>
+ <version>2.0-alpha-1</version>
+ <packaging>jar</packaging>
+
+ <name>child-name</name>
+ <description>child-desc</description>
+ <url>http://child.org/</url>
+ <inceptionYear>2008</inceptionYear>
+ <organization>
+ <name>child-org-name</name>
+ </organization>
+
+ <prerequisites>
+ <maven>2.0.0</maven>
+ </prerequisites>
+
+ <scm>
+ <url>http://scm.org/</url>
+ </scm>
+ <issueManagement>
+ <url>http://issue.org/</url>
+ </issueManagement>
+ <ciManagement>
+ <url>http://ci.org/</url>
+ </ciManagement>
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <name>child-dist-repo</name>
+ <url>http://dist.org/</url>
+ </repository>
+ <site>
+ <id>maven-core-it</id>
+ <name>child-site</name>
+ <url>http://site.org/</url>
+ </site>
+ </distributionManagement>
+
+ <properties>
+ <!-- this is where we collect all the interpolated values for the POM dump -->
+ <projectDir>${basedir}</projectDir>
+ <projectGroupId>${groupId}</projectGroupId>
+ <projectArtifactId>${artifactId}</projectArtifactId>
+ <projectVersion>${version}</projectVersion>
+ <projectPackaging>${packaging}</projectPackaging>
+ <projectName>${name}</projectName>
+ <projectDesc>${description}</projectDesc>
+ <projectUrl>${url}</projectUrl>
+ <projectYear>${inceptionYear}</projectYear>
+ <projectOrgName>${organization.name}</projectOrgName>
+ <projectPrereqMvn>${prerequisites.maven}</projectPrereqMvn>
+ <projectScmUrl>${scm.url}</projectScmUrl>
+ <projectIssueUrl>${issueManagement.url}</projectIssueUrl>
+ <projectCiUrl>${ciManagement.url}</projectCiUrl>
+ <projectDistRepoName>${distributionManagement.repository.name}</projectDistRepoName>
+ <projectDistRepoUrl>${distributionManagement.repository.url}</projectDistRepoUrl>
+ <projectDistSiteUrl>${distributionManagement.site.url}</projectDistSiteUrl>
+ <projectBuildOut>${build.outputDirectory}</projectBuildOut>
+ <projectSiteOut>${reporting.outputDirectory}</projectSiteOut>
+ <parentGroupId>${parent.groupId}</parentGroupId>
+ <parentArtifactId>${parent.artifactId}</parentArtifactId>
+ <parentVersion>${parent.version}</parentVersion>
+ </properties>
+
+ <build>
+ <outputDirectory>target/bin</outputDirectory>
+ </build>
+
+ <reporting>
+ <outputDirectory>target/doc</outputDirectory>
+ </reporting>
+
+</project>
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml?rev=729508&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml Fri Dec 26 08:48:36 2008
@@ -0,0 +1,36 @@
+<?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.its.mng3831</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-3831</name>
+ <description>Test POM interpolation with expressions of the form $ { * } (ugly but real)</description>
+
+ <modules>
+ <module>parent/child</module>
+ </modules>
+</project>
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision