You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/07/25 14:16:30 UTC
[tomcat] branch master updated: Fix OSGi data in manifests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new de9fc52 Fix OSGi data in manifests
de9fc52 is described below
commit de9fc52279ef532de4cd727d5a4964882719fea9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jul 25 15:16:12 2019 +0100
Fix OSGi data in manifests
---
build.xml | 4 ++--
res/bnd/{annotations-api.bnd => annotations-api.jar.tmp.bnd} | 0
res/bnd/{catalina-ha.bnd => catalina-ha.jar.tmp.bnd} | 0
.../{catalina-storeconfig.bnd => catalina-storeconfig.jar.tmp.bnd} | 0
res/bnd/{catalina-tribes.bnd => catalina-tribes.jar.tmp.bnd} | 0
res/bnd/{catalina.bnd => catalina.jar.tmp.bnd} | 0
res/bnd/{el-api.bnd => el-api.jar.tmp.bnd} | 0
res/bnd/{jasper-el.bnd => jasper-el.jar.tmp.bnd} | 0
res/bnd/{jasper.bnd => jasper.jar.tmp.bnd} | 0
res/bnd/{jaspic-api.bnd => jaspic-api.jar.tmp.bnd} | 0
res/bnd/{jsp-api.bnd => jsp-api.jar.tmp.bnd} | 0
res/bnd/{servlet-api.bnd => servlet-api.jar.tmp.bnd} | 0
res/bnd/{tomcat-api.bnd => tomcat-api.jar.tmp.bnd} | 0
res/bnd/{tomcat-coyote.bnd => tomcat-coyote.jar.tmp.bnd} | 0
res/bnd/{tomcat-dbcp.bnd => tomcat-dbcp.jar.tmp.bnd} | 0
res/bnd/{tomcat-embed-core.bnd => tomcat-embed-core.jar.tmp.bnd} | 0
res/bnd/{tomcat-embed-el.bnd => tomcat-embed-el.jar.tmp.bnd} | 0
res/bnd/{tomcat-embed-jasper.bnd => tomcat-embed-jasper.jar.tmp.bnd} | 0
...{tomcat-embed-websocket.bnd => tomcat-embed-websocket.jar.tmp.bnd} | 0
res/bnd/{tomcat-jni.bnd => tomcat-jni.jar.tmp.bnd} | 0
res/bnd/{tomcat-juli.bnd => tomcat-juli.jar.tmp.bnd} | 0
res/bnd/{tomcat-util-scan.bnd => tomcat-util-scan.jar.tmp.bnd} | 0
res/bnd/{tomcat-util.bnd => tomcat-util.jar.tmp.bnd} | 0
res/bnd/{tomcat-websocket.bnd => tomcat-websocket.jar.tmp.bnd} | 0
res/bnd/{websocket-api.bnd => websocket-api.jar.tmp.bnd} | 0
webapps/docs/changelog.xml | 3 +++
26 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 3370fa9..e44fbd9 100644
--- a/build.xml
+++ b/build.xml
@@ -3269,11 +3269,11 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
<target name="add-osgi" if="${addOSGi}" >
<echo message="add-osgi ${jarfile} ${addOSGi}"></echo>
- <bndwrap output="${jarfile}.bnd" definitions="${tomcat.bnd}" >
+ <bndwrap output="${jarfile}.tmp" definitions="${tomcat.bnd}" >
<fileset file="${jarfile}" />
</bndwrap>
<delete file="${jarfile}" />
- <move file="${jarfile}.bnd" tofile="${jarfile}" />
+ <move file="${jarfile}.tmp" tofile="${jarfile}" />
</target>
<!-- Macro, used to create checksum and signature files -->
diff --git a/res/bnd/annotations-api.bnd b/res/bnd/annotations-api.jar.tmp.bnd
similarity index 100%
rename from res/bnd/annotations-api.bnd
rename to res/bnd/annotations-api.jar.tmp.bnd
diff --git a/res/bnd/catalina-ha.bnd b/res/bnd/catalina-ha.jar.tmp.bnd
similarity index 100%
rename from res/bnd/catalina-ha.bnd
rename to res/bnd/catalina-ha.jar.tmp.bnd
diff --git a/res/bnd/catalina-storeconfig.bnd b/res/bnd/catalina-storeconfig.jar.tmp.bnd
similarity index 100%
rename from res/bnd/catalina-storeconfig.bnd
rename to res/bnd/catalina-storeconfig.jar.tmp.bnd
diff --git a/res/bnd/catalina-tribes.bnd b/res/bnd/catalina-tribes.jar.tmp.bnd
similarity index 100%
rename from res/bnd/catalina-tribes.bnd
rename to res/bnd/catalina-tribes.jar.tmp.bnd
diff --git a/res/bnd/catalina.bnd b/res/bnd/catalina.jar.tmp.bnd
similarity index 100%
rename from res/bnd/catalina.bnd
rename to res/bnd/catalina.jar.tmp.bnd
diff --git a/res/bnd/el-api.bnd b/res/bnd/el-api.jar.tmp.bnd
similarity index 100%
rename from res/bnd/el-api.bnd
rename to res/bnd/el-api.jar.tmp.bnd
diff --git a/res/bnd/jasper-el.bnd b/res/bnd/jasper-el.jar.tmp.bnd
similarity index 100%
rename from res/bnd/jasper-el.bnd
rename to res/bnd/jasper-el.jar.tmp.bnd
diff --git a/res/bnd/jasper.bnd b/res/bnd/jasper.jar.tmp.bnd
similarity index 100%
rename from res/bnd/jasper.bnd
rename to res/bnd/jasper.jar.tmp.bnd
diff --git a/res/bnd/jaspic-api.bnd b/res/bnd/jaspic-api.jar.tmp.bnd
similarity index 100%
rename from res/bnd/jaspic-api.bnd
rename to res/bnd/jaspic-api.jar.tmp.bnd
diff --git a/res/bnd/jsp-api.bnd b/res/bnd/jsp-api.jar.tmp.bnd
similarity index 100%
rename from res/bnd/jsp-api.bnd
rename to res/bnd/jsp-api.jar.tmp.bnd
diff --git a/res/bnd/servlet-api.bnd b/res/bnd/servlet-api.jar.tmp.bnd
similarity index 100%
rename from res/bnd/servlet-api.bnd
rename to res/bnd/servlet-api.jar.tmp.bnd
diff --git a/res/bnd/tomcat-api.bnd b/res/bnd/tomcat-api.jar.tmp.bnd
similarity index 100%
rename from res/bnd/tomcat-api.bnd
rename to res/bnd/tomcat-api.jar.tmp.bnd
diff --git a/res/bnd/tomcat-coyote.bnd b/res/bnd/tomcat-coyote.jar.tmp.bnd
similarity index 100%
rename from res/bnd/tomcat-coyote.bnd
rename to res/bnd/tomcat-coyote.jar.tmp.bnd
diff --git a/res/bnd/tomcat-dbcp.bnd b/res/bnd/tomcat-dbcp.jar.tmp.bnd
similarity index 100%
rename from res/bnd/tomcat-dbcp.bnd
rename to res/bnd/tomcat-dbcp.jar.tmp.bnd
diff --git a/res/bnd/tomcat-embed-core.bnd b/res/bnd/tomcat-embed-core.jar.tmp.bnd
similarity index 100%
rename from res/bnd/tomcat-embed-core.bnd
rename to res/bnd/tomcat-embed-core.jar.tmp.bnd
diff --git a/res/bnd/tomcat-embed-el.bnd b/res/bnd/tomcat-embed-el.jar.tmp.bnd
similarity index 100%
rename from res/bnd/tomcat-embed-el.bnd
rename to res/bnd/tomcat-embed-el.jar.tmp.bnd
diff --git a/res/bnd/tomcat-embed-jasper.bnd b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
similarity index 100%
rename from res/bnd/tomcat-embed-jasper.bnd
rename to res/bnd/tomcat-embed-jasper.jar.tmp.bnd
diff --git a/res/bnd/tomcat-embed-websocket.bnd b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
similarity index 100%
rename from res/bnd/tomcat-embed-websocket.bnd
rename to res/bnd/tomcat-embed-websocket.jar.tmp.bnd
diff --git a/res/bnd/tomcat-jni.bnd b/res/bnd/tomcat-jni.jar.tmp.bnd
similarity index 100%
rename from res/bnd/tomcat-jni.bnd
rename to res/bnd/tomcat-jni.jar.tmp.bnd
diff --git a/res/bnd/tomcat-juli.bnd b/res/bnd/tomcat-juli.jar.tmp.bnd
similarity index 100%
rename from res/bnd/tomcat-juli.bnd
rename to res/bnd/tomcat-juli.jar.tmp.bnd
diff --git a/res/bnd/tomcat-util-scan.bnd b/res/bnd/tomcat-util-scan.jar.tmp.bnd
similarity index 100%
rename from res/bnd/tomcat-util-scan.bnd
rename to res/bnd/tomcat-util-scan.jar.tmp.bnd
diff --git a/res/bnd/tomcat-util.bnd b/res/bnd/tomcat-util.jar.tmp.bnd
similarity index 100%
rename from res/bnd/tomcat-util.bnd
rename to res/bnd/tomcat-util.jar.tmp.bnd
diff --git a/res/bnd/tomcat-websocket.bnd b/res/bnd/tomcat-websocket.jar.tmp.bnd
similarity index 100%
rename from res/bnd/tomcat-websocket.bnd
rename to res/bnd/tomcat-websocket.jar.tmp.bnd
diff --git a/res/bnd/websocket-api.bnd b/res/bnd/websocket-api.jar.tmp.bnd
similarity index 100%
rename from res/bnd/websocket-api.bnd
rename to res/bnd/websocket-api.jar.tmp.bnd
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5a0983e..d6f7fb1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -177,6 +177,9 @@
to the jvm in <code>catalina.sh</code> when calling <code>stop</code>.
(markt)
</fix>
+ <fix>
+ Correct broken OSGi data in JAR file manifests. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org