Use variables for versions

Author: pnicolucci

dev/io.openliberty.jakarta.expressionLanguage.4.0/bnd.bnd

@@ -12,23 +12,25 @@ bVersion=1.0
 
 Bundle-SymbolicName: io.openliberty.jakarta.expressionLanguage.4.0; singleton:=true
 Bundle-Description: Jakarta Expression Language, version 4.0
+Implementation-Version: 10.0.27
+Api-Version = 4.0.0
 
 Export-Package: \
- jakarta.el;thread-context=true; version="4.0.0"
+ jakarta.el;thread-context=true; version=${Api-Version}
 
  Provide-Capability: \
    osgi.contract;\
        osgi.contract=JavaEL;\
-       version:Version=4.0.0;\
+       version:Version=${Api-Version};\
        uses:="jakarta.el"
 
 -includeresource: \
-    @\${repo;org.apache.tomcat:tomcat-el-api;10.0.27;EXACT}!/!(META-INF/maven/*|module-info.class),\
+    @\${repo;org.apache.tomcat:tomcat-el-api;${Implementation-Version};EXACT}!/!(META-INF/maven/*|module-info.class),\
     jakarta=resources/jakarta
 
 instrument.disabled: true
 
 publish.wlp.jar.suffix: dev/api/spec
 
 -buildpath: \
-  org.apache.tomcat:tomcat-el-api;strategy=exact;version=10.0.27
+  org.apache.tomcat:tomcat-el-api;strategy=exact;version=${Implementation-Version}

dev/io.openliberty.jakarta.expressionLanguage.5.0/bnd.bnd

@@ -12,28 +12,30 @@ bVersion=1.0
 
 Bundle-SymbolicName: io.openliberty.jakarta.expressionLanguage.5.0; singleton:=true
 Bundle-Description: Jakarta Expression Language, version 5.0
+Implementation-Version: 10.1.49
+Api-Version: 5.0.0
 
 javac.source: 11
 javac.target: 11
 
 Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=11))"
 
 Export-Package: \
- jakarta.el;thread-context=true; version="5.0.0"
+ jakarta.el;thread-context=true; version=${Api-Version}
 
  Provide-Capability: \
    osgi.contract;\
        osgi.contract=JavaEL;\
-       version:Version=5.0.0;\
+       version:Version=${Api-Version};\
        uses:="jakarta.el"
 
 -includeresource: \
-    @\${repo;org.apache.tomcat:tomcat-el-api;10.1.49;EXACT}!/!(META-INF/maven/*|module-info.class),\
+    @\${repo;org.apache.tomcat:tomcat-el-api;${Implementation-Version};EXACT}!/!(META-INF/maven/*|module-info.class),\
     jakarta=resources/jakarta
 
 instrument.disabled: true
 
 publish.wlp.jar.suffix: dev/api/spec
 
 -buildpath: \
-   org.apache.tomcat:tomcat-el-api;strategy=exact;version=10.1.49
+   org.apache.tomcat:tomcat-el-api;strategy=exact;version=${Implementation-Version}

dev/io.openliberty.jakarta.expressionLanguage.6.0/bnd.bnd

@@ -12,28 +12,30 @@ bVersion=1.0
 
 Bundle-SymbolicName: io.openliberty.jakarta.expressionLanguage.6.0; singleton:=true
 Bundle-Description: Jakarta Expression Language, version 6.0
+Implementation-Version: 11.0.14
+Api-Version: 6.0.0
 
 javac.source: 17
 javac.target: 17
 
 Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=17))"
 
 Export-Package: \
- jakarta.el;thread-context=true; version="6.0.0"
+ jakarta.el;thread-context=true; version=${Api-Version}
 
 Provide-Capability: \
    osgi.contract;\
        osgi.contract=JakartaExpressionLanguage;\
-       version:Version=6.0.0;\
+       version:Version=${Api-Version};\
        uses:="jakarta.el"
 
 -includeresource: \
-    @\${repo;org.apache.tomcat:tomcat-el-api;11.0.14;EXACT}!/!(META-INF/maven/*|module-info.class),\
+    @\${repo;org.apache.tomcat:tomcat-el-api;${Implementation-Version};EXACT}!/!(META-INF/maven/*|module-info.class),\
     jakarta=resources/jakarta
 
 instrument.disabled: true
 
 publish.wlp.jar.suffix: dev/api/spec
 
 -buildpath: \
-   org.apache.tomcat:tomcat-el-api;strategy=exact;version=11.0.14
+   org.apache.tomcat:tomcat-el-api;strategy=exact;version=${Implementation-Version}