Re: [tomcat] branch master updated: Workaround what looks like a JRE bug to me
On 03/11/2020 21:23, ma...@apache.org wrote:
> 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 a958480 Workaround what looks like a JRE bug to me
With thanks to rotty3000 for helping me get my head around
module-info.class.
> a958480 is described below
>
> commit a9584808041497015cd6dbb4b098096a264fe18e
> Author: Mark Thomas
> AuthorDate: Tue Nov 3 21:22:34 2020 +
>
> Workaround what looks like a JRE bug to me
>
> https://bugs.openjdk.java.net/browse/JDK-8255854
> ---
> java/org/apache/el/stream/package-info.java | 18 ++
> java/org/apache/el/util/package-info.java | 18 ++
The above file is actually for the next work-around but I'll leave it in
the repo as I'll need it shortly. Just want to get to the bottom of why
it is required before I apply it in case there is another JRE bug.
Mark
> res/bnd/jasper-el.jar.tmp.bnd | 2 +-
> 3 files changed, 37 insertions(+), 1 deletion(-)
>
> diff --git a/java/org/apache/el/stream/package-info.java
> b/java/org/apache/el/stream/package-info.java
> new file mode 100644
> index 000..7af866a
> --- /dev/null
> +++ b/java/org/apache/el/stream/package-info.java
> @@ -0,0 +1,18 @@
> +/*
> + * 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
> new file mode 100644
> index 000..a490094
> --- /dev/null
> +++ b/java/org/apache/el/util/package-info.java
> @@ -0,0 +1,18 @@
> +/*
> + * 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 67a2384..d9e97fb 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=32;\
> +access=0;\
> version=${Bundle-Version}
> -jpms-module-info-options: \
> ${module.name};\
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Workaround what looks like a JRE bug to me
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 a958480 Workaround what looks like a JRE bug to me
a958480 is described below
commit a9584808041497015cd6dbb4b098096a264fe18e
Author: Mark Thomas
AuthorDate: Tue Nov 3 21:22:34 2020 +
Workaround what looks like a JRE bug to me
https://bugs.openjdk.java.net/browse/JDK-8255854
---
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, 37 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/el/stream/package-info.java
b/java/org/apache/el/stream/package-info.java
new file mode 100644
index 000..7af866a
--- /dev/null
+++ b/java/org/apache/el/stream/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * 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
new file mode 100644
index 000..a490094
--- /dev/null
+++ b/java/org/apache/el/util/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * 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 67a2384..d9e97fb 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=32;\
+access=0;\
version=${Bundle-Version}
-jpms-module-info-options: \
${module.name};\
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/04: Align JPMS module names with current jakarta expectations
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 1a338aa178b2d03b2296c15f446d9f7f21e240e3
Author: Mark Thomas
AuthorDate: Mon Nov 2 19:17:45 2020 +
Align JPMS module names with current jakarta expectations
---
res/bnd/el-api.jar.tmp.bnd| 4 ++--
res/bnd/jaspic-api.jar.tmp.bnd| 4 ++--
res/bnd/websocket-api.jar.tmp.bnd | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index 383a2c1..ec61955 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -34,9 +34,9 @@ Provide-Capability: \
Implementation-Vendor=Apache Software Foundation
-jpms-module-info: \
-jakarta.el.api;\
+jakarta.el;\
access=32;\
version=${el.spec.version}
-jpms-module-info-options: \
-jakarta.el.api;\
+jakarta.el;\
substitute=el-api
\ No newline at end of file
diff --git a/res/bnd/jaspic-api.jar.tmp.bnd b/res/bnd/jaspic-api.jar.tmp.bnd
index 29845a1..7cf0565 100644
--- a/res/bnd/jaspic-api.jar.tmp.bnd
+++ b/res/bnd/jaspic-api.jar.tmp.bnd
@@ -35,9 +35,9 @@ Provide-Capability: \
Implementation-Vendor=Apache Software Foundation
-jpms-module-info: \
-jakarta.security.enterprise;\
+jakarta.security.auth.message;\
access=32;\
version=${jaspic.spec.version}
-jpms-module-info-options: \
-jakarta.security.enterprise;\
+jakarta.security.auth.message;\
substitute=jaspic-api
\ No newline at end of file
diff --git a/res/bnd/websocket-api.jar.tmp.bnd
b/res/bnd/websocket-api.jar.tmp.bnd
index 42bb888..93c9fe3 100644
--- a/res/bnd/websocket-api.jar.tmp.bnd
+++ b/res/bnd/websocket-api.jar.tmp.bnd
@@ -35,9 +35,9 @@ Provide-Capability: \
Implementation-Vendor=Apache Software Foundation
-jpms-module-info: \
-jakarta.websocket.api;\
+jakarta.websocket;\
access=32;\
version=${websocket.spec.version}
-jpms-module-info-options: \
-jakarta.websocket.api;\
+jakarta.websocket;\
substitute=websocket-api
\ No newline at end of file
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/04: Fix BZ 64849 JPMS provides/uses for EL
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 9d3896a434e35cf8e9ebf1c95a81e1fcb739866e
Author: Mark Thomas
AuthorDate: Mon Nov 2 19:53:05 2020 +
Fix BZ 64849 JPMS provides/uses for EL
Note this has exposed an issue with the JPMS module-info.class for
org.apache.tomcat.jasper.el
---
java/jakarta/el/ExpressionFactory.java| 3 +++
java/org/apache/el/ExpressionFactoryImpl.java | 1 +
res/checkstyle/jakarta-import-control.xml | 1 +
3 files changed, 5 insertions(+)
diff --git a/java/jakarta/el/ExpressionFactory.java
b/java/jakarta/el/ExpressionFactory.java
index b1ffccc..dd17ddd 100644
--- a/java/jakarta/el/ExpressionFactory.java
+++ b/java/jakarta/el/ExpressionFactory.java
@@ -36,10 +36,13 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import aQute.bnd.annotation.spi.ServiceConsumer;
+
/**
*
* @since 2.1
*/
+@ServiceConsumer(value=jakarta.el.ExpressionFactory.class)
public abstract class ExpressionFactory {
private static final boolean IS_SECURITY_ENABLED =
diff --git a/java/org/apache/el/ExpressionFactoryImpl.java
b/java/org/apache/el/ExpressionFactoryImpl.java
index 3ce47ad..719cd45 100644
--- a/java/org/apache/el/ExpressionFactoryImpl.java
+++ b/java/org/apache/el/ExpressionFactoryImpl.java
@@ -33,6 +33,7 @@ import org.apache.el.util.MessageFactory;
*
* @author Jacob Hookom [ja...@hookom.net]
*/
+@aQute.bnd.annotation.spi.ServiceProvider(value=jakarta.el.ExpressionFactory.class)
public class ExpressionFactoryImpl extends ExpressionFactory {
/**
diff --git a/res/checkstyle/jakarta-import-control.xml
b/res/checkstyle/jakarta-import-control.xml
index 572c6a7..ceee9ae 100644
--- a/res/checkstyle/jakarta-import-control.xml
+++ b/res/checkstyle/jakarta-import-control.xml
@@ -21,6 +21,7 @@
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/04: Remove unnecessary code
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 092e7eaa23c96aab2d7f93c023174c535c1afcf3
Author: Mark Thomas
AuthorDate: Tue Nov 3 17:06:05 2020 +
Remove unnecessary code
---
java/org/apache/el/ExpressionFactoryImpl.java | 7 ---
1 file changed, 7 deletions(-)
diff --git a/java/org/apache/el/ExpressionFactoryImpl.java
b/java/org/apache/el/ExpressionFactoryImpl.java
index 719cd45..e3aa471 100644
--- a/java/org/apache/el/ExpressionFactoryImpl.java
+++ b/java/org/apache/el/ExpressionFactoryImpl.java
@@ -36,13 +36,6 @@ import org.apache.el.util.MessageFactory;
@aQute.bnd.annotation.spi.ServiceProvider(value=jakarta.el.ExpressionFactory.class)
public class ExpressionFactoryImpl extends ExpressionFactory {
-/**
- *
- */
-public ExpressionFactoryImpl() {
-super();
-}
-
@Override
public Object coerceToType(Object obj, Class type) {
return ELSupport.coerceToType(null, obj, type);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/04: Update to BND 5.2.0
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 ab63d6eed4e3be786a9c0626cd658f2b57f14cc7
Author: Mark Thomas
AuthorDate: Mon Nov 2 19:51:55 2020 +
Update to BND 5.2.0
---
build.properties.default | 6 +++---
webapps/docs/changelog.xml | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 1b45cd5..6dddbda 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -288,12 +288,12 @@
saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-
# - bnd, version 5.1.1 or later -
# - provides OSGI metadata for JARs -
-bnd.version=5.1.1
+bnd.version=5.2.0
# checksums for biz.aQute.bnd-5.1.1.jar
bnd.checksum.enabled=true
bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=0dc5ff0af222ef075b5b0dd488f6aeac|0e542cf0f928107c17ce65f3c68dd2875724fecc
+bnd.checksum.value=3254df4b94104002f79005ae54ec1dbb|1d69d0a5862133ac1f54555c9cd59011d79bbb86
bnd.home=${base.path}/bnd-${bnd.version}
bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
@@ -303,7 +303,7 @@
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.b
# - required to avoid Javadoc error when using bnd annotations -
osgi-annotations.version=1.0.0
-# checksums for biz.aQute.bnd-5.1.1.jar
+# checksums for biz.aQute.bnd-5.2.0.jar
osgi-annotations.checksum.enabled=true
osgi-annotations.checksum.algorithm=MD5|SHA-1
osgi-annotations.checksum.value=153054f987534244f95a399539b11375|b6e802bceba0682353466abf8fadbbd662b2f7f8
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7fe24a3..b75bbe0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -173,6 +173,9 @@
Improvements to Russian translations. Provided by Azat. (markt)
+
+Update to bnd 5.2.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (85d5a9f -> 092e7ea)
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 85d5a9f Additional fix for BZ 64848. Ensure Processor instances are cleaned up new 1a338aa Align JPMS module names with current jakarta expectations new ab63d6e Update to BND 5.2.0 new 9d3896a Fix BZ 64849 JPMS provides/uses for EL new 092e7ea Remove unnecessary code The 4 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: build.properties.default | 6 +++--- java/jakarta/el/ExpressionFactory.java| 3 +++ java/org/apache/el/ExpressionFactoryImpl.java | 8 +--- res/bnd/el-api.jar.tmp.bnd| 4 ++-- res/bnd/jaspic-api.jar.tmp.bnd| 4 ++-- res/bnd/websocket-api.jar.tmp.bnd | 4 ++-- res/checkstyle/jakarta-import-control.xml | 1 + webapps/docs/changelog.xml| 3 +++ 8 files changed, 17 insertions(+), 16 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64848] WsSession objects in OUTPUT_CLOSED state are implicitly held by waitingProcessors and GC cannot purge them from the JVM heap
https://bz.apache.org/bugzilla/show_bug.cgi?id=64848 --- Comment #9 from Laszlo Karolyi --- I can confirm that the issue I reported is indeed fixed in Tomcat 9.0.40 so thanks for the quick remediation. Do you happen to have an estimation as to when the 9.0.40 version of Tomcat is expected to be released? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #373: lazy set filed `DELETE_FILES_SERVICE`
markt-asf commented on pull request #373: URL: https://github.com/apache/tomcat/pull/373#issuecomment-720330295 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] dao-jun commented on pull request #373: lazy set filed `DELETE_FILES_SERVICE`
dao-jun commented on pull request #373: URL: https://github.com/apache/tomcat/pull/373#issuecomment-720880325 > How does this fix the issue? It only delays the creation of the executor from the point the class is loaded to the point where the first instance is created. Instance creation is also triggered by the parsing of logging.properties and occurs immediately the class is loaded. The class loading is triggered by the instance creation so I don't see how this proposed PR can help. Yes, I just noticed it create an instance in `ClassLoaderLogManager#readConfiguration` by invoking `classLoader.loadClass(handlerClassName).getConstructor().newInstance()`, I'm sorry for that. How about using a single `Thread` instead of `ThreadPoolExecutor` ? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64858] Allow to deploy a WAR whose dependencies are on a Maven repository
https://bz.apache.org/bugzilla/show_bug.cgi?id=64858 --- Comment #7 from Mark Thomas --- (In reply to Gael Lalire from comment #6) > Yes, WebResource are a terrific extension point. However it's a pity that > scanners don't use it and rely on constructed jar: URL. Which code are you referring to here? The StandardJarScanner obtains URLs for the JARs via the WebResources implementation. > Anyway I already use WebResource but I need an entry point. That is expected to be the definition of a custom implementation for one or more components of the web resources implementation. > As long as JPMS named module are not activated I can overload Tomcat classes > by a classpath hack. > > But with JPMS named module activated I cannot use an already defined package > that why I propose this PR https://github.com/apache/tomcat/pull/375. My preference continues to be doing this via WebResources and making changes there as necessary to permit extensions like this. > Anyway I'm sorry to read that such integration has (almost) no change to get > merged and I would like to know why do you think that. Too invasive. > I also saw you now provide generated named bundle through BND. > I tested it and got 3 issues : We are aware of those and they are being fixed via other bug reports. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
