You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2008/11/16 00:57:36 UTC
svn commit: r717948 - in /maven/plugins/trunk/maven-resources-plugin: ./
src/it/MRESOURCES-78/ src/it/MRESOURCES-78/src/
src/it/MRESOURCES-78/src/main/ src/it/MRESOURCES-78/src/main/filtered/
src/it/MRESOURCES-78/src/main/resources/
Author: olamy
Date: Sat Nov 15 15:57:35 2008
New Revision: 717948
URL: http://svn.apache.org/viewvc?rev=717948&view=rev
Log:
[MRESOURCES-78] change in @ translation behavior in maven-resources-plugin 2.3
upgrade maven-filtering and plexus-interpolation versions
add an it for the issue
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/pom.xml (with props)
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/filtered/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/filtered/filtered.properties (with props)
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/resources/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/resources/unfiltered.properties (with props)
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/verify.groovy (with props)
Modified:
maven/plugins/trunk/maven-resources-plugin/pom.xml
Modified: maven/plugins/trunk/maven-resources-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/pom.xml?rev=717948&r1=717947&r2=717948&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/pom.xml Sat Nov 15 15:57:35 2008
@@ -77,8 +77,14 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
- <version>1.0-beta-2</version>
+ <version>1.0-beta-3-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interpolation</artifactId>
+ <version>1.7-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -130,4 +136,18 @@
</profile>
</profiles>
+ <!-- TODO remove when plexus-interpolation is released -->
+ <repositories>
+ <repository>
+ <id>codehaus.snapshot</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
</project>
Added: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/pom.xml?rev=717948&view=auto
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/pom.xml (added)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/pom.xml Sat Nov 15 15:57:35 2008
@@ -0,0 +1,54 @@
+<?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.opennms</groupId>
+ <artifactId>resources-test</artifactId>
+ <name>OpenNMS Resources Test</name>
+ <version>1.0</version>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/filtered</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>@pom.version@</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <escapeString>\</escapeString>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <escaped>this is escaped</escaped>
+ <escaped.at>this is escaped.at</escaped.at>
+ <foo>this is foo</foo>
+ <bar>this is bar</bar>
+ </properties>
+</project>
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/filtered/filtered.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/filtered/filtered.properties?rev=717948&view=auto
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/filtered/filtered.properties (added)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/filtered/filtered.properties Sat Nov 15 15:57:35 2008
@@ -0,0 +1,16 @@
+escaped=\${escaped}
+escaped.at=\@escaped.at@
+foo=${foo}
+project.foo=${project.foo}
+bar=@bar@
+project.bar=@project.bar@
+not.a.property=${not.a.property}
+not.a.property.at=@not.a.property@
+version=${version}
+version.at=@version@
+project.version=${project.version}
+project.version.at=@project.version@
+target=@target@
+target.at=@target.at@
+project.target=@project.target@
+project.target.at=@project.target@
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/filtered/filtered.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/filtered/filtered.properties
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/filtered/filtered.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/resources/unfiltered.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/resources/unfiltered.properties?rev=717948&view=auto
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/resources/unfiltered.properties (added)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/resources/unfiltered.properties Sat Nov 15 15:57:35 2008
@@ -0,0 +1,16 @@
+escaped=\${escaped}
+escaped.at=\@escaped.at@
+foo=${foo}
+project.foo=${project.foo}
+bar=@bar@
+project.bar=@project.bar@
+not.a.property=${not.a.property}
+not.a.property.at=@not.a.property@
+version=${version}
+version.at=@version@
+project.version=${project.version}
+project.version.at=@project.version@
+target=@target@
+target.at=@target.at@
+project.target=@project.target@
+project.target.at=@project.target@
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/resources/unfiltered.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/resources/unfiltered.properties
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/src/main/resources/unfiltered.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/verify.groovy?rev=717948&view=auto
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/verify.groovy (added)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/verify.groovy Sat Nov 15 15:57:35 2008
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+assert new File(basedir, 'target/classes/filtered.properties').exists();
+assert new File(basedir, 'target/classes/unfiltered.properties').exists();
+
+filteredContent = new File(basedir, 'target/classes/filtered.properties').text;
+assert content.contains( 'bar=this is bar');
+assert content.contains( 'escaped=\${escaped}');
+assert content.contains( 'escaped.at=\@escaped.at@');
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/verify.groovy
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-78/verify.groovy
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision