Add missing license to whitelist

seedstack · Apr 15, 2016 · ecdae5e · ecdae5e
1 parent 899d703
commit ecdae5e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -40,6 +40,7 @@
                         <includedLicenses>
                             <includedLicense>Apache 2</includedLicense>
                             <includedLicense>BSD</includedLicense>
+                            <includedLicense>CDDL</includedLicense>
                             <includedLicense>LGPL 3.0</includedLicense>
                             <includedLicense>MIT License</includedLicense>
                             <includedLicense>MPL 2.0</includedLicense>
@@ -54,6 +55,7 @@
                             <licenseMerge>Apache 2|The Apache Software License, Version 2.0</licenseMerge>
                             <licenseMerge>Apache 2|Apache License 2.0</licenseMerge>
                             <licenseMerge>BSD|The New BSD License</licenseMerge>
+                            <licenseMerge>CDDL|CDDL + GPLv2 with classpath exception</licenseMerge>
                             <licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
                             <licenseMerge>IGNORED_LICENSE|MPL 1.1</licenseMerge>
                             <licenseMerge>IGNORED_LICENSE|LGPL 2.1</licenseMerge>