Issue #249: Clarify license declaration in Maven POM xml

h2/src/docsrc/html/changelog.html

@@ -21,6 +21,8 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>Issue #249: Clarify license declaration in Maven POM xml
+</li>
 <li>Fix NPE in querying spatial data through a sub-select.
 </li>
 <li>Fix bug where a lock on the SYS table was not released when closing a session that contained a temp

h2/src/installer/pom-mvstore-template.xml

@@ -9,7 +9,7 @@
     <description>H2 MVStore</description>
     <licenses>
         <license>
-            <name>MPL 2.0, and EPL 1.0</name>
+            <name>MPL 2.0 or EPL 1.0</name>
             <url>http://h2database.com/html/license.html</url>
             <distribution>repo</distribution>
         </license>

h2/src/installer/pom-template.xml

@@ -9,7 +9,7 @@
     <description>H2 Database Engine</description>
     <licenses>
         <license>
-            <name>MPL 2.0, and EPL 1.0</name>
+            <name>MPL 2.0 or EPL 1.0</name>
             <url>http://h2database.com/html/license.html</url>
             <distribution>repo</distribution>
         </license>