Merge remote-tracking branch 'upstream/master'

arthepsy · Nov 29, 2013 · 162a746 · 162a746
2 parents 51c3ee4 + c44d654
commit 162a746
Show file tree

Hide file tree

Showing 52 changed files with 128 additions and 111 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,9 +16,6 @@
   <description>Enables analysis of Scala projects into Sonar.</description>
   <url>http://docs.codehaus.org/display/SONAR/Scala+Plugin</url>
   <inceptionYear>2011</inceptionYear>
-  <organization>
-    <name>Felix Müller</name>
-  </organization>
 
   <licenses>
     <license>
@@ -33,6 +30,7 @@
       <id>fmueller</id>
       <name>Felix Müller</name>
       <email>felix.mueller.berlin@googlemail.com</email>
+      <timezone>+1</timezone>
     </developer>
   </developers>
 
@@ -67,8 +65,6 @@
     <sonar.pluginName>Scala</sonar.pluginName>
     <sonar.pluginClass>org.sonar.plugins.scala.ScalaPlugin</sonar.pluginClass>
 
-    <license.mailto>felix.mueller.berlin@googlemail.com</license.mailto>
-
     <scala.version>2.9.1</scala.version>
   </properties>
 
@@ -177,19 +173,40 @@
       <plugin>
         <groupId>com.mycila.maven-license-plugin</groupId>
         <artifactId>maven-license-plugin</artifactId>
-        <version>1.9.0</version>
         <configuration>
+          <encoding>${project.build.sourceEncoding}</encoding>
+          <properties>
+            <owner>All contributors</owner>
+            <year>2011 - 2013</year>
+          </properties>
           <includes>
             <include>src/main/java/**</include>
-            <include>src/test/java/**</include>
             <include>src/main/scala/**</include>
+            <include>src/test/java/**</include>
             <include>src/test/scala/**</include>
           </includes>
           <mapping>
             <java>SLASHSTAR_STYLE</java>
             <scala>SLASHSTAR_STYLE</scala>
           </mapping>
+          <strictCheck>true</strictCheck>
         </configuration>
+        <executions>
+          <execution>
+            <id>add-license-headers</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>format</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>enforce-license-headers</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>

diff --git a/src/main/java/org/sonar/plugins/scala/ScalaDefaultProfile.java b/src/main/java/org/sonar/plugins/scala/ScalaDefaultProfile.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scala/ScalaPlugin.java b/src/main/java/org/sonar/plugins/scala/ScalaPlugin.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -70,4 +70,4 @@ private static String getPathByResource(String name) {
     String path = ScalaPlugin.class.getClassLoader().getResource(name).getPath();
     return path.substring("file:".length(), path.lastIndexOf('!'));
   }
-}
+}
diff --git a/src/main/java/org/sonar/plugins/scala/colorization/ScalaColorizerFormat.java b/src/main/java/org/sonar/plugins/scala/colorization/ScalaColorizerFormat.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scala/colorization/ScalaKeywords.java b/src/main/java/org/sonar/plugins/scala/colorization/ScalaKeywords.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scala/cpd/ScalaCpdMapping.java b/src/main/java/org/sonar/plugins/scala/cpd/ScalaCpdMapping.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scala/cpd/ScalaTokenizer.java b/src/main/java/org/sonar/plugins/scala/cpd/ScalaTokenizer.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scala/language/Comment.java b/src/main/java/org/sonar/plugins/scala/language/Comment.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scala/language/CommentType.java b/src/main/java/org/sonar/plugins/scala/language/CommentType.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scala/language/Scala.java b/src/main/java/org/sonar/plugins/scala/language/Scala.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scala/language/ScalaFile.java b/src/main/java/org/sonar/plugins/scala/language/ScalaFile.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scala/language/ScalaPackage.java b/src/main/java/org/sonar/plugins/scala/language/ScalaPackage.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scala/metrics/CommentsAnalyzer.java b/src/main/java/org/sonar/plugins/scala/metrics/CommentsAnalyzer.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scala/metrics/LinesAnalyzer.java b/src/main/java/org/sonar/plugins/scala/metrics/LinesAnalyzer.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scala/sensor/AbstractScalaSensor.java b/src/main/java/org/sonar/plugins/scala/sensor/AbstractScalaSensor.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scala/sensor/BaseMetricsSensor.java b/src/main/java/org/sonar/plugins/scala/sensor/BaseMetricsSensor.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scala/sensor/ScalaSourceImporterSensor.java b/src/main/java/org/sonar/plugins/scala/sensor/ScalaSourceImporterSensor.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/java/org/sonar/plugins/scala/util/StringUtils.java b/src/main/java/org/sonar/plugins/scala/util/StringUtils.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/scala/org/sonar/plugins/scala/compiler/Compiler.scala b/src/main/scala/org/sonar/plugins/scala/compiler/Compiler.scala
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/scala/org/sonar/plugins/scala/compiler/Lexer.scala b/src/main/scala/org/sonar/plugins/scala/compiler/Lexer.scala
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/scala/org/sonar/plugins/scala/compiler/Parser.scala b/src/main/scala/org/sonar/plugins/scala/compiler/Parser.scala
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/scala/org/sonar/plugins/scala/compiler/Token.scala b/src/main/scala/org/sonar/plugins/scala/compiler/Token.scala
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/scala/org/sonar/plugins/scala/language/CodeDetector.scala b/src/main/scala/org/sonar/plugins/scala/language/CodeDetector.scala
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/scala/org/sonar/plugins/scala/language/PackageResolver.scala b/src/main/scala/org/sonar/plugins/scala/language/PackageResolver.scala
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/scala/org/sonar/plugins/scala/metrics/ComplexityCalculator.scala b/src/main/scala/org/sonar/plugins/scala/metrics/ComplexityCalculator.scala
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/scala/org/sonar/plugins/scala/metrics/FunctionCounter.scala b/src/main/scala/org/sonar/plugins/scala/metrics/FunctionCounter.scala
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/scala/org/sonar/plugins/scala/metrics/PublicApiCounter.scala b/src/main/scala/org/sonar/plugins/scala/metrics/PublicApiCounter.scala
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/scala/org/sonar/plugins/scala/metrics/StatementCounter.scala b/src/main/scala/org/sonar/plugins/scala/metrics/StatementCounter.scala
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/scala/org/sonar/plugins/scala/metrics/TypeCounter.scala b/src/main/scala/org/sonar/plugins/scala/metrics/TypeCounter.scala
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/scala/org/sonar/plugins/scala/metrics/package.scala b/src/main/scala/org/sonar/plugins/scala/metrics/package.scala
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/main/scala/org/sonar/plugins/scala/util/MetricDistribution.scala b/src/main/scala/org/sonar/plugins/scala/util/MetricDistribution.scala
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/src/test/java/org/sonar/plugins/scala/ScalaPluginTest.java b/src/test/java/org/sonar/plugins/scala/ScalaPluginTest.java
@@ -1,7 +1,7 @@
 /*
  * Sonar Scala Plugin
- * Copyright (C) 2011 Felix Müller
- * felix.mueller.berlin@googlemail.com
+ * Copyright (C) 2011 - 2013 All contributors
+ * dev@sonar.codehaus.org
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -47,4 +47,4 @@ public void shouldHaveSurefirePlugin() {
   public void shouldGetPathToDependencies() {
     assertThat(ScalaPlugin.getPathToScalaLibrary(), containsString("scala-library"));
   }
-}
+}