ICU-21425 build: updates to maven/publication

- use SPDX license rather than raw license file - minor srl update - upload a full pom.xml instead of a generated one
unicode-org · Dec 3, 2020 · 648dbca · 648dbca
1 parent 6ad0ece
commit 648dbca
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 18 deletions.
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
@@ -22,6 +22,7 @@ jobs:
             -DartifactId=icu4j-for-cldr \
             -Dversion=${MYVERSION} \
             -Dpackaging=jar \
+            -Dpomfile=icu4j/maven/icu4j/pom.xml \
             -Dfile=icu4j/release_cldr/icu4j.jar \
             -Dsources=icu4j/release_cldr/icu4j-src.jar \
             -DrepositoryId=github \
@@ -30,6 +31,7 @@ jobs:
             -DartifactId=utilities-for-cldr \
             -Dversion=${MYVERSION} \
             -Dpackaging=jar \
+            -Dpomfile=icu4j/maven/icu4j/pom.xml \
             -Dfile=icu4j/release_cldr/utilities.jar \
             -Dsources=icu4j/release_cldr/utilities-src.jar \
             -DrepositoryId=github \

diff --git a/icu4j/maven/icu4j-charset/pom.xml b/icu4j/maven/icu4j-charset/pom.xml
@@ -19,11 +19,7 @@
   <inceptionYear>2001</inceptionYear>
 
   <licenses>
-    <license>
-      <name>Unicode/ICU License</name>
-      <url>https://raw.githubusercontent.com/unicode-org/icu/master/icu4c/LICENSE</url>
-      <distribution>repo</distribution>
-    </license>
+    <license>Unicode-DFS-2016</license>
   </licenses>
 
   <developers>
@@ -62,7 +58,6 @@
     <developer>
       <id>srl295</id>
       <name>Steven Loomis</name>
-      <organization>IBM Corporation</organization>
       <roles>
         <role>PMC Member</role>
       </roles>

diff --git a/icu4j/maven/icu4j-localespi/pom.xml b/icu4j/maven/icu4j-localespi/pom.xml
@@ -19,11 +19,7 @@
   <inceptionYear>2001</inceptionYear>
 
   <licenses>
-    <license>
-      <name>Unicode/ICU License</name>
-      <url>https://raw.githubusercontent.com/unicode-org/icu/master/icu4c/LICENSE</url>
-      <distribution>repo</distribution>
-    </license>
+    <license>Unicode-DFS-2016</license>
   </licenses>
 
   <developers>
@@ -62,7 +58,6 @@
     <developer>
       <id>srl295</id>
       <name>Steven Loomis</name>
-      <organization>IBM Corporation</organization>
       <roles>
         <role>PMC Member</role>
       </roles>

diff --git a/icu4j/maven/icu4j/pom.xml b/icu4j/maven/icu4j/pom.xml
@@ -24,11 +24,7 @@
   <inceptionYear>2001</inceptionYear>
 
   <licenses>
-    <license>
-      <name>Unicode/ICU License</name>
-      <url>https://raw.githubusercontent.com/unicode-org/icu/master/icu4c/LICENSE</url>
-      <distribution>repo</distribution>
-    </license>
+    <license>Unicode-DFS-2016</license>
   </licenses>
 
   <developers>
@@ -67,7 +63,6 @@
     <developer>
       <id>srl295</id>
       <name>Steven Loomis</name>
-      <organization>IBM Corporation</organization>
       <roles>
         <role>PMC Member</role>
       </roles>