Author: dennisl Date: Thu Aug 15 20:10:13 2013 New Revision: 1514463 URL: http://svn.apache.org/r1514463 Log: [MRRESOURCES-70] SVN settings: eol-style and keywords
Set the correct eol-style Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/0.1/invalid-0.1.pom (contents, props changed) maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/pom/0.2/pom-0.2.pom (contents, props changed) maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/pom.xml (contents, props changed) maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/src/main/resources/DEPENDENCIES.vm (contents, props changed) maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/resources/DEPENDENCIES (props changed) maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/filter-local-override/src/main/resources/DEPENDENCIES (props changed) maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/pom.xml (contents, props changed) maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/maven/plugin/rresource/it/App.java (contents, props changed) maven/plugins/trunk/maven-remote-resources-plugin/src/it/settings.xml (contents, props changed) maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java (contents, props changed) Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/0.1/invalid-0.1.pom URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/0.1/invalid-0.1.pom?rev=1514463&r1=1514462&r2=1514463&view=diff ============================================================================== --- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/0.1/invalid-0.1.pom (original) +++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/0.1/invalid-0.1.pom Thu Aug 15 20:10:13 2013 @@ -1,34 +1,34 @@ -<!-- -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> - <modelVersion>4.0.0</modelVersion> - - <groupId>test</groupId> - <artifactId>invalid</artifactId> - <version>0.1</version> - - <dependencies> - <dependency> - <groupId>test</groupId> - <artifactId>unversioned</artifactId> - <!-- missing version --> - </dependency> - </dependencies> -</project> +<!-- +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> + <modelVersion>4.0.0</modelVersion> + + <groupId>test</groupId> + <artifactId>invalid</artifactId> + <version>0.1</version> + + <dependencies> + <dependency> + <groupId>test</groupId> + <artifactId>unversioned</artifactId> + <!-- missing version --> + </dependency> + </dependencies> +</project> Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/0.1/invalid-0.1.pom ------------------------------------------------------------------------------ svn:eol-style = native Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/pom/0.2/pom-0.2.pom URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/pom/0.2/pom-0.2.pom?rev=1514463&r1=1514462&r2=1514463&view=diff ============================================================================== --- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/pom/0.2/pom-0.2.pom (original) +++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/pom/0.2/pom-0.2.pom Thu Aug 15 20:10:13 2013 @@ -1,25 +1,25 @@ -<?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> - <modelVersion>4.0.0</modelVersion> - <groupId>test</groupId> - <artifactId>pom</artifactId> - <version>0.2</version> -</project> +<?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> + <modelVersion>4.0.0</modelVersion> + <groupId>test</groupId> + <artifactId>pom</artifactId> + <version>0.2</version> +</project> Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/pom/0.2/pom-0.2.pom ------------------------------------------------------------------------------ svn:eol-style = native Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/pom.xml?rev=1514463&r1=1514462&r2=1514463&view=diff ============================================================================== --- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/pom.xml (original) +++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/pom.xml Thu Aug 15 20:10:13 2013 @@ -1,61 +1,61 @@ -<?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.plugin.rresource.it</groupId> - <artifactId>bootstrap</artifactId> - <version>${project.version}</version> - </parent> - - <artifactId>resource-bundle-with-type-and-classifier</artifactId> - <packaging>jar</packaging> - - <name>Resource Bundle with a Type and Classifier</name> - - <build> - <plugins> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - - <!-- Use an established version, not the one currently under test. --> - <version>1.0</version> - - <executions> - <execution> - <goals> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <classifier>test</classifier> - </configuration> - </plugin> - </plugins> - </build> -</project> +<?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.plugin.rresource.it</groupId> + <artifactId>bootstrap</artifactId> + <version>${project.version}</version> + </parent> + + <artifactId>resource-bundle-with-type-and-classifier</artifactId> + <packaging>jar</packaging> + + <name>Resource Bundle with a Type and Classifier</name> + + <build> + <plugins> + <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + + <!-- Use an established version, not the one currently under test. --> + <version>1.0</version> + + <executions> + <execution> + <goals> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <classifier>test</classifier> + </configuration> + </plugin> + </plugins> + </build> +</project> Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/src/main/resources/DEPENDENCIES.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/src/main/resources/DEPENDENCIES.vm?rev=1514463&r1=1514462&r2=1514463&view=diff ============================================================================== --- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/src/main/resources/DEPENDENCIES.vm (original) +++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/src/main/resources/DEPENDENCIES.vm Thu Aug 15 20:10:13 2013 @@ -1,21 +1,21 @@ -## 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. -Built-In: #if ($projectName)$projectName#else${project.name}#end - -#foreach( $p in $projects ) -Dependency Id: $p.groupId:$p.artifactId:$p.version -#end +## 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. +Built-In: #if ($projectName)$projectName#else${project.name}#end + +#foreach( $p in $projects ) +Dependency Id: $p.groupId:$p.artifactId:$p.version +#end Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/src/main/resources/DEPENDENCIES.vm ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/src/main/resources/DEPENDENCIES ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/filter-local-override/src/main/resources/DEPENDENCIES ------------------------------------------------------------------------------ svn:eol-style = native Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/pom.xml?rev=1514463&r1=1514462&r2=1514463&view=diff ============================================================================== --- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/pom.xml (original) +++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/pom.xml Thu Aug 15 20:10:13 2013 @@ -1,54 +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> - - <parent> - <groupId>org.apache.maven.plugin.rresource.it</groupId> - <artifactId>it-parent</artifactId> - <version>${project.version}</version> - <relativePath>../it-parent/pom.xml</relativePath> - </parent> - - <artifactId>generate-from-bundle-with-type-and-classifier</artifactId> - - <build> - <plugins> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <id>remote-resources</id> - <goals> - <goal>process</goal> - </goals> - <configuration> - <resourceBundles> - <resourceBundle>org.apache.maven.plugin.rresource.it:resource-bundle-with-type-and-classifier:${project.version}:jar:test</resourceBundle> - </resourceBundles> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> +<?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.plugin.rresource.it</groupId> + <artifactId>it-parent</artifactId> + <version>${project.version}</version> + <relativePath>../it-parent/pom.xml</relativePath> + </parent> + + <artifactId>generate-from-bundle-with-type-and-classifier</artifactId> + + <build> + <plugins> + <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <execution> + <id>remote-resources</id> + <goals> + <goal>process</goal> + </goals> + <configuration> + <resourceBundles> + <resourceBundle>org.apache.maven.plugin.rresource.it:resource-bundle-with-type-and-classifier:${project.version}:jar:test</resourceBundle> + </resourceBundles> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/maven/plugin/rresource/it/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/maven/plugin/rresource/it/App.java?rev=1514463&r1=1514462&r2=1514463&view=diff ============================================================================== --- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/maven/plugin/rresource/it/App.java (original) +++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/maven/plugin/rresource/it/App.java Thu Aug 15 20:10:13 2013 @@ -1,32 +1,32 @@ -package org.apache.maven.plugin.rresource.it; - -/* - * 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. - */ - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} +package org.apache.maven.plugin.rresource.it; + +/* + * 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. + */ + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/maven/plugin/rresource/it/App.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/settings.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/settings.xml?rev=1514463&r1=1514462&r2=1514463&view=diff ============================================================================== --- maven/plugins/trunk/maven-remote-resources-plugin/src/it/settings.xml (original) +++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/settings.xml Thu Aug 15 20:10:13 2013 @@ -1,55 +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. ---> - -<settings> - <profiles> - <profile> - <id>it-repo</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <repositories> - <repository> - <id>local.central</id> - <url>@localRepositoryUrl@</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>local.central</id> - <url>@localRepositoryUrl@</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - </profile> - </profiles> -</settings> +<?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. +--> + +<settings> + <profiles> + <profile> + <id>it-repo</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>local.central</id> + <url>@localRepositoryUrl@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>local.central</id> + <url>@localRepositoryUrl@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> + </profiles> +</settings> Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/settings.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java?rev=1514463&r1=1514462&r2=1514463&view=diff ============================================================================== --- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java (original) +++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java Thu Aug 15 20:10:13 2013 @@ -1,51 +1,51 @@ -package org.apache.maven.plugin.resources.remote.it; - -/* - * 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. - */ - -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.plugin.resources.remote.it.support.TestUtils; -import org.codehaus.plexus.util.FileUtils; - -import java.io.File; -import java.io.IOException; -import java.net.URISyntaxException; - -public class IT_GenerateFromBundleWithTypeAndClassifier - extends AbstractIT -{ - - public void test() - throws IOException, URISyntaxException, VerificationException - { - File dir = TestUtils.getTestDir( "generate-from-bundle-with-type-and-classifier" ); - Verifier verifier = new Verifier( dir.getAbsolutePath() ); - - verifier.executeGoal( "generate-resources" ); - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - - File output = new File( dir, "target/maven-shared-archive-resources/DEPENDENCIES" ); - String content = FileUtils.fileRead( output ); - - assertTrue( content.indexOf( "Built-In:" ) > -1 ); - } - -} +package org.apache.maven.plugin.resources.remote.it; + +/* + * 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. + */ + +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.plugin.resources.remote.it.support.TestUtils; +import org.codehaus.plexus.util.FileUtils; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; + +public class IT_GenerateFromBundleWithTypeAndClassifier + extends AbstractIT +{ + + public void test() + throws IOException, URISyntaxException, VerificationException + { + File dir = TestUtils.getTestDir( "generate-from-bundle-with-type-and-classifier" ); + Verifier verifier = new Verifier( dir.getAbsolutePath() ); + + verifier.executeGoal( "generate-resources" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + File output = new File( dir, "target/maven-shared-archive-resources/DEPENDENCIES" ); + String content = FileUtils.fileRead( output ); + + assertTrue( content.indexOf( "Built-In:" ) > -1 ); + } + +} Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java ------------------------------------------------------------------------------ svn:eol-style = native