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 2020/11/06 08:10:43 UTC
[tomcat] 03/03: Revert work-around for JDK-8255854
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 b1dc0dcb746ec6fdc718cea9c99de57dc5cbaf27
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Nov 6 08:10:11 2020 +0000
Revert work-around for JDK-8255854
The intention is to use BND 5.3.0-SNAPSHOT as the workaround as they
requires much fewer changes to the codebase.
---
java/org/apache/el/stream/package-info.java | 18 ------------------
java/org/apache/el/util/package-info.java | 18 ------------------
res/bnd/jasper-el.jar.tmp.bnd | 2 +-
3 files changed, 1 insertion(+), 37 deletions(-)
diff --git a/java/org/apache/el/stream/package-info.java b/java/org/apache/el/stream/package-info.java
deleted file mode 100644
index 7af866a..0000000
--- a/java/org/apache/el/stream/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-@aQute.bnd.annotation.jpms.Open
-package org.apache.el.stream;
\ No newline at end of file
diff --git a/java/org/apache/el/util/package-info.java b/java/org/apache/el/util/package-info.java
deleted file mode 100644
index a490094..0000000
--- a/java/org/apache/el/util/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-//@aQute.bnd.annotation.jpms.Open
-package org.apache.el.util;
\ No newline at end of file
diff --git a/res/bnd/jasper-el.jar.tmp.bnd b/res/bnd/jasper-el.jar.tmp.bnd
index d9e97fb..67a2384 100644
--- a/res/bnd/jasper-el.jar.tmp.bnd
+++ b/res/bnd/jasper-el.jar.tmp.bnd
@@ -30,7 +30,7 @@ Export-Package: \
-jpms-module-info: \
${module.name};\
- access=0;\
+ access=32;\
version=${Bundle-Version}
-jpms-module-info-options: \
${module.name};\
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org