Skip to content

Commit f5b4f6b

Browse files
committed
fix license plugin configuration
1 parent e447cf7 commit f5b4f6b

File tree

4 files changed

+20
-92
lines changed

4 files changed

+20
-92
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ buildNumber.properties
1111
.project
1212
.classpath
1313
.idea/
14+
nb-configuration.xml
1415

1516
# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
1617
!/.mvn/wrapper/maven-wrapper.jar

de.ibapl.openhab.binding.fhz4j/pom.xml

-41
Original file line numberDiff line numberDiff line change
@@ -15,47 +15,6 @@
1515
<name>OH IbAPl :: FHZ4J Binding</name>
1616
<packaging>jar</packaging>
1717

18-
<properties>
19-
<license.licenseResolver>${project.baseUri}/../src/license</license.licenseResolver>
20-
</properties>
21-
22-
<build>
23-
<plugins>
24-
<plugin>
25-
<groupId>org.apache.maven.plugins</groupId>
26-
<artifactId>maven-surefire-plugin</artifactId>
27-
</plugin>
28-
<plugin>
29-
<groupId>org.apache.maven.plugins</groupId>
30-
<artifactId>maven-compiler-plugin</artifactId>
31-
</plugin>
32-
<plugin>
33-
<groupId>biz.aQute.bnd</groupId>
34-
<artifactId>bnd-maven-plugin</artifactId>
35-
</plugin>
36-
<plugin>
37-
<groupId>org.apache.maven.plugins</groupId>
38-
<artifactId>maven-resources-plugin</artifactId>
39-
</plugin>
40-
<plugin>
41-
<groupId>org.apache.maven.plugins</groupId>
42-
<artifactId>maven-jar-plugin</artifactId>
43-
</plugin>
44-
<plugin>
45-
<groupId>org.apache.maven.plugins</groupId>
46-
<artifactId>maven-source-plugin</artifactId>
47-
</plugin>
48-
<plugin>
49-
<groupId>org.apache.maven.plugins</groupId>
50-
<artifactId>maven-javadoc-plugin</artifactId>
51-
</plugin>
52-
<plugin>
53-
<groupId>org.apache.maven.plugins</groupId>
54-
<artifactId>maven-release-plugin</artifactId>
55-
</plugin>
56-
</plugins>
57-
</build>
58-
5918
<dependencies>
6019
<dependency>
6120
<groupId>de.ibapl.fhz4j</groupId>

de.ibapl.openhab.binding.openv4j/pom.xml

-41
Original file line numberDiff line numberDiff line change
@@ -15,47 +15,6 @@
1515
<name>OH IbAPl :: OpenV4J Binding</name>
1616
<packaging>jar</packaging>
1717

18-
<properties>
19-
<license.licenseResolver>${project.baseUri}/../src/license</license.licenseResolver>
20-
</properties>
21-
22-
<build>
23-
<plugins>
24-
<plugin>
25-
<groupId>org.apache.maven.plugins</groupId>
26-
<artifactId>maven-surefire-plugin</artifactId>
27-
</plugin>
28-
<plugin>
29-
<groupId>org.apache.maven.plugins</groupId>
30-
<artifactId>maven-compiler-plugin</artifactId>
31-
</plugin>
32-
<plugin>
33-
<groupId>biz.aQute.bnd</groupId>
34-
<artifactId>bnd-maven-plugin</artifactId>
35-
</plugin>
36-
<plugin>
37-
<groupId>org.apache.maven.plugins</groupId>
38-
<artifactId>maven-resources-plugin</artifactId>
39-
</plugin>
40-
<plugin>
41-
<groupId>org.apache.maven.plugins</groupId>
42-
<artifactId>maven-jar-plugin</artifactId>
43-
</plugin>
44-
<plugin>
45-
<groupId>org.apache.maven.plugins</groupId>
46-
<artifactId>maven-source-plugin</artifactId>
47-
</plugin>
48-
<plugin>
49-
<groupId>org.apache.maven.plugins</groupId>
50-
<artifactId>maven-javadoc-plugin</artifactId>
51-
</plugin>
52-
<plugin>
53-
<groupId>org.apache.maven.plugins</groupId>
54-
<artifactId>maven-release-plugin</artifactId>
55-
</plugin>
56-
</plugins>
57-
</build>
58-
5918
<dependencies>
6019
<dependency>
6120
<groupId>de.ibapl.openv4j</groupId>

pom.xml

+19-10
Original file line numberDiff line numberDiff line change
@@ -179,29 +179,38 @@
179179
<groupId>com.mycila</groupId>
180180
<artifactId>license-maven-plugin</artifactId>
181181
<version>4.3</version>
182+
<dependencies>
183+
<dependency>
184+
<groupId>com.mycila</groupId>
185+
<artifactId>license-maven-plugin-git</artifactId>
186+
<version>4.3</version>
187+
</dependency>
188+
</dependencies>
189+
<!-- do not pass config to the modules-->
182190
<inherited>false</inherited>
183191
<configuration>
184192
<failIfMissing>true</failIfMissing>
185-
<aggregate>true</aggregate>
186193
<strictCheck>true</strictCheck>
194+
<!-- execute here -->
195+
<aggregate>true</aggregate>
187196
<licenseSets>
188197
<licenseSet>
189198
<header>header-template-lgpl-java.txt</header>
190199
<includes>
191200
<include>**/*.java</include>
192201
</includes>
193-
<excludes>
194-
</excludes>
195202
</licenseSet>
196203
</licenseSets>
197204
</configuration>
198-
<dependencies>
199-
<dependency>
200-
<groupId>com.mycila</groupId>
201-
<artifactId>license-maven-plugin-git</artifactId>
202-
<version>4.3</version>
203-
</dependency>
204-
</dependencies>
205+
<executions>
206+
<execution>
207+
<id>check-license</id>
208+
<phase>validate</phase>
209+
<goals>
210+
<goal>check</goal>
211+
</goals>
212+
</execution>
213+
</executions>
205214
</plugin>
206215
<plugin>
207216
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)