You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/05/10 11:24:13 UTC
git commit: fixed errors reported by rat
Repository: maven-scm
Updated Branches:
refs/heads/master cd8a5daf5 -> 235a8bef3
fixed errors reported by rat
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/235a8bef
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/235a8bef
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/235a8bef
Branch: refs/heads/master
Commit: 235a8bef30c1530055dd47352e75a0588ba770b7
Parents: cd8a5da
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sat May 10 11:24:04 2014 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sat May 10 11:24:04 2014 +0200
----------------------------------------------------------------------
maven-scm-plugin/pom.xml | 53 ++++++++++++--------
.../pom.xml | 23 ++++++++-
.../src/test/resources/settings-security.xml | 20 ++++++++
3 files changed, 73 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/235a8bef/maven-scm-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-scm-plugin/pom.xml b/maven-scm-plugin/pom.xml
index fdd2762..5506204 100644
--- a/maven-scm-plugin/pom.xml
+++ b/maven-scm-plugin/pom.xml
@@ -128,28 +128,37 @@
</dependencies>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
- <configuration>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <cloneClean>true</cloneClean>
- <debug>true</debug>
- <preBuildHookScript>prepare</preBuildHookScript>
- <postBuildHookScript>verify</postBuildHookScript>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>install</goal>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugins>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <configuration>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <cloneClean>true</cloneClean>
+ <debug>true</debug>
+ <preBuildHookScript>prepare</preBuildHookScript>
+ <postBuildHookScript>verify</postBuildHookScript>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>install</goal>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/it/scm-741*/dotSvnDir/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/235a8bef/maven-scm-plugin/src/it/scm-741-validate-scm-url-matches-working-copy/pom.xml
----------------------------------------------------------------------
diff --git a/maven-scm-plugin/src/it/scm-741-validate-scm-url-matches-working-copy/pom.xml b/maven-scm-plugin/src/it/scm-741-validate-scm-url-matches-working-copy/pom.xml
index 96d1b97..794d5ff 100644
--- a/maven-scm-plugin/src/it/scm-741-validate-scm-url-matches-working-copy/pom.xml
+++ b/maven-scm-plugin/src/it/scm-741-validate-scm-url-matches-working-copy/pom.xml
@@ -1,5 +1,26 @@
+<?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">
+ 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>
<groupId>org.apache.maven.plugins.it</groupId>
<artifactId>simple</artifactId>
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/235a8bef/maven-scm-plugin/src/test/resources/settings-security.xml
----------------------------------------------------------------------
diff --git a/maven-scm-plugin/src/test/resources/settings-security.xml b/maven-scm-plugin/src/test/resources/settings-security.xml
index f61a969..4ea0389 100644
--- a/maven-scm-plugin/src/test/resources/settings-security.xml
+++ b/maven-scm-plugin/src/test/resources/settings-security.xml
@@ -1,4 +1,24 @@
<?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.
+-->
+
<settingsSecurity>
<master>{1wQaa6S/o8MH7FnaTNL53XmhT5O0SEGXQi3gC49o6OY=}</master>
</settingsSecurity>