| 1 |
commit: 1198ae64e71b5d8dab832c78ab16a103512eaf58 |
| 2 |
Author: zongyu <zzy2529420793 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Aug 2 09:13:54 2020 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 3 02:28:40 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=1198ae64 |
| 7 |
|
| 8 |
reformat the license/name string |
| 9 |
|
| 10 |
Signed-off-by: zongyu <zzy2529420793 <AT> gmail.com> |
| 11 |
|
| 12 |
src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java | 4 +++- |
| 13 |
src/main/resources/licenseMap.properties | 5 +++-- |
| 14 |
2 files changed, 6 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java |
| 17 |
index 8c64e37..d487024 100644 |
| 18 |
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java |
| 19 |
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java |
| 20 |
@@ -627,7 +627,9 @@ public class MavenParser { |
| 21 |
case "name": |
| 22 |
mavenProject.addLicense( |
| 23 |
mavenLicenses.getEquivalentLicense( |
| 24 |
- reader.getElementText())); |
| 25 |
+ reader.getElementText(). |
| 26 |
+ trim(). |
| 27 |
+ replaceAll("[\n ]+", " "))); |
| 28 |
break; |
| 29 |
default: |
| 30 |
consumeElement(reader); |
| 31 |
|
| 32 |
diff --git a/src/main/resources/licenseMap.properties b/src/main/resources/licenseMap.properties |
| 33 |
index 5cd2e5d..a2fdbc6 100644 |
| 34 |
--- a/src/main/resources/licenseMap.properties |
| 35 |
+++ b/src/main/resources/licenseMap.properties |
| 36 |
@@ -59,7 +59,7 @@ cddl\ +\ gplv2\ with\ classpath\ exception=CDDL:GPL-2-with-classpath-exception |
| 37 |
cddl\ license=CDDL |
| 38 |
cddl\ v1.1\ /\ gpl\ v2\ dual\ license=CDDL-1.1:GPL-2 |
| 39 |
common\ development\ and\ distribution\ license=CDDL |
| 40 |
-common\ development\ and\ distribution\ license\ (cddl)\ plus\ gpl=CDDL:GPL |
| 41 |
+common\ development\ and\ distribution\ license\ (cddl)\ plus\ gpl=CDDL:GPL-1 |
| 42 |
common\ development\ and\ distribution\ license\ (cddl)\ v1.0=CDDL |
| 43 |
common\ development\ and\ distribution\ license\ (cddl)\ version\ 1.0=CDDL |
| 44 |
common\ public\ license\ -\ v\ 1.0=CPL-1.0 |
| 45 |
@@ -113,7 +113,8 @@ hsqldb\ license=BSD |
| 46 |
indiana\ university\ extreme!\ lab\ software\ license=Indiana-University-Extreme-Lab |
| 47 |
indiana\ university\ extreme!\ lab\ software\ license\ 1.1.1=Indiana-University-Extreme-Lab |
| 48 |
indiana\ university\ extreme!\ lab\ software\ license,\ vesion\ 1.1.1=Indiana-University-Extreme-Lab |
| 49 |
-jquery\ license=MIT:CC0 |
| 50 |
+jquery\ license=MIT:CC0-1.0 |
| 51 |
+jsr-000107\ jcache\ 2.9\ public\ review\ -\ updated\ specification\ license=Apache-2.0 |
| 52 |
lgpl=LGPL-3 |
| 53 |
lgpl\ 2.1=LGPL-2.1 |
| 54 |
lgpl-2.1=LGPL-2.1 |
Archives