Author: schulte Date: Thu Nov 24 08:31:52 2016 New Revision: 1771081 URL: http://svn.apache.org/viewvc?rev=1771081&view=rev Log: [MRESOURCES-231] Can't disable escaping
o Adding IT to validate that it is possible to disable escaping. Added: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/pom.xml (with props) maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/src/ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/src/main/ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/src/main/resources/ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/src/main/resources/test.txt (with props) maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/verify.groovy Added: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/pom.xml?rev=1771081&view=auto ============================================================================== --- maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/pom.xml (added) +++ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/pom.xml Thu Nov 24 08:31:52 2016 @@ -0,0 +1,48 @@ +<?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-231</artifactId> + <name>Bug Test</name> + <version>0.0.1-SNAPSHOT</version> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>@project.version@</version> + <configuration> + <escapeString>∅</escapeString> + </configuration> + </plugin> + </plugins> + </build> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> +</project> Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/pom.xml ------------------------------------------------------------------------------ svn:keywords = SchulteIT=%b%_%r%_%d%_%a Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/src/main/resources/test.txt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/src/main/resources/test.txt?rev=1771081&view=auto ============================================================================== --- maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/src/main/resources/test.txt (added) +++ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/src/main/resources/test.txt Thu Nov 24 08:31:52 2016 @@ -0,0 +1,20 @@ +<!-- +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. +--> + +something\with\default\escape\string\and\a\property\like\${project.build.sourceEncoding}\in\between Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/src/main/resources/test.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/src/main/resources/test.txt ------------------------------------------------------------------------------ svn:keywords = SchulteIT=%b%_%r%_%d%_%a Propchange: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/src/main/resources/test.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/verify.groovy?rev=1771081&view=auto ============================================================================== --- maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/verify.groovy (added) +++ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-231/verify.groovy Thu Nov 24 08:31:52 2016 @@ -0,0 +1,23 @@ +/* + * 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/test.txt').exists(); + +content = new File(basedir, 'target/classes/test.txt').text; +assert content.contains( 'something\\with\\default\\escape\\string\\and\\a\\property\\like\\UTF-8\\in\\between' ); +return true;