From a32a6c5f0476cd3263da78849982c50df3e2e92f Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Fri, 24 Jul 2020 10:08:47 +0100
Subject: [PATCH 1/2] Improve OSGi manifest

---
 build.xml                            |  1 +
 main/shared/build/common-targets.xml |  1 +
 manifest.stub                        | 20 +++++++++++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 411ae76..3dde055 100644
--- a/build.xml
+++ b/build.xml
@@ -684,6 +684,7 @@
             <filterset>
                 <filter token="SPECVERSION" value="${jar.spec.version}"/>
                 <filter token="IMPLVERSION" value="${jar.impl.version}"/>
+                <filter token="DATAVERSION" value="${icu4j.data.version}"/>
                 <filter token="COPYRIGHT" value="${jar.copyright.info}"/>
                 <filter token="EXECENV" value="${jar.exec.env}"/>
             </filterset>
diff --git a/main/shared/build/common-targets.xml b/main/shared/build/common-targets.xml
index 6f85a99..5778ef3 100644
--- a/main/shared/build/common-targets.xml
+++ b/main/shared/build/common-targets.xml
@@ -75,6 +75,7 @@
             <filterset>
                 <filter token="SPECVERSION" value="${jar.spec.version}"/>
                 <filter token="IMPLVERSION" value="${jar.impl.version}"/>
+                <filter token="DATAVERSION" value="${icu4j.data.version}"/>
                 <filter token="COPYRIGHT" value="${jar.copyright.info}"/>
                 <filter token="EXECENV" value="${jar.exec.env}"/>
             </filterset>
diff --git a/manifest.stub b/manifest.stub
index 98e011f..b49ab15 100644
--- a/manifest.stub
+++ b/manifest.stub
@@ -15,5 +15,23 @@ Bundle-Vendor: Unicode, Inc.
 Bundle-Copyright: @COPYRIGHT@
 Bundle-RequiredExecutionEnvironment: @EXECENV@
 Main-Class: com.ibm.icu.util.VersionInfo
-Export-Package: com.ibm.icu.lang,com.ibm.icu.math,com.ibm.icu.number,com.ibm.icu.text,com.ibm.icu.util
+Export-Package: com.ibm.icu.lang;base=true;full=true;version="@IMPLVERSION@",
+ com.ibm.icu.math;base=true;full=true;version="@IMPLVERSION@",
+ com.ibm.icu.number;base=true;full=true;version="@IMPLVERSION@",
+ com.ibm.icu.text;base=true;full=true;version="@IMPLVERSION@",
+ com.ibm.icu.util;base=true;full=true;version="@IMPLVERSION@",
+ com.ibm.icu.impl;x-internal:=true,
+ com.ibm.icu.impl.data;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@DATAVERSION@b;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.brkitr;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.coll;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.curr;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.lang;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.rbnf;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.region;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.translit;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.zone;x-internal:=true,
+ com.ibm.icu.impl.duration;x-internal:=true,
+ com.ibm.icu.impl.locale;x-internal:=true
+Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: com.ibm.icu
-- 
2.26.2