You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by cc...@apache.org on 2014/08/19 03:15:55 UTC
git commit: Move checkstyle copyright header into checkstyle.xml
Repository: jclouds
Updated Branches:
refs/heads/master e5283df99 -> 192785dba
Move checkstyle copyright header into checkstyle.xml
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/192785db
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/192785db
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/192785db
Branch: refs/heads/master
Commit: 192785dbaedc16eeec87ce7783fb8fbb136e7055
Parents: e5283df
Author: Chris Custine <cc...@apache.org>
Authored: Mon Aug 18 15:24:11 2014 -0600
Committer: Chris Custine <cc...@apache.org>
Committed: Mon Aug 18 18:55:52 2014 -0600
----------------------------------------------------------------------
project/pom.xml | 2 --
resources/checkstyle.xml | 17 ++++++++++++++++-
resources/copyright_header.txt | 16 ----------------
resources/pom.xml | 1 -
4 files changed, 16 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/192785db/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index ee4b23e..5df598a 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -998,7 +998,6 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<configLocation>../resources/checkstyle.xml</configLocation>
- <headerLocation>../resources/copyright_header.txt</headerLocation>
</configuration>
</plugin>
</plugins>
@@ -1026,7 +1025,6 @@
<configuration>
<!-- jclouds-resources has the checkstyle config in the classpath -->
<configLocation>resources/checkstyle.xml</configLocation>
- <headerLocation>resources/copyright_header.txt</headerLocation>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/192785db/resources/checkstyle.xml
----------------------------------------------------------------------
diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml
index 8e802d5..9cb3041 100644
--- a/resources/checkstyle.xml
+++ b/resources/checkstyle.xml
@@ -55,7 +55,22 @@
</module>
</module>
<module name="Header">
- <property name="headerFile" value="${checkstyle.header.file}"/>
+ <property name="header" value="/*\n
+* Licensed to the Apache Software Foundation (ASF) under one or more\n
+* contributor license agreements. See the NOTICE file distributed with\n
+* this work for additional information regarding copyright ownership.\n
+* The ASF licenses this file to You under the Apache License, Version 2.0\n
+* (the "License"); you may not use this file except in compliance with\n
+* the License. You may obtain a copy of the License at\n
+*\n
+* http://www.apache.org/licenses/LICENSE-2.0\n
+*\n
+* Unless required by applicable law or agreed to in writing, software\n
+* distributed under the License is distributed on an "AS IS" BASIS,\n
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n
+* See the License for the specific language governing permissions and\n
+* limitations under the License.\n
+*/\n"/>
<property name="fileExtensions" value="java"/>
</module>
<module name="RegexpMultiline">
http://git-wip-us.apache.org/repos/asf/jclouds/blob/192785db/resources/copyright_header.txt
----------------------------------------------------------------------
diff --git a/resources/copyright_header.txt b/resources/copyright_header.txt
deleted file mode 100644
index 2944f98..0000000
--- a/resources/copyright_header.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * 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.
- */
http://git-wip-us.apache.org/repos/asf/jclouds/blob/192785db/resources/pom.xml
----------------------------------------------------------------------
diff --git a/resources/pom.xml b/resources/pom.xml
index 159a822..02eac53 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -37,7 +37,6 @@
<directory>${project.basedir}</directory>
<includes>
<include>checkstyle.xml</include>
- <include>copyright_header.txt</include>
</includes>
</resource>
</resources>