Skip to content

Commit ecbb076

Browse files
committed
POM: use new bsd_2 license, not custom resolver
The license-maven-plugin 1.6 adds BSD-style license templates: https://jira.codehaus.org/browse/MLICENSE-80 With this fabulous new addition, we can eliminate our custom license resolver in favor of the stock bsd_2 license.
1 parent a4d6d45 commit ecbb076

File tree

5 files changed

+2
-69
lines changed

5 files changed

+2
-69
lines changed

license/README.txt

-11
This file was deleted.

license/licenses.properties

-1
This file was deleted.

license/scijava/header.txt

-24
This file was deleted.

license/scijava/license.txt

-30
This file was deleted.

pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>1.119</version>
8+
<version>1.123</version>
99
</parent>
1010

1111
<artifactId>scijava-common</artifactId>
@@ -60,8 +60,7 @@
6060
<groupId>org.codehaus.mojo</groupId>
6161
<artifactId>license-maven-plugin</artifactId>
6262
<configuration>
63-
<licenseName>scijava</licenseName>
64-
<licenseResolver>file://${basedir}/license</licenseResolver>
63+
<licenseName>bsd_2</licenseName>
6564
<organizationName>Board of Regents of the University of
6665
Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
6766
Institute of Molecular Cell Biology and Genetics.</organizationName>

0 commit comments

Comments
 (0)