You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2014/08/11 19:27:26 UTC
git commit: Enforce ASF copyright header via Checkstyle
Repository: jclouds
Updated Branches:
refs/heads/master d9650ccdc -> 4e166e3a2
Enforce ASF copyright header via Checkstyle
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/4e166e3a
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/4e166e3a
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/4e166e3a
Branch: refs/heads/master
Commit: 4e166e3a20580c127ea8716af865269a984b2a69
Parents: d9650cc
Author: Andrew Gaul <ga...@apache.org>
Authored: Mon May 12 13:30:56 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Mon Aug 11 10:26:43 2014 -0700
----------------------------------------------------------------------
project/pom.xml | 2 ++
resources/checkstyle.xml | 4 ++++
resources/copyright_header.txt | 16 ++++++++++++++++
resources/pom.xml | 3 ++-
4 files changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/4e166e3a/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 5df598a..ee4b23e 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -998,6 +998,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<configLocation>../resources/checkstyle.xml</configLocation>
+ <headerLocation>../resources/copyright_header.txt</headerLocation>
</configuration>
</plugin>
</plugins>
@@ -1025,6 +1026,7 @@
<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/4e166e3a/resources/checkstyle.xml
----------------------------------------------------------------------
diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml
index 42490cc..8e802d5 100644
--- a/resources/checkstyle.xml
+++ b/resources/checkstyle.xml
@@ -54,6 +54,10 @@
<property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND" />
</module>
</module>
+ <module name="Header">
+ <property name="headerFile" value="${checkstyle.header.file}"/>
+ <property name="fileExtensions" value="java"/>
+ </module>
<module name="RegexpMultiline">
<property name="format" value="@author"/>
<property name="message" value="Do not use Javadoc @author annotation"/>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/4e166e3a/resources/copyright_header.txt
----------------------------------------------------------------------
diff --git a/resources/copyright_header.txt b/resources/copyright_header.txt
new file mode 100644
index 0000000..2944f98
--- /dev/null
+++ b/resources/copyright_header.txt
@@ -0,0 +1,16 @@
+/*
+ * 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/4e166e3a/resources/pom.xml
----------------------------------------------------------------------
diff --git a/resources/pom.xml b/resources/pom.xml
index 9403626..159a822 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -36,7 +36,8 @@
<targetPath>resources</targetPath>
<directory>${project.basedir}</directory>
<includes>
- <include>checkstyle.xml</include>
+ <include>checkstyle.xml</include>
+ <include>copyright_header.txt</include>
</includes>
</resource>
</resources>