From 154ea0d205789c97453deb2a3f682716947b0490 Mon Sep 17 00:00:00 2001
From: Marian Pohling <mpohling@cit-ec.uni-bielefeld.de>
Date: Tue, 10 Jan 2017 23:21:37 +0100
Subject: [PATCH] manual dep merge

---
 example/pom.xml | 11 ++---------
 lib/pom.xml     | 11 ++---------
 pom.xml         | 16 +++++++++++++---
 remote/pom.xml  | 11 ++---------
 visual/pom.xml  | 11 ++---------
 5 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/example/pom.xml b/example/pom.xml
index 589f4e07..d038005c 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -36,9 +36,9 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <version>1.8</version>
+                <version>${dependency.org.codehaus.mojo.license-maven-plugin.version}</version>
                 <configuration>
-                    <verbose>false</verbose>
+                    <licenseName>lgpl_v3</licenseName>
                 </configuration>
                 <executions>
                     <execution>
@@ -47,13 +47,6 @@
                             <goal>update-file-header</goal>
                         </goals>
                         <phase>process-sources</phase>
-                        <configuration>
-                            <licenseName>lgpl_v3</licenseName>
-                            <roots>
-                                <root>src/main/java</root>
-                                <root>src/test</root>
-                            </roots>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/lib/pom.xml b/lib/pom.xml
index 1fbfdcf9..ab6b0c91 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -36,9 +36,9 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <version>1.8</version>
+                <version>${dependency.org.codehaus.mojo.license-maven-plugin.version}</version>
                 <configuration>
-                    <verbose>false</verbose>
+                    <licenseName>lgpl_v3</licenseName>
                 </configuration>
                 <executions>
                     <execution>
@@ -47,13 +47,6 @@
                             <goal>update-file-header</goal>
                         </goals>
                         <phase>process-sources</phase>
-                        <configuration>
-                            <licenseName>lgpl_v3</licenseName>
-                            <roots>
-                                <root>src/main/java</root>
-                                <root>src/test</root>
-                            </roots>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/pom.xml b/pom.xml
index 7df6a1f3..3e0bac60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,17 +71,26 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <version>1.9</version>
+                <version>${dependency.org.codehaus.mojo.license-maven-plugin.version}</version>
                 <configuration>
                     <verbose>false</verbose>
+                    <failOnMissingHeader>true</failOnMissingHeader>
+                    <failOnNotUptodateHeader>true</failOnNotUptodateHeader>
+                    <canUpdateCopyright>true</canUpdateCopyright>
+                    <canUpdateDescription>true</canUpdateDescription>
+                    <canUpdateLicense>true</canUpdateLicense>
+                    <roots>
+                        <root>src/main/java</root>
+                        <root>src/test</root>
+                    </roots>
                 </configuration>
                 <executions>
-<!--                    <execution>  //disabled because of broken license url
+                    <execution> 
                         <id>download-licenses</id>
                         <goals>
                             <goal>download-licenses</goal>
                         </goals>
-                    </execution>-->
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -180,6 +189,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <dependency.jul.version>[1.1,1.2-SNAPSHOT)</dependency.jul.version>
         <dependency.bco.registry.version>[1.1,1.2-SNAPSHOT)</dependency.bco.registry.version>
+        <dependency.org.codehaus.mojo.license-maven-plugin.version>1.10</dependency.org.codehaus.mojo.license-maven-plugin.version>
     </properties>
 
     <dependencies>
diff --git a/remote/pom.xml b/remote/pom.xml
index dc73e3d7..a62f0ea6 100644
--- a/remote/pom.xml
+++ b/remote/pom.xml
@@ -60,9 +60,9 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <version>1.8</version>
+                <version>${dependency.org.codehaus.mojo.license-maven-plugin.version}</version>
                 <configuration>
-                    <verbose>false</verbose>
+                    <licenseName>lgpl_v3</licenseName>
                 </configuration>
                 <executions>
                     <execution>
@@ -71,13 +71,6 @@
                             <goal>update-file-header</goal>
                         </goals>
                         <phase>process-sources</phase>
-                        <configuration>
-                            <licenseName>lgpl_v3</licenseName>
-                            <roots>
-                                <root>src/main/java</root>
-                                <root>src/test</root>
-                            </roots>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/visual/pom.xml b/visual/pom.xml
index 07051cd5..ffc9aac2 100644
--- a/visual/pom.xml
+++ b/visual/pom.xml
@@ -103,9 +103,9 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <version>1.8</version>
+                <version>${dependency.org.codehaus.mojo.license-maven-plugin.version}</version>
                 <configuration>
-                    <verbose>false</verbose>
+                    <licenseName>gpl_v3</licenseName>
                 </configuration>
                 <executions>
                     <execution>
@@ -114,13 +114,6 @@
                             <goal>update-file-header</goal>
                         </goals>
                         <phase>process-sources</phase>
-                        <configuration>
-                            <licenseName>gpl_v3</licenseName>
-                            <roots>
-                                <root>src/main/java</root>
-                                <root>src/test</root>
-                            </roots>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>