From 2c3a1c5b107d0ef02fa2dedf4402db63b9b126c7 Mon Sep 17 00:00:00 2001 From: Volodymyr Siedlecki Date: Thu, 3 Dec 2020 12:47:56 -0500 Subject: [PATCH 1/5] Pull JSTL 1.2 out of com.ibm.ws.jsp and into a new component Create Jakarta JSTL 2.0 Implementation component --- .../check_this_in_if_it_changes/pom.xml | 5 ++ dev/cnf/oss_dependencies.maven | 1 + ...om.ibm.websphere.appserver.jsp-2.2.feature | 3 +- ...om.ibm.websphere.appserver.jsp-2.3.feature | 3 +- .../io.openliberty.pages-3.0.feature | 3 +- dev/com.ibm.ws.jsp.jstl.facade/bnd.bnd | 60 +++++++++---------- dev/com.ibm.ws.jsp/bnd.bnd | 27 +++------ .../.classpath | 7 +++ .../.project | 23 +++++++ .../.settings/bndtools.core.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 12 ++++ .../bnd.bnd | 34 +++++++++++ .../.classpath | 7 +++ .../.project | 23 +++++++ .../.settings/bndtools.core.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 12 ++++ .../bnd.bnd | 34 +++++++++++ .../rules/jakarta-renames.properties | 26 ++++++++ 18 files changed, 233 insertions(+), 51 deletions(-) create mode 100644 dev/com.ibm.ws.org.apache.taglibs.standard/.classpath create mode 100644 dev/com.ibm.ws.org.apache.taglibs.standard/.project create mode 100644 dev/com.ibm.ws.org.apache.taglibs.standard/.settings/bndtools.core.prefs create mode 100644 dev/com.ibm.ws.org.apache.taglibs.standard/.settings/org.eclipse.jdt.core.prefs create mode 100644 dev/com.ibm.ws.org.apache.taglibs.standard/bnd.bnd create mode 100644 dev/io.openliberty.org.apache.taglibs.standard/.classpath create mode 100644 dev/io.openliberty.org.apache.taglibs.standard/.project create mode 100644 dev/io.openliberty.org.apache.taglibs.standard/.settings/bndtools.core.prefs create mode 100644 dev/io.openliberty.org.apache.taglibs.standard/.settings/org.eclipse.jdt.core.prefs create mode 100644 dev/io.openliberty.org.apache.taglibs.standard/bnd.bnd diff --git a/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml b/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml index 1056337429d..4bf331705b1 100644 --- a/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml +++ b/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml @@ -2121,6 +2121,11 @@ jersey-hk2 2.26 + + org.glassfish.web + jakarta.servlet.jsp.jstl + 2.0.0 + org.glassfish jakarta.faces diff --git a/dev/cnf/oss_dependencies.maven b/dev/cnf/oss_dependencies.maven index 1af459458cb..a2a25f43d3b 100644 --- a/dev/cnf/oss_dependencies.maven +++ b/dev/cnf/oss_dependencies.maven @@ -420,6 +420,7 @@ org.glassfish.jersey.core:jersey-server:2.12 org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava2:2.30.1 org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava:2.30.1 org.glassfish.jersey.inject:jersey-hk2:2.26 +org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0 org.glassfish:jakarta.faces:3.0.0-RC1 org.glassfish:jakarta.json:2.0.0 org.glassfish:javax.faces:2.3.3 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/jsp-2.2/com.ibm.websphere.appserver.jsp-2.2.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/jsp-2.2/com.ibm.websphere.appserver.jsp-2.2.feature index 54304dfed34..f2f5dca64b2 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/jsp-2.2/com.ibm.websphere.appserver.jsp-2.2.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/jsp-2.2/com.ibm.websphere.appserver.jsp-2.2.feature @@ -44,7 +44,8 @@ Subsystem-Name: JavaServer Pages 2.2 com.ibm.ws.jsp.jasper, \ com.ibm.ws.jsp, \ com.ibm.ws.jsp.jstl.facade; start-phase:=CONTAINER_EARLY, \ - com.ibm.ws.org.apache.jasper.el.2.2 + com.ibm.ws.org.apache.jasper.el.2.2, \ + com.ibm.ws.org.apache.taglibs.standard -jars=com.ibm.websphere.appserver.spi.jsp; location:=dev/spi/ibm/, \ com.ibm.websphere.javaee.jsp.tld.2.2; location:=dev/api/spec/ -files=dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.jsp_1.0-javadoc.zip diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/jsp-2.3/com.ibm.websphere.appserver.jsp-2.3.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/jsp-2.3/com.ibm.websphere.appserver.jsp-2.3.feature index cb601a425d3..28331c96f5c 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/jsp-2.3/com.ibm.websphere.appserver.jsp-2.3.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/jsp-2.3/com.ibm.websphere.appserver.jsp-2.3.feature @@ -42,7 +42,8 @@ Subsystem-Name: JavaServer Pages 2.3 com.ibm.websphere.javaee.jstl.1.2; location:="dev/api/spec/,lib/"; mavenCoordinates="javax.servlet:jstl:1.2", \ com.ibm.ws.jsp.2.3, \ com.ibm.ws.jsp, \ - com.ibm.ws.jsp.jstl.facade; start-phase:=CONTAINER_EARLY + com.ibm.ws.jsp.jstl.facade; start-phase:=CONTAINER_EARLY, \ + com.ibm.ws.org.apache.taglibs.standard -jars=com.ibm.websphere.appserver.spi.jsp; location:=dev/spi/ibm/, \ com.ibm.websphere.javaee.jsp.tld.2.2; location:=dev/api/spec/ -files=dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.jsp_1.0-javadoc.zip diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/pages-3.0/io.openliberty.pages-3.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/pages-3.0/io.openliberty.pages-3.0.feature index 845dc7098d3..4281bfb948a 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/pages-3.0/io.openliberty.pages-3.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/pages-3.0/io.openliberty.pages-3.0.feature @@ -41,7 +41,8 @@ Subsystem-Name: Jakarta Server Pages 3.0 io.openliberty.jakarta.jstl.2.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:2.0.0", \ com.ibm.ws.jsp.2.3.jakarta, \ com.ibm.ws.jsp.jakarta, \ - com.ibm.ws.jsp.jstl.facade.jakarta; start-phase:=CONTAINER_EARLY + com.ibm.ws.jsp.jstl.facade.jakarta; start-phase:=CONTAINER_EARLY, \ + io.openliberty.org.apache.taglibs.standard -jars=com.ibm.websphere.appserver.spi.jsp; location:=dev/spi/ibm/, \ com.ibm.websphere.javaee.jsp.tld.2.2.jakarta; location:=dev/api/spec/ -files=dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.jsp_1.0-javadoc.zip diff --git a/dev/com.ibm.ws.jsp.jstl.facade/bnd.bnd b/dev/com.ibm.ws.jsp.jstl.facade/bnd.bnd index 25d64276be0..d74f5fae322 100644 --- a/dev/com.ibm.ws.jsp.jstl.facade/bnd.bnd +++ b/dev/com.ibm.ws.jsp.jstl.facade/bnd.bnd @@ -26,33 +26,33 @@ Import-Package: \ javax.servlet.jsp.el;version="[2.2,3.0)", \ javax.servlet.jsp.resources;version="[2.2,3.0)", \ javax.servlet.jsp.tagext;version="[2.2,3.0)", \ - javax.servlet.jsp.jstl.core;version="[1.2.0,2.0.0)", \ - javax.servlet.jsp.jstl.fmt;version="[1.2.0,2.0.0)", \ - javax.servlet.jsp.jstl.sql;version="[1.2.0,2.0.0)", \ - javax.servlet.jsp.jstl.tlv;version="[1.2.0,2.0.0)", \ - org.apache.taglibs.standard.extra.commons.collections;version="[2.2,3.0)", \ - org.apache.taglibs.standard.extra.commons.collections.iterators;version="[2.2,3.0)", \ - org.apache.taglibs.standard.extra.commons.collections.map;version="[2.2,3.0)", \ - org.apache.taglibs.standard.extra.spath;version="[2.2,3.0)", \ - org.apache.taglibs.standard.functions;version="[2.2,3.0)", \ - org.apache.taglibs.standard.lang.jstl;version="[2.2,3.0)", \ - org.apache.taglibs.standard.lang.jstl.parser;version="[2.2,3.0)", \ - org.apache.taglibs.standard.lang.jstl.test;version="[2.2,3.0)", \ - org.apache.taglibs.standard.lang.jstl.test.beans;version="[2.2,3.0)", \ - org.apache.taglibs.standard.lang.support;version="[2.2,3.0)", \ - org.apache.taglibs.standard.resources;version="[2.2,3.0)", \ - org.apache.taglibs.standard.tag.common.core;version="[2.2,3.0)", \ - org.apache.taglibs.standard.tag.common.fmt;version="[2.2,3.0)", \ - org.apache.taglibs.standard.tag.common.sql;version="[2.2,3.0)", \ - org.apache.taglibs.standard.tag.common.xml;version="[2.2,3.0)", \ - org.apache.taglibs.standard.tag.el.core;version="[2.2,3.0)", \ - org.apache.taglibs.standard.tag.el.fmt;version="[2.2,3.0)", \ - org.apache.taglibs.standard.tag.el.sql;version="[2.2,3.0)", \ - org.apache.taglibs.standard.tag.el.xml;version="[2.2,3.0)", \ - org.apache.taglibs.standard.tag.rt.core;version="[2.2,3.0)", \ - org.apache.taglibs.standard.tag.rt.fmt;version="[2.2,3.0)", \ - org.apache.taglibs.standard.tag.rt.sql;version="[2.2,3.0)", \ - org.apache.taglibs.standard.tag.rt.xml;version="[2.2,3.0)", \ - org.apache.taglibs.standard.tei;version="[2.2,3.0)", \ - org.apache.taglibs.standard.tlv;version="[2.2,3.0)", \ - org.apache.taglibs.standard;version="[2.2,3.0)" + javax.servlet.jsp.jstl.core;version="[1.2,2.0)", \ + javax.servlet.jsp.jstl.fmt;version="[1.2,2.0)", \ + javax.servlet.jsp.jstl.sql;version="[1.2,2.0)", \ + javax.servlet.jsp.jstl.tlv;version="[1.2,2.0)", \ + org.apache.taglibs.standard.functions;version="[1.2,2.0)", \ + org.apache.taglibs.standard.lang.jstl;version="[1.2,2.0)", \ + org.apache.taglibs.standard.lang.jstl.parser;version="[1.2,2.0)", \ + org.apache.taglibs.standard.lang.jstl.test;version="[1.2,2.0)", \ + org.apache.taglibs.standard.lang.jstl.test.beans;version="[1.2,2.0)", \ + org.apache.taglibs.standard.lang.support;version="[1.2,2.0)", \ + org.apache.taglibs.standard.resources;version="[1.2,2.0)", \ + org.apache.taglibs.standard.tag.common.core;version="[1.2,2.0)", \ + org.apache.taglibs.standard.tag.common.fmt;version="[1.2,2.0)", \ + org.apache.taglibs.standard.tag.common.sql;version="[1.2,2.0)", \ + org.apache.taglibs.standard.tag.common.xml;version="[1.2,2.0)", \ + org.apache.taglibs.standard.tag.el.core;version="[1.2,2.0)", \ + org.apache.taglibs.standard.tag.el.fmt;version="[1.2,2.0)", \ + org.apache.taglibs.standard.tag.el.sql;version="[1.2,2.0)", \ + org.apache.taglibs.standard.tag.el.xml;version="[1.2,2.0)", \ + org.apache.taglibs.standard.tag.rt.core;version="[1.2,2.0)", \ + org.apache.taglibs.standard.tag.rt.fmt;version="[1.2,2.0)", \ + org.apache.taglibs.standard.tag.rt.sql;version="[1.2,2.0)", \ + org.apache.taglibs.standard.tag.rt.xml;version="[1.2,2.0)", \ + org.apache.taglibs.standard.tei;version="[1.2,2.0)", \ + org.apache.taglibs.standard.tlv;version="[1.2,2.0)", \ + org.apache.taglibs.standard;version="[1.2,2.0)", \ + org.apache.taglibs.standard.extra.commons.collections;version="[1.2,2.0)", \ + org.apache.taglibs.standard.extra.commons.collections.iterators;version="[1.2,2.0)", \ + org.apache.taglibs.standard.extra.commons.collections.map;version="[1.2,2.0)", \ + org.apache.taglibs.standard.extra.spath;version="[1.2,2.0)" diff --git a/dev/com.ibm.ws.jsp/bnd.bnd b/dev/com.ibm.ws.jsp/bnd.bnd index 8bae1633d6a..23a667b22e3 100644 --- a/dev/com.ibm.ws.jsp/bnd.bnd +++ b/dev/com.ibm.ws.jsp/bnd.bnd @@ -6,7 +6,7 @@ # http://www.eclipse.org/legal/epl-v10.html # # Contributors: -# IBM Corporation - initial API and implementation +# IBM Corporation - initial API and implementation #******************************************************************************* -include= ~../cnf/resources/bnd/bundle.props bVersion=1.0 @@ -41,10 +41,10 @@ Service-Component: \ configuration-policy:=ignore;\ properties:="service.vendor=IBM,toType=com.ibm.ws.jsp.configuration.JspXmlExtConfig", \ com.ibm.ws.jsp.taglib.InjectionService; \ - implementation:=com.ibm.ws.jsp.taglib.InjectionServiceImpl; \ - provide:='com.ibm.wsspi.webcontainer.collaborator.WebAppInjectionClassListCollaborator'; \ - immediate:=true; \ - properties:="service.vendor=IBM" + implementation:=com.ibm.ws.jsp.taglib.InjectionServiceImpl; \ + provide:='com.ibm.wsspi.webcontainer.collaborator.WebAppInjectionClassListCollaborator'; \ + immediate:=true; \ + properties:="service.vendor=IBM" Export-Package: com.ibm.ws.jsp.runtime;version=2.2;thread-context=true, \ com.ibm.ws.jsp.jsx.tags;version=2.2;thread-context=true, \ @@ -60,20 +60,13 @@ Export-Package: com.ibm.ws.jsp.runtime;version=2.2;thread-context=true, \ com.ibm.ws.jsp.runtime.metadata;version=2.2, \ com.ibm.ws.jsp.webcontainerext;version=2.2, \ com.ibm.ws.jsp.webcontainerext.ws;version=2.2, \ - org.apache.taglibs.standard.tag.common.sql;version=2.3, \ - org.apache.taglibs.standard.tlv;thread-context=true;version=2.2, \ - org.apache.taglibs.standard.tei;thread-context=true;version=2.2, \ - org.apache.taglibs*;version=2.2, \ org.apache.jasper.compiler;thread-context=true;version=2.2, \ org.apache.jasper.runtime;thread-context=true;version=2.2 - Private-Package: \ com.ibm.ws.jsp.*, \ com.ibm.ws.webcontainer.jsp.runtime, \ com.ibm.wsspi.jsp.* - - Import-Package: \ junit.*;resolution:=optional, \ @@ -106,7 +99,6 @@ Import-Package: \ org.apache.el.parser;version="2.2", \ org.apache.el.util;version="2.2", \ org.apache.jasper.el;version="2.2", \ - !org.apache.xerces*, \ com.ibm.wsspi.el;version="2.2", \ org.eclipse.jdt.core.compiler;version="3.10.2";usage="JSP", \ org.eclipse.jdt.internal.compiler;version="3.10.2";usage="JSP", \ @@ -116,11 +108,9 @@ Import-Package: \ org.eclipse.jdt.internal.compiler.problem;version="3.10.2";usage="JSP", \ sun.io;resolution:=optional, \ * - + Include-Resource: \ @lib/bsf.jar, \ - @${repo;com.ibm.ws.javax.j2ee:jsp.tld.standard;1.2}, \ - @${repo;com.ibm.ws.org.apache:xalan;2.7.2}!/!META-INF/*, \ standard.jar=${repo;com.ibm.ws.javax.j2ee:standardtld;1.2}, \ ard.jar=lib/ard.jar, \ OSGI-INF=resources/OSGI-INF, \ @@ -133,7 +123,7 @@ Include-Resource: \ com/ibm/ws/jsp/translator/visitor/configuration/JspVisitorConfiguration.xml=src/com/ibm/ws/jsp/translator/visitor/configuration/JspVisitorConfiguration.xml, \ com/ibm/ws/jsp/translator/visitor/configuration/JspVisitorConfiguration.xsd=src/com/ibm/ws/jsp/translator/visitor/configuration/JspVisitorConfiguration.xsd, \ com/ibm/ws/jsp/taglib/config/TagLibCacheConfig.xsd=src/com/ibm/ws/jsp/taglib/config/TagLibCacheConfig.xsd - + IBM-Default-Config: OSGI-INF/wlp/defaultInstances.xml instrument.ffdc: false @@ -165,4 +155,5 @@ instrument.classesExcludes: com/ibm/ws/jsp/resources/*.class com.ibm.ws.org.apache.jasper.el.2.2;version=latest,\ com.ibm.ws.kernel.security.thread;version=latest,\ com.ibm.ws.artifact.url;version=latest, \ - com.ibm.ws.org.osgi.annotation.versioning;version=latest + com.ibm.ws.org.osgi.annotation.versioning;version=latest,\ + com.ibm.ws.org.apache.taglibs.standard;version=latest diff --git a/dev/com.ibm.ws.org.apache.taglibs.standard/.classpath b/dev/com.ibm.ws.org.apache.taglibs.standard/.classpath new file mode 100644 index 00000000000..976bfaa8b12 --- /dev/null +++ b/dev/com.ibm.ws.org.apache.taglibs.standard/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/dev/com.ibm.ws.org.apache.taglibs.standard/.project b/dev/com.ibm.ws.org.apache.taglibs.standard/.project new file mode 100644 index 00000000000..3b581dbcd73 --- /dev/null +++ b/dev/com.ibm.ws.org.apache.taglibs.standard/.project @@ -0,0 +1,23 @@ + + + com.ibm.ws.org.apache.taglibs.standard + + + + + + org.eclipse.jdt.core.javabuilder + + + + + bndtools.core.bndbuilder + + + + + + org.eclipse.jdt.core.javanature + bndtools.core.bndnature + + diff --git a/dev/com.ibm.ws.org.apache.taglibs.standard/.settings/bndtools.core.prefs b/dev/com.ibm.ws.org.apache.taglibs.standard/.settings/bndtools.core.prefs new file mode 100644 index 00000000000..789fa99991a --- /dev/null +++ b/dev/com.ibm.ws.org.apache.taglibs.standard/.settings/bndtools.core.prefs @@ -0,0 +1,2 @@ +compileErrorAction=build +eclipse.preferences.version=1 diff --git a/dev/com.ibm.ws.org.apache.taglibs.standard/.settings/org.eclipse.jdt.core.prefs b/dev/com.ibm.ws.org.apache.taglibs.standard/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..af07d5f5e54 --- /dev/null +++ b/dev/com.ibm.ws.org.apache.taglibs.standard/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,12 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/dev/com.ibm.ws.org.apache.taglibs.standard/bnd.bnd b/dev/com.ibm.ws.org.apache.taglibs.standard/bnd.bnd new file mode 100644 index 00000000000..4b75942e4d2 --- /dev/null +++ b/dev/com.ibm.ws.org.apache.taglibs.standard/bnd.bnd @@ -0,0 +1,34 @@ +#******************************************************************************* +# Copyright (c) 2020 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +#******************************************************************************* +-include= ~../cnf/resources/bnd/bundle.props +bVersion=1.0 + +Bundle-SymbolicName: com.ibm.ws.org.apache.taglibs.standard +Bundle-Description: JSTL Impl Version 1.2 + +Fragment-Host: com.ibm.ws.jsp + +Import-Package: \ + !org.apache.xml.*,\ + !org.apache.xerces*, \ + * + +Export-Package: \ + org.apache.taglibs.standard.tlv;thread-context=true;version=1.2, \ + org.apache.taglibs.standard.tei;thread-context=true;version=1.2, \ + org.apache.taglibs*;version=1.2 + +Include-Resource: \ + @${repo;com.ibm.ws.javax.j2ee:jsp.tld.standard;1.2}!/META-INF/*.tld,\ + @${repo;com.ibm.ws.org.apache:xalan;2.7.2}!/!META-INF/* + +-buildpath: \ + com.ibm.ws.javax.j2ee:jsp.tld.standard;version=1.2 diff --git a/dev/io.openliberty.org.apache.taglibs.standard/.classpath b/dev/io.openliberty.org.apache.taglibs.standard/.classpath new file mode 100644 index 00000000000..976bfaa8b12 --- /dev/null +++ b/dev/io.openliberty.org.apache.taglibs.standard/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/dev/io.openliberty.org.apache.taglibs.standard/.project b/dev/io.openliberty.org.apache.taglibs.standard/.project new file mode 100644 index 00000000000..7b2c987a108 --- /dev/null +++ b/dev/io.openliberty.org.apache.taglibs.standard/.project @@ -0,0 +1,23 @@ + + + io.openliberty.org.apache.taglibs.standard + + + + + + org.eclipse.jdt.core.javabuilder + + + + + bndtools.core.bndbuilder + + + + + + org.eclipse.jdt.core.javanature + bndtools.core.bndnature + + diff --git a/dev/io.openliberty.org.apache.taglibs.standard/.settings/bndtools.core.prefs b/dev/io.openliberty.org.apache.taglibs.standard/.settings/bndtools.core.prefs new file mode 100644 index 00000000000..789fa99991a --- /dev/null +++ b/dev/io.openliberty.org.apache.taglibs.standard/.settings/bndtools.core.prefs @@ -0,0 +1,2 @@ +compileErrorAction=build +eclipse.preferences.version=1 diff --git a/dev/io.openliberty.org.apache.taglibs.standard/.settings/org.eclipse.jdt.core.prefs b/dev/io.openliberty.org.apache.taglibs.standard/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..af07d5f5e54 --- /dev/null +++ b/dev/io.openliberty.org.apache.taglibs.standard/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,12 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/dev/io.openliberty.org.apache.taglibs.standard/bnd.bnd b/dev/io.openliberty.org.apache.taglibs.standard/bnd.bnd new file mode 100644 index 00000000000..6e983ce4988 --- /dev/null +++ b/dev/io.openliberty.org.apache.taglibs.standard/bnd.bnd @@ -0,0 +1,34 @@ +#******************************************************************************* +# Copyright (c) 2020 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +#******************************************************************************* +-include= ~../cnf/resources/bnd/bundle.props +bVersion=1.0 + +Bundle-SymbolicName: io.openliberty.org.apache.taglibs.standard +Bundle-Description: Jakarta Standard Tag Library Implementation, version 2.0 + +Fragment-Host: com.ibm.ws.jsp.jakarta + +Import-Package: \ + !com.oracle.wls.shaded.org.apache.xml.serialize,\ + !com.oracle.wls.shaded.org.apache.xml.serializer,\ + !org.apache.xerces*, \ + * + +Export-Package: \ + org.apache.taglibs.standard.tlv;thread-context=true;version=2.0, \ + org.apache.taglibs.standard.tei;thread-context=true;version=2.0, \ + org.apache.taglibs*;version=2.0,\ + +Private-Package: \ + com.oracle.wls.shaded.*,\ + +-buildpath: \ + org.glassfish.web:jakarta.servlet.jsp.jstl;version=2.0 diff --git a/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties b/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties index 3deafb4c509..0a2a71002f1 100644 --- a/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties +++ b/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties @@ -169,6 +169,32 @@ org.apache.myfaces.shared.util=org.apache.myfaces.shared.util org.apache.myfaces.spi=org.apache.myfaces.spi org.apache.myfaces.util=org.apache.myfaces.util org.apache.myfaces.webapp=org.apache.myfaces.webapp +org.apache.taglibs.standard.extra.commons.collections=org.apache.taglibs.standard.extra.commons.collections +org.apache.taglibs.standard.extra.commons.collections.iterators=org.apache.taglibs.standard.extra.commons.collections.iterators +org.apache.taglibs.standard.extra.commons.collections.map=org.apache.taglibs.standard.extra.commons.collections.map +org.apache.taglibs.standard.extra.spath=org.apache.taglibs.standard.extra.spath +org.apache.taglibs.standard.functions=org.apache.taglibs.standard.functions +org.apache.taglibs.standard.lang.jstl=org.apache.taglibs.standard.lang.jstl +org.apache.taglibs.standard.lang.jstl.parser=org.apache.taglibs.standard.lang.jstl.parser +org.apache.taglibs.standard.lang.jstl.test=org.apache.taglibs.standard.lang.jstl.test +org.apache.taglibs.standard.lang.jstl.test.beans=org.apache.taglibs.standard.lang.jstl.test.beans +org.apache.taglibs.standard.lang.support=org.apache.taglibs.standard.lang.support +org.apache.taglibs.standard.resources=org.apache.taglibs.standard.resources +org.apache.taglibs.standard.tag.common.core=org.apache.taglibs.standard.tag.common.core +org.apache.taglibs.standard.tag.common.fmt=org.apache.taglibs.standard.tag.common.fmt +org.apache.taglibs.standard.tag.common.sql=org.apache.taglibs.standard.tag.common.sql +org.apache.taglibs.standard.tag.common.xml=org.apache.taglibs.standard.tag.common.xml +org.apache.taglibs.standard.tag.el.core=org.apache.taglibs.standard.tag.el.core +org.apache.taglibs.standard.tag.el.fmt=org.apache.taglibs.standard.tag.el.fmt +org.apache.taglibs.standard.tag.el.sql=org.apache.taglibs.standard.tag.el.sql +org.apache.taglibs.standard.tag.el.xml=org.apache.taglibs.standard.tag.el.xml +org.apache.taglibs.standard.tag.rt.core=org.apache.taglibs.standard.tag.rt.core +org.apache.taglibs.standard.tag.rt.fmt=org.apache.taglibs.standard.tag.rt.fmt +org.apache.taglibs.standard.tag.rt.sql=org.apache.taglibs.standard.tag.rt.sql +org.apache.taglibs.standard.tag.rt.xml=org.apache.taglibs.standard.tag.rt.xml +org.apache.taglibs.standard.tei=org.apache.taglibs.standard.tei +org.apache.taglibs.standard.tlv=org.apache.taglibs.standard.tlv +org.apache.taglibs.standard=org.apache.taglibs.standard org.hibernate.validator=org.hibernate.validator org.hibernate.validator.cdi.internal=org.hibernate.validator.cdi.internal org.hibernate.validator.cdi=org.hibernate.validator.cdi From 370e052000f6d26bfdcf8209dbfe693fae55e140 Mon Sep 17 00:00:00 2001 From: Volodymyr Siedlecki Date: Mon, 4 Jan 2021 16:29:38 -0500 Subject: [PATCH 2/5] Create io.openliberty.jstl.facade as part of JSTL refactoring --- .../io.openliberty.pages-3.0.feature | 2 +- dev/com.ibm.ws.jsp.jstl.facade/bnd.bnd | 2 - dev/io.openliberty.jstl.facade/.classpath | 6 +++ dev/io.openliberty.jstl.facade/.gitignore | 2 + dev/io.openliberty.jstl.facade/.project | 23 ++++++++ .../.settings/bndtools.core.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 11 ++++ dev/io.openliberty.jstl.facade/bnd.bnd | 52 +++++++++++++++++++ .../rules/jakarta-renames.properties | 27 ---------- 9 files changed, 97 insertions(+), 30 deletions(-) create mode 100644 dev/io.openliberty.jstl.facade/.classpath create mode 100644 dev/io.openliberty.jstl.facade/.gitignore create mode 100644 dev/io.openliberty.jstl.facade/.project create mode 100644 dev/io.openliberty.jstl.facade/.settings/bndtools.core.prefs create mode 100644 dev/io.openliberty.jstl.facade/.settings/org.eclipse.jdt.core.prefs create mode 100644 dev/io.openliberty.jstl.facade/bnd.bnd diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/pages-3.0/io.openliberty.pages-3.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/pages-3.0/io.openliberty.pages-3.0.feature index 4281bfb948a..1de561a4d42 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/pages-3.0/io.openliberty.pages-3.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/pages-3.0/io.openliberty.pages-3.0.feature @@ -41,7 +41,7 @@ Subsystem-Name: Jakarta Server Pages 3.0 io.openliberty.jakarta.jstl.2.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:2.0.0", \ com.ibm.ws.jsp.2.3.jakarta, \ com.ibm.ws.jsp.jakarta, \ - com.ibm.ws.jsp.jstl.facade.jakarta; start-phase:=CONTAINER_EARLY, \ + io.openliberty.jstl.facade; start-phase:=CONTAINER_EARLY, \ io.openliberty.org.apache.taglibs.standard -jars=com.ibm.websphere.appserver.spi.jsp; location:=dev/spi/ibm/, \ com.ibm.websphere.javaee.jsp.tld.2.2.jakarta; location:=dev/api/spec/ diff --git a/dev/com.ibm.ws.jsp.jstl.facade/bnd.bnd b/dev/com.ibm.ws.jsp.jstl.facade/bnd.bnd index d74f5fae322..f8442c931c1 100644 --- a/dev/com.ibm.ws.jsp.jstl.facade/bnd.bnd +++ b/dev/com.ibm.ws.jsp.jstl.facade/bnd.bnd @@ -18,8 +18,6 @@ Bundle-Description: facade to provide a classloader for our internal jstl classe Provide-Capability: com.ibm.ws.jsp.jstl.facade -jakartaeeMe: true - Import-Package: \ javax.el;version="[2.2.0,4.0.0)", \ javax.servlet.jsp;version="[2.2,3.0)", \ diff --git a/dev/io.openliberty.jstl.facade/.classpath b/dev/io.openliberty.jstl.facade/.classpath new file mode 100644 index 00000000000..bd52baaf243 --- /dev/null +++ b/dev/io.openliberty.jstl.facade/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/dev/io.openliberty.jstl.facade/.gitignore b/dev/io.openliberty.jstl.facade/.gitignore new file mode 100644 index 00000000000..57b341172a1 --- /dev/null +++ b/dev/io.openliberty.jstl.facade/.gitignore @@ -0,0 +1,2 @@ +/bin/ +/generated/ diff --git a/dev/io.openliberty.jstl.facade/.project b/dev/io.openliberty.jstl.facade/.project new file mode 100644 index 00000000000..becc339525e --- /dev/null +++ b/dev/io.openliberty.jstl.facade/.project @@ -0,0 +1,23 @@ + + + io.openliberty.jstl.facade + + + + + + org.eclipse.jdt.core.javabuilder + + + + + bndtools.core.bndbuilder + + + + + + org.eclipse.jdt.core.javanature + bndtools.core.bndnature + + diff --git a/dev/io.openliberty.jstl.facade/.settings/bndtools.core.prefs b/dev/io.openliberty.jstl.facade/.settings/bndtools.core.prefs new file mode 100644 index 00000000000..789fa99991a --- /dev/null +++ b/dev/io.openliberty.jstl.facade/.settings/bndtools.core.prefs @@ -0,0 +1,2 @@ +compileErrorAction=build +eclipse.preferences.version=1 diff --git a/dev/io.openliberty.jstl.facade/.settings/org.eclipse.jdt.core.prefs b/dev/io.openliberty.jstl.facade/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..3a21537071b --- /dev/null +++ b/dev/io.openliberty.jstl.facade/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/dev/io.openliberty.jstl.facade/bnd.bnd b/dev/io.openliberty.jstl.facade/bnd.bnd new file mode 100644 index 00000000000..428a3c5e647 --- /dev/null +++ b/dev/io.openliberty.jstl.facade/bnd.bnd @@ -0,0 +1,52 @@ +#******************************************************************************* +# Copyright (c) 2020 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +#******************************************************************************* + +-include= ~../cnf/resources/bnd/bundle.props +bVersion=1.0 + +Bundle-SymbolicName: io.openliberty.jstl.facade +Bundle-Description: facade to provide a classloader for our internal jstl classes for osgi application jsp backwards compatibility; version=${bVersion} + +# Must provide same capability as the com.ibm.ws.jsp.jstl.facade bundle +Provide-Capability: com.ibm.ws.jsp.jstl.facade + +Import-Package: \ + jakarta.el;version="[4.0,5.0)", \ + jakarta.servlet.jsp;version="[3.0,4.0)", \ + jakarta.servlet.jsp.el;version="[3.0,4.0)", \ + jakarta.servlet.jsp.resources;version="[3.0,4.0)", \ + jakarta.servlet.jsp.tagext;version="[3.0,4.0)", \ + jakarta.servlet.jsp.jstl.core;version="[2.0,3.0)", \ + jakarta.servlet.jsp.jstl.fmt;version="[2.0,3.0)", \ + jakarta.servlet.jsp.jstl.sql;version="[2.0,3.0)", \ + jakarta.servlet.jsp.jstl.tlv;version="[2.0,3.0)", \ + org.apache.taglibs.standard.functions;version="[2.0,3.0)", \ + org.apache.taglibs.standard.lang.jstl;version="[2.0,3.0)", \ + org.apache.taglibs.standard.lang.jstl.parser;version="[2.0,3.0)", \ + org.apache.taglibs.standard.lang.jstl.test;version="[2.0,3.0)", \ + org.apache.taglibs.standard.lang.jstl.test.beans;version="[2.0,3.0)", \ + org.apache.taglibs.standard.lang.support;version="[2.0,3.0)", \ + org.apache.taglibs.standard.resources;version="[2.0,3.0)", \ + org.apache.taglibs.standard.tag.common.core;version="[2.0,3.0)", \ + org.apache.taglibs.standard.tag.common.fmt;version="[2.0,3.0)", \ + org.apache.taglibs.standard.tag.common.sql;version="[2.0,3.0)", \ + org.apache.taglibs.standard.tag.common.xml;version="[2.0,3.0)", \ + org.apache.taglibs.standard.tag.el.core;version="[2.0,3.0)", \ + org.apache.taglibs.standard.tag.el.fmt;version="[2.0,3.0)", \ + org.apache.taglibs.standard.tag.el.sql;version="[2.0,3.0)", \ + org.apache.taglibs.standard.tag.el.xml;version="[2.0,3.0)", \ + org.apache.taglibs.standard.tag.rt.core;version="[2.0,3.0)", \ + org.apache.taglibs.standard.tag.rt.fmt;version="[2.0,3.0)", \ + org.apache.taglibs.standard.tag.rt.sql;version="[2.0,3.0)", \ + org.apache.taglibs.standard.tag.rt.xml;version="[2.0,3.0)", \ + org.apache.taglibs.standard.tei;version="[2.0,3.0)", \ + org.apache.taglibs.standard.tlv;version="[2.0,3.0)", \ + org.apache.taglibs.standard;version="[2.0,3.0)" diff --git a/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties b/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties index 0a2a71002f1..e2b3dc3fa4a 100644 --- a/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties +++ b/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties @@ -169,32 +169,6 @@ org.apache.myfaces.shared.util=org.apache.myfaces.shared.util org.apache.myfaces.spi=org.apache.myfaces.spi org.apache.myfaces.util=org.apache.myfaces.util org.apache.myfaces.webapp=org.apache.myfaces.webapp -org.apache.taglibs.standard.extra.commons.collections=org.apache.taglibs.standard.extra.commons.collections -org.apache.taglibs.standard.extra.commons.collections.iterators=org.apache.taglibs.standard.extra.commons.collections.iterators -org.apache.taglibs.standard.extra.commons.collections.map=org.apache.taglibs.standard.extra.commons.collections.map -org.apache.taglibs.standard.extra.spath=org.apache.taglibs.standard.extra.spath -org.apache.taglibs.standard.functions=org.apache.taglibs.standard.functions -org.apache.taglibs.standard.lang.jstl=org.apache.taglibs.standard.lang.jstl -org.apache.taglibs.standard.lang.jstl.parser=org.apache.taglibs.standard.lang.jstl.parser -org.apache.taglibs.standard.lang.jstl.test=org.apache.taglibs.standard.lang.jstl.test -org.apache.taglibs.standard.lang.jstl.test.beans=org.apache.taglibs.standard.lang.jstl.test.beans -org.apache.taglibs.standard.lang.support=org.apache.taglibs.standard.lang.support -org.apache.taglibs.standard.resources=org.apache.taglibs.standard.resources -org.apache.taglibs.standard.tag.common.core=org.apache.taglibs.standard.tag.common.core -org.apache.taglibs.standard.tag.common.fmt=org.apache.taglibs.standard.tag.common.fmt -org.apache.taglibs.standard.tag.common.sql=org.apache.taglibs.standard.tag.common.sql -org.apache.taglibs.standard.tag.common.xml=org.apache.taglibs.standard.tag.common.xml -org.apache.taglibs.standard.tag.el.core=org.apache.taglibs.standard.tag.el.core -org.apache.taglibs.standard.tag.el.fmt=org.apache.taglibs.standard.tag.el.fmt -org.apache.taglibs.standard.tag.el.sql=org.apache.taglibs.standard.tag.el.sql -org.apache.taglibs.standard.tag.el.xml=org.apache.taglibs.standard.tag.el.xml -org.apache.taglibs.standard.tag.rt.core=org.apache.taglibs.standard.tag.rt.core -org.apache.taglibs.standard.tag.rt.fmt=org.apache.taglibs.standard.tag.rt.fmt -org.apache.taglibs.standard.tag.rt.sql=org.apache.taglibs.standard.tag.rt.sql -org.apache.taglibs.standard.tag.rt.xml=org.apache.taglibs.standard.tag.rt.xml -org.apache.taglibs.standard.tei=org.apache.taglibs.standard.tei -org.apache.taglibs.standard.tlv=org.apache.taglibs.standard.tlv -org.apache.taglibs.standard=org.apache.taglibs.standard org.hibernate.validator=org.hibernate.validator org.hibernate.validator.cdi.internal=org.hibernate.validator.cdi.internal org.hibernate.validator.cdi=org.hibernate.validator.cdi @@ -282,4 +256,3 @@ com.sun.xml.internal.messaging.saaj.soap.name=com.sun.xml.messaging.saaj.soap.na com.sun.xml.internal.messaging.saaj.util=com.sun.xml.messaging.saaj.util com.sun.xml.internal.messaging.saaj.util.stax=com.sun.xml.messaging.saaj.util.stax com.sun.xml.internal.messaging.saaj.util.transform=com.sun.xml.messaging.saaj.util.transform - From f4c8fb1c742c26ae516bff156c770aed8fc1d22a Mon Sep 17 00:00:00 2001 From: Volodymyr Siedlecki Date: Tue, 5 Jan 2021 15:22:41 -0500 Subject: [PATCH 3/5] Add JSTL Impl Sources Jar --- .../build.gradle | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 dev/io.openliberty.org.apache.taglibs.standard/build.gradle diff --git a/dev/io.openliberty.org.apache.taglibs.standard/build.gradle b/dev/io.openliberty.org.apache.taglibs.standard/build.gradle new file mode 100644 index 00000000000..e46b1fc251f --- /dev/null +++ b/dev/io.openliberty.org.apache.taglibs.standard/build.gradle @@ -0,0 +1,43 @@ +/******************************************************************************* + * Copyright (c) 2021 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +// Local vars +File downloadSrcDir = project.file('build/source') + +configurations { + sourceJar +} + +dependencies { + sourceJar 'org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0:sources' + +} + +task copySource(type: Copy) { + from configurations.sourceJar + into downloadSrcDir +} + +assemble { + dependsOn copySource +} + +task deleteJars(type:Delete) { + doLast { + println "deleteJars task, deleting " + downloadSrcDir + file(downloadSrcDir).deleteDir() + } +} + +clean { + dependsOn deleteJars +} + From ba21a246a6e407b90be8be037cc9f18489f4e2a7 Mon Sep 17 00:00:00 2001 From: Volodymyr Siedlecki Date: Tue, 5 Jan 2021 15:26:07 -0500 Subject: [PATCH 4/5] Update copyrights to 2021 --- dev/com.ibm.ws.jsp.jstl.facade/bnd.bnd | 2 +- dev/com.ibm.ws.jsp/bnd.bnd | 2 +- dev/com.ibm.ws.org.apache.taglibs.standard/bnd.bnd | 2 +- dev/io.openliberty.jstl.facade/bnd.bnd | 2 +- dev/io.openliberty.org.apache.taglibs.standard/bnd.bnd | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/com.ibm.ws.jsp.jstl.facade/bnd.bnd b/dev/com.ibm.ws.jsp.jstl.facade/bnd.bnd index f8442c931c1..a5ab296e320 100644 --- a/dev/com.ibm.ws.jsp.jstl.facade/bnd.bnd +++ b/dev/com.ibm.ws.jsp.jstl.facade/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2017, 2020 IBM Corporation and others. +# Copyright (c) 2017, 2021 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at diff --git a/dev/com.ibm.ws.jsp/bnd.bnd b/dev/com.ibm.ws.jsp/bnd.bnd index 23a667b22e3..3ceda7dd76c 100644 --- a/dev/com.ibm.ws.jsp/bnd.bnd +++ b/dev/com.ibm.ws.jsp/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2017, 2020 IBM Corporation and others. +# Copyright (c) 2017, 2021 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at diff --git a/dev/com.ibm.ws.org.apache.taglibs.standard/bnd.bnd b/dev/com.ibm.ws.org.apache.taglibs.standard/bnd.bnd index 4b75942e4d2..5f9c7a30c86 100644 --- a/dev/com.ibm.ws.org.apache.taglibs.standard/bnd.bnd +++ b/dev/com.ibm.ws.org.apache.taglibs.standard/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2020 IBM Corporation and others. +# Copyright (c) 2021 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at diff --git a/dev/io.openliberty.jstl.facade/bnd.bnd b/dev/io.openliberty.jstl.facade/bnd.bnd index 428a3c5e647..0eb7612c0f5 100644 --- a/dev/io.openliberty.jstl.facade/bnd.bnd +++ b/dev/io.openliberty.jstl.facade/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2020 IBM Corporation and others. +# Copyright (c) 2021 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at diff --git a/dev/io.openliberty.org.apache.taglibs.standard/bnd.bnd b/dev/io.openliberty.org.apache.taglibs.standard/bnd.bnd index 6e983ce4988..e5e8c513f2c 100644 --- a/dev/io.openliberty.org.apache.taglibs.standard/bnd.bnd +++ b/dev/io.openliberty.org.apache.taglibs.standard/bnd.bnd @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2020 IBM Corporation and others. +# Copyright (c) 2021 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at From 35f537af59ed01a6cfc080fa707d480b210ab0e1 Mon Sep 17 00:00:00 2001 From: Volodymyr Siedlecki Date: Wed, 13 Jan 2021 13:08:00 -0500 Subject: [PATCH 5/5] Update Taglib Bnds --- dev/io.openliberty.org.apache.taglibs.standard/bnd.bnd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/io.openliberty.org.apache.taglibs.standard/bnd.bnd b/dev/io.openliberty.org.apache.taglibs.standard/bnd.bnd index e5e8c513f2c..c9835f7dfbb 100644 --- a/dev/io.openliberty.org.apache.taglibs.standard/bnd.bnd +++ b/dev/io.openliberty.org.apache.taglibs.standard/bnd.bnd @@ -25,10 +25,10 @@ Import-Package: \ Export-Package: \ org.apache.taglibs.standard.tlv;thread-context=true;version=2.0, \ org.apache.taglibs.standard.tei;thread-context=true;version=2.0, \ - org.apache.taglibs*;version=2.0,\ + org.apache.taglibs*;version=2.0 -Private-Package: \ - com.oracle.wls.shaded.*,\ +-privatepackage: \ + com.oracle.wls.shaded.* -buildpath: \ org.glassfish.web:jakarta.servlet.jsp.jstl;version=2.0