diff options
| author |   zongyu <zzy2529420793@gmail.com> | 2020-08-02 17:13:54 +0800 |
|---|---|---|
| committer | zongyu <zzy2529420793@gmail.com> | 2020-08-03 10:28:40 +0800 |
| commit | 1198ae64e71b5d8dab832c78ab16a103512eaf58 (patch) | |
| tree | 63ae469cfe58cd7666bdf9b0a6c3c751356e5477 | |
| parent | create proper GENTOO_CLASSPATH for java-virtuals/*. (diff) | |
| download | java-ebuilder-1198ae64e71b5d8dab832c78ab16a103512eaf58.tar.gz java-ebuilder-1198ae64e71b5d8dab832c78ab16a103512eaf58.tar.bz2 java-ebuilder-1198ae64e71b5d8dab832c78ab16a103512eaf58.zip | |
reformat the license/name string
Signed-off-by: zongyu <zzy2529420793@gmail.com>
| -rw-r--r-- | src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java | 4 | ||||
| -rw-r--r-- | src/main/resources/licenseMap.properties | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java index 8c64e37..d487024 100644 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java @@ -627,7 +627,9 @@ public class MavenParser { case "name": mavenProject.addLicense( mavenLicenses.getEquivalentLicense( - reader.getElementText())); + reader.getElementText(). + trim(). + replaceAll("[\n ]+", " "))); break; default: consumeElement(reader); diff --git a/src/main/resources/licenseMap.properties b/src/main/resources/licenseMap.properties index 5cd2e5d..a2fdbc6 100644 --- a/src/main/resources/licenseMap.properties +++ b/src/main/resources/licenseMap.properties @@ -59,7 +59,7 @@ cddl\ +\ gplv2\ with\ classpath\ exception=CDDL:GPL-2-with-classpath-exception cddl\ license=CDDL cddl\ v1.1\ /\ gpl\ v2\ dual\ license=CDDL-1.1:GPL-2 common\ development\ and\ distribution\ license=CDDL -common\ development\ and\ distribution\ license\ (cddl)\ plus\ gpl=CDDL:GPL +common\ development\ and\ distribution\ license\ (cddl)\ plus\ gpl=CDDL:GPL-1 common\ development\ and\ distribution\ license\ (cddl)\ v1.0=CDDL common\ development\ and\ distribution\ license\ (cddl)\ version\ 1.0=CDDL common\ public\ license\ -\ v\ 1.0=CPL-1.0 @@ -113,7 +113,8 @@ hsqldb\ license=BSD indiana\ university\ extreme!\ lab\ software\ license=Indiana-University-Extreme-Lab indiana\ university\ extreme!\ lab\ software\ license\ 1.1.1=Indiana-University-Extreme-Lab indiana\ university\ extreme!\ lab\ software\ license,\ vesion\ 1.1.1=Indiana-University-Extreme-Lab -jquery\ license=MIT:CC0 +jquery\ license=MIT:CC0-1.0 +jsr-000107\ jcache\ 2.9\ public\ review\ -\ updated\ specification\ license=Apache-2.0 lgpl=LGPL-3 lgpl\ 2.1=LGPL-2.1 lgpl-2.1=LGPL-2.1 |