[icu4j] 11/20: Use the upstream poms for icu4j-charset and icu4j-localespi

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository icu4j.

commit 9c92b31ae6115b4603fb5db6e23d1f20f3605d12
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 8 14:20:29 2018 +0100

    Use the upstream poms for icu4j-charset and icu4j-localespi
---
 debian/changelog           | 1 +
 debian/icu4j-charset.pom   | 9 ---------
 debian/icu4j-localespi.pom | 9 ---------
 debian/libicu4j-java.poms  | 6 +++---
 4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a927de..cb4ed11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ icu4j (60.1-1) UNRELEASED; urgency=medium
   * New upstream release
     - Refreshed the patches
     - Disabled the custom taglets to fix the build with Java 9 (Closes: #873217)
+    - Use the upstream poms for icu4j-charset and icu4j-localespi
   * Disabled doclint when generating the javadoc
   * Updated debian/watch to track the releases > 58.1
   * Restored debian/orig-tar.sh and use XZ compression for the upstream tarball
diff --git a/debian/icu4j-charset.pom b/debian/icu4j-charset.pom
deleted file mode 100644
index 9dc470a..0000000
--- a/debian/icu4j-charset.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.ibm.icu</groupId>
-  <artifactId>icu4j-charset</artifactId>
-  <version>57.1</version>
-</project>
\ No newline at end of file
diff --git a/debian/icu4j-localespi.pom b/debian/icu4j-localespi.pom
deleted file mode 100644
index bcda44a..0000000
--- a/debian/icu4j-localespi.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.ibm.icu</groupId>
-  <artifactId>icu4j-localespi</artifactId>
-  <version>57.1</version>
-</project>
\ No newline at end of file
diff --git a/debian/libicu4j-java.poms b/debian/libicu4j-java.poms
index f478405..0706996 100644
--- a/debian/libicu4j-java.poms
+++ b/debian/libicu4j-java.poms
@@ -1,3 +1,3 @@
-debian/icu4j-charset.pom --artifact=icu4j-charset.jar --java-lib
-debian/icu4j-localespi.pom --artifact=icu4j-localespi.jar --java-lib
-pom.xml --artifact=icu4j.jar --java-lib
+maven/icu4j/pom.xml           --java-lib --set-version=60.1 --artifact=icu4j.jar
+maven/icu4j-charset/pom.xml   --java-lib --set-version=60.1 --artifact=icu4j-charset.jar
+maven/icu4j-localespi/pom.xml --java-lib --set-version=60.1 --artifact=icu4j-localespi.jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/icu4j.git