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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
