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/26 13:26:24 UTC
[tomcat] branch master updated (7988d73 -> 2250b8f)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 7988d73 Read all the certificates from /var/run/secrets/kubernetes.io/serviceaccount/ca.crt and add them.
new 073a5bb Add "embed" to the OSGi names.
new 2250b8f Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63555 JPMS for embed
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
res/bnd/tomcat-dbcp.jar.tmp.bnd | 1 +
res/bnd/tomcat-embed-core.jar.tmp.bnd | 1 +
res/bnd/tomcat-embed-el.jar.tmp.bnd | 1 +
res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 1 +
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 5 +++--
webapps/docs/changelog.xml | 12 ++++++++++++
6 files changed, 19 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Fix
https://bz.apache.org/bugzilla/show_bug.cgi?id=63555 JPMS for embed
Posted by ma...@apache.org.
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
commit 2250b8f6ffbbc2deba62ad2b3bc766e7b78b6314
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jul 26 14:24:38 2019 +0100
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63555 JPMS for embed
Add Automatic-Module-Name entries for each of the Tomcat provided JARs
included in the Tomcat embedded distribution.
---
res/bnd/tomcat-dbcp.jar.tmp.bnd | 1 +
res/bnd/tomcat-embed-core.jar.tmp.bnd | 1 +
res/bnd/tomcat-embed-el.jar.tmp.bnd | 1 +
res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 1 +
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 1 +
webapps/docs/changelog.xml | 5 +++++
6 files changed, 10 insertions(+)
diff --git a/res/bnd/tomcat-dbcp.jar.tmp.bnd b/res/bnd/tomcat-dbcp.jar.tmp.bnd
index 9296416..f7d2b14 100644
--- a/res/bnd/tomcat-dbcp.jar.tmp.bnd
+++ b/res/bnd/tomcat-dbcp.jar.tmp.bnd
@@ -12,6 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+Automatic-Module-Name: org.apache.tomcat-dbcp
Bundle-Name: tomcat-dbcp
Bundle-SymbolicName: org.apache.tomcat-dbcp
Bundle-Version: @VERSION@
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index c3e4d5b..301c4bb 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -12,6 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+Automatic-Module-Name: org.apache.tomcat-embed-core
Bundle-Name: tomcat-embed-core
Bundle-SymbolicName: org.apache.tomcat-embed-core
Bundle-Version: @VERSION@
diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd b/res/bnd/tomcat-embed-el.jar.tmp.bnd
index b6a72d5..06c09fb 100644
--- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
@@ -12,6 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+Automatic-Module-Name: org.apache.tomcat-embed-jasper-el
Bundle-Name: tomcat-embed-jasper-el
Bundle-SymbolicName: org.apache.tomcat-embed-jasper-el
Bundle-Version: @VERSION@
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index 6ae519b..cd6170f 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@ -12,6 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+Automatic-Module-Name: org.apache.tomcat-embed-jasper
Bundle-Name: tomcat-embed-jasper
Bundle-SymbolicName: org.apache.tomcat-embed-jasper
Bundle-Version: @VERSION@
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index 581152c..7b80f60 100644
--- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
@@ -12,6 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+Automatic-Module-Name: org.apache.tomcat-embed-websocket
Bundle-Name: tomcat-embed-websocket
Bundle-SymbolicName: org.apache.tomcat-embed-websocket
Bundle-Version: @VERSION@
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5a3ca44..1d6d689 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -187,6 +187,11 @@
from the standard WebSocket JAR that does not include the API classes.
(markt)
</fix>
+ <fix>
+ <bug>63555</bug>: Add <code>Automatic-Module-Name</code> entries for
+ each of the Tomcat provided JARs included in the Tomcat embedded
+ distribution. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Add "embed" to the OSGi names.
Posted by ma...@apache.org.
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
commit 073a5bb296a78ed377840b3faa61338d9a81c316
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jul 26 13:59:42 2019 +0100
Add "embed" to the OSGi names.
Aligns with the other embed JARS and differentiates it from the standard
WebSocket JAR that does not include the API.
---
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 4 ++--
webapps/docs/changelog.xml | 7 +++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index 5c9b197..581152c 100644
--- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
@@ -12,8 +12,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-Bundle-Name: tomcat-websocket
-Bundle-SymbolicName: org.apache.tomcat-websocket
+Bundle-Name: tomcat-embed-websocket
+Bundle-SymbolicName: org.apache.tomcat-embed-websocket
Bundle-Version: @VERSION@
Export-Package: \
javax.websocket,\
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d6f7fb1..5a3ca44 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -180,6 +180,13 @@
<fix>
Correct broken OSGi data in JAR file manifests. (markt)
</fix>
+ <fix>
+ Add "embed" to the <code>Bundle-Name</code> and
+ <code>Bundle-Symbolic-Name</code> for the Tomact embedded WebSocket JAR
+ to align the naming with the other embedded JARs and to differentiate it
+ from the standard WebSocket JAR that does not include the API classes.
+ (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org