Author: krosenvold Date: Wed Oct 29 05:37:37 2014 New Revision: 1635050 URL: http://svn.apache.org/r1635050 Log: [MASSEMBLY-722] Added test project, supplied by Tony Jewell. Applied with minor modifications
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml (with props) maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/assemblies/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/assemblies/prod-assemble.xml (with props) maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filtered-config/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filtered-config/my.properties (with props) maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/prod.properties (with props) maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/test.properties (with props) Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties?rev=1635050&view=auto ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties Wed Oct 29 05:37:37 2014 @@ -0,0 +1,18 @@ +# 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. + +invoker.goals=package Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml?rev=1635050&view=auto ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml Wed Oct 29 05:37:37 2014 @@ -0,0 +1,58 @@ +<!-- +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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.maven.plugin.assembly.test</groupId> + <artifactId>it-project-parent</artifactId> + <version>1</version> + </parent> + <groupId>com.cregganna.samples</groupId> + <artifactId>maven-assembly-plugin-2.5-crash</artifactId> + <version>0.0.1-SNAPSHOT</version> + + <build> + + <filters> + <filter>src/main/filters/test.properties</filter> + </filters> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>prod-assemble</id> + <phase>package</phase> + <goals><goal>single</goal></goals> + <configuration> + <descriptors> + <descriptors>src/main/assemblies/prod-assemble.xml</descriptors> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml ------------------------------------------------------------------------------ svn:executable = * Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/assemblies/prod-assemble.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/assemblies/prod-assemble.xml?rev=1635050&view=auto ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/assemblies/prod-assemble.xml (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/assemblies/prod-assemble.xml Wed Oct 29 05:37:37 2014 @@ -0,0 +1,33 @@ +<!-- +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. +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>prod</id> + <formats> + <format>tar</format> + </formats> + <fileSets> + <fileSet> + <directory>src/main/filtered-config</directory> + <outputDirectory>/config</outputDirectory> + <filtered>true</filtered> + </fileSet> + </fileSets> +</assembly> Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/assemblies/prod-assemble.xml ------------------------------------------------------------------------------ svn:executable = * Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filtered-config/my.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filtered-config/my.properties?rev=1635050&view=auto ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filtered-config/my.properties (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filtered-config/my.properties Wed Oct 29 05:37:37 2014 @@ -0,0 +1,24 @@ +# 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. + +# In maven-assembly-plugin:2.4.1 +# On Filtering during assembly the environment is "test-environment" showing that the +# project.build.filters have been applied. +# With the patch the environment then becomes the desired "prod-environment" +environment=${filtered.environment} +value.test=${filtered.test} +value.prod=${filtered.prod} \ No newline at end of file Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filtered-config/my.properties ------------------------------------------------------------------------------ svn:executable = * Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/prod.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/prod.properties?rev=1635050&view=auto ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/prod.properties (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/prod.properties Wed Oct 29 05:37:37 2014 @@ -0,0 +1,19 @@ +# 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. + +filtered.environment=prod-environment +filtered.prod=prod.value Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/prod.properties ------------------------------------------------------------------------------ svn:executable = * Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/test.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/test.properties?rev=1635050&view=auto ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/test.properties (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/test.properties Wed Oct 29 05:37:37 2014 @@ -0,0 +1,19 @@ +# 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. + +filtered.environment=test-environment +filtered.test=test.value Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/filters/test.properties ------------------------------------------------------------------------------ svn:executable = *