Skip to content
This repository has been archived by the owner on Oct 4, 2021. It is now read-only.

Commit

Permalink
manual dep merge
Browse files Browse the repository at this point in the history
  • Loading branch information
DivineThreepwood committed Jan 11, 2017
1 parent 612ba0c commit 154ea0d
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 39 deletions.
11 changes: 2 additions & 9 deletions example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
11 changes: 2 additions & 9 deletions lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
16 changes: 13 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
11 changes: 2 additions & 9 deletions remote/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
11 changes: 2 additions & 9 deletions visual/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 154ea0d

Please sign in to comment.