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 2009/09/24 23:14:28 UTC
svn commit: r818628 - in /maven/plugins/trunk/maven-resources-plugin: ./
src/it/ src/it/MRESOURCES-105/ src/it/MRESOURCES-105/src/
src/it/MRESOURCES-105/src/main/ src/it/MRESOURCES-105/src/main/resources/
Author: olamy
Date: Thu Sep 24 21:14:27 2009
New Revision: 818628
URL: http://svn.apache.org/viewvc?rev=818628&view=rev
Log:
[MRESOURCES-105] upgrade to plexus-interpolation 1.13-SNAPSHOT to prevent NPE.
add it
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/my.properties (with props)
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/pom.xml (with props)
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/src/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/src/main/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/src/main/resources/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/src/main/resources/test.properties (with props)
Modified:
maven/plugins/trunk/maven-resources-plugin/pom.xml
maven/plugins/trunk/maven-resources-plugin/src/it/settings.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=818628&r1=818627&r2=818628&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/pom.xml Thu Sep 24 21:14:27 2009
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
- <version>1.12</version>
+ <version>1.13-SNAPSHOT</version>
</dependency>
<dependency>
Added: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/my.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/my.properties?rev=818628&view=auto
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/my.properties (added)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/my.properties Thu Sep 24 21:14:27 2009
@@ -0,0 +1,2 @@
+test.value=true
+toto.value=foo
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/my.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/my.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/pom.xml?rev=818628&view=auto
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/pom.xml (added)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/pom.xml Thu Sep 24 21:14:27 2009
@@ -0,0 +1,55 @@
+<?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.plugins.maven-resources-plugin.its</groupId>
+ <artifactId>MRESOURCES-105</artifactId>
+ <name>Bug Test</name>
+ <version>0.0.1-SNAPSHOT</version>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <filters>
+ <filter>my.properties</filter>
+ </filters>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <delimiters>
+ <delimiter>$</delimiter>
+ <delimiter>@</delimiter>
+ <delimiter>#</delimiter>
+ <delimiter>${*}</delimiter>
+ </delimiters>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/src/main/resources/test.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/src/main/resources/test.properties?rev=818628&view=auto
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/src/main/resources/test.properties (added)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/src/main/resources/test.properties Thu Sep 24 21:14:27 2009
@@ -0,0 +1,5 @@
+#init test value (true|false) LINE IS essential for this bug report.#
+toto.value=$toto.value$
+test.value=#test.value#
+test.value=@test.value@
+test.value=${test.value}
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/src/main/resources/test.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-105/src/main/resources/test.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-resources-plugin/src/it/settings.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/settings.xml?rev=818628&r1=818627&r2=818628&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/it/settings.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/settings.xml Thu Sep 24 21:14:27 2009
@@ -38,9 +38,9 @@
</snapshots>
</repository>
<repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <id>plexus.snapshots</id>
+ <name>Plexus Snapshot Repository</name>
+ <url>http://oss.repository.sonatype.org/content/repositories/plexus-snapshots</url>
<releases>
<enabled>false</enabled>
</releases>