| 1 |
diff --git a/pom.xml b/pom.xml |
| 2 |
index a806a49..e806c77 100644 |
| 3 |
--- a/pom.xml |
| 4 |
+++ b/pom.xml |
| 5 |
@@ -147,14 +147,6 @@ |
| 6 |
</plugin> |
| 7 |
<!-- IDE descriptors --> |
| 8 |
<plugin> |
| 9 |
- <artifactId>maven-eclipse-plugin</artifactId> |
| 10 |
- <configuration> |
| 11 |
- <downloadSources>true</downloadSources> |
| 12 |
- <downloadJavadocs>false</downloadJavadocs> |
| 13 |
- <addVersionToProjectName>true</addVersionToProjectName> |
| 14 |
- </configuration> |
| 15 |
- </plugin> |
| 16 |
- <plugin> |
| 17 |
<artifactId>maven-idea-plugin</artifactId> |
| 18 |
<configuration> |
| 19 |
<downloadSources>true</downloadSources> |
| 20 |
@@ -245,29 +237,6 @@ |
| 21 |
<plugin> |
| 22 |
<artifactId>maven-dependency-plugin</artifactId> |
| 23 |
</plugin> |
| 24 |
- <plugin> |
| 25 |
- <groupId>com.google.code.maven-license-plugin</groupId> |
| 26 |
- <artifactId>maven-license-plugin</artifactId> |
| 27 |
- <version>1.3.1</version> |
| 28 |
- <configuration> |
| 29 |
- <header>${basedir}/src/etc/header.txt</header> |
| 30 |
- <failIfMissing>true</failIfMissing> |
| 31 |
- <excludes> |
| 32 |
- <exclude>LICENSE.txt</exclude> |
| 33 |
- <exclude>NOTICE.txt</exclude> |
| 34 |
- <exclude>src/test/data/**</exclude> |
| 35 |
- <exclude>src/test/integration/**</exclude> |
| 36 |
- <exclude>src/test/resources/**</exclude> |
| 37 |
- </excludes> |
| 38 |
- </configuration> |
| 39 |
- <executions> |
| 40 |
- <execution> |
| 41 |
- <goals> |
| 42 |
- <goal>check</goal> |
| 43 |
- </goals> |
| 44 |
- </execution> |
| 45 |
- </executions> |
| 46 |
- </plugin> |
| 47 |
</plugins> |
| 48 |
</build> |
| 49 |
|
| 50 |
@@ -380,7 +349,12 @@ |
| 51 |
<dependency> |
| 52 |
<groupId>org.apache.maven</groupId> |
| 53 |
<artifactId>maven-plugin-api</artifactId> |
| 54 |
- <version>2.0.9</version> |
| 55 |
+ <version>2.2.1</version> |
| 56 |
+ </dependency> |
| 57 |
+ <dependency> |
| 58 |
+ <groupId>org.apache.maven</groupId> |
| 59 |
+ <artifactId>maven-compat</artifactId> |
| 60 |
+ <version>2.2.1</version> |
| 61 |
</dependency> |
| 62 |
<dependency> |
| 63 |
<groupId>com.mycila.xmltool</groupId> |
| 64 |
@@ -403,38 +377,6 @@ |
| 65 |
<artifactId>plexus-utils</artifactId> |
| 66 |
<version>1.5.1</version> |
| 67 |
</dependency> |
| 68 |
- <!-- testing --> |
| 69 |
- <dependency> |
| 70 |
- <groupId>org.testng</groupId> |
| 71 |
- <artifactId>testng</artifactId> |
| 72 |
- <version>5.7</version> |
| 73 |
- <classifier>jdk15</classifier> |
| 74 |
- <scope>test</scope> |
| 75 |
- <exclusions> |
| 76 |
- <exclusion> |
| 77 |
- <groupId>junit</groupId> |
| 78 |
- <artifactId>junit</artifactId> |
| 79 |
- </exclusion> |
| 80 |
- </exclusions> |
| 81 |
- </dependency> |
| 82 |
- <dependency> |
| 83 |
- <groupId>org.apache.maven</groupId> |
| 84 |
- <artifactId>maven-embedder</artifactId> |
| 85 |
- <version>2.0.4</version> |
| 86 |
- <scope>test</scope> |
| 87 |
- </dependency> |
| 88 |
- <dependency> |
| 89 |
- <groupId>org.apache.maven.plugin-testing</groupId> |
| 90 |
- <artifactId>maven-plugin-testing-harness</artifactId> |
| 91 |
- <version>1.2</version> |
| 92 |
- <scope>test</scope> |
| 93 |
- <exclusions> |
| 94 |
- <exclusion> |
| 95 |
- <groupId>junit</groupId> |
| 96 |
- <artifactId>junit</artifactId> |
| 97 |
- </exclusion> |
| 98 |
- </exclusions> |
| 99 |
- </dependency> |
| 100 |
</dependencies> |
| 101 |
|
| 102 |
-</project> |
| 103 |
\ No newline at end of file |
| 104 |
+</project> |
| 105 |
-- |
| 106 |
1.7.7.6 |
| 107 |
|
| 108 |
--- a/src/main/java/com/google/code/mojo/license/util/FileUtils.java 2010-08-06 13:00:51.000000000 +1000 |
| 109 |
+++ b/src/main/java/com/google/code/mojo/license/util/FileUtils.java 2015-02-27 15:04:46.157580507 +1100 |
| 110 |
@@ -52,7 +52,8 @@ |
| 111 |
}
|
| 112 |
|
| 113 |
public static String read(URL location, Map<String, String> properties) throws IOException {
|
| 114 |
- Reader reader = new InterpolationFilterReader(new BufferedReader(new InputStreamReader(location.openStream())), properties);
|
| 115 |
+ Map<String,Object> propertiesMap = java.util.Collections.<String,Object>unmodifiableMap(properties);
|
| 116 |
+ Reader reader = new InterpolationFilterReader(new BufferedReader(new InputStreamReader(location.openStream())), propertiesMap);
|
| 117 |
try {
|
| 118 |
return IOUtil.toString(reader);
|
| 119 |
} finally {
|
Parent Directory
| 
Revision Log