Repository: tomee Updated Branches: refs/heads/master 0b37309e9 -> 938168f59
TOMEE-1066 upgrade jstl Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/938168f5 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/938168f5 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/938168f5 Branch: refs/heads/master Commit: 938168f59c5b929f14d923e47ed29a9d209444c5 Parents: 0b37309 Author: rmannibucau <[email protected]> Authored: Fri Mar 17 22:03:55 2017 +0100 Committer: rmannibucau <[email protected]> Committed: Fri Mar 17 22:03:55 2017 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/openejb/config/TldScanner.java | 2 +- container/openejb-core/src/main/resources/default.exclusions | 2 +- .../org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java | 6 +----- tck/cdi-embedded/pom.xml | 6 +++--- .../src/main/java/org/apache/tomee/jasper/TomEETldScanner.java | 4 ++-- tomee/tomee-embedded/pom.xml | 6 +++--- tomee/tomee-webapp/pom.xml | 6 +++--- 7 files changed, 14 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/938168f5/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java b/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java index 2d9a895..0666810 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java @@ -324,7 +324,7 @@ public class TldScanner { urlSet = URLs.cullSystemJars(urlSet); urlSet = applyBuiltinExcludes( urlSet, - Filters.tokens("openejb-jstl-1.2", "javax.faces-2.", "spring-security-taglibs", "spring-webmvc"), + Filters.tokens("taglibs-standard-jstlel", "javax.faces-2.", "spring-security-taglibs", "spring-webmvc"), Filters.prefixes("commons-jcs-", "myfaces-", "tomcat-websocket.jar")); // myfaces is hardcoded in tomee } catch (final IOException e) { DeploymentLoader.logger.warning("Error scanning class loader for JSP tag libraries", e); http://git-wip-us.apache.org/repos/asf/tomee/blob/938168f5/container/openejb-core/src/main/resources/default.exclusions ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/resources/default.exclusions b/container/openejb-core/src/main/resources/default.exclusions index 08090c0..311eb97 100644 --- a/container/openejb-core/src/main/resources/default.exclusions +++ b/container/openejb-core/src/main/resources/default.exclusions @@ -172,7 +172,6 @@ openejb-javaagent openejb-jee openejb-jpa-integration openejb-jsf -openejb-jstl openejb-loader openejb-openwebbeans openejb-provisionning @@ -223,6 +222,7 @@ sunec.jar surefire- swizzle- sxc- +taglibs-standard- testng- tomcat-annotations tomcat-api http://git-wip-us.apache.org/repos/asf/tomee/blob/938168f5/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java ---------------------------------------------------------------------- diff --git a/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java b/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java index 6ae1dd0..32b31d5 100644 --- a/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java +++ b/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java @@ -49,11 +49,7 @@ public class MoviesArquillianHtmlUnitTest { @Deployment public static WebArchive createDeployment() { - Collection<String> dependencies = Arrays.asList(new String[]{ - "javax.servlet:jstl", - "taglibs:standard", - "commons-lang:commons-lang" - }); + Collection<String> dependencies = Arrays.asList("taglibs:standard", "commons-lang:commons-lang"); File[] libs = Maven.resolver() .loadPomFromFile(Basedir.basedir("pom.xml")).resolve(dependencies) http://git-wip-us.apache.org/repos/asf/tomee/blob/938168f5/tck/cdi-embedded/pom.xml ---------------------------------------------------------------------- diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml index 00dc5b6..322c11d 100644 --- a/tck/cdi-embedded/pom.xml +++ b/tck/cdi-embedded/pom.xml @@ -64,9 +64,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.openejb.patch</groupId> - <artifactId>openejb-jstl</artifactId> - <version>1.2</version> + <groupId>org.apache.taglibs</groupId> + <artifactId>taglibs-standard-jstlel</artifactId> + <version>1.2.5</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/tomee/blob/938168f5/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEETldScanner.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEETldScanner.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEETldScanner.java index 3e60773..61a96a4 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEETldScanner.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEETldScanner.java @@ -39,7 +39,7 @@ import static org.apache.openejb.loader.JarLocation.jarLocation; public class TomEETldScanner extends TldScanner { private static final Paths PATHS = new Paths(null); private static final URL MYFACES_URL = findJar("myfaces-impl", "org.apache.myfaces.webapp.AbstractFacesInitializer"); - private static final URL JSTL_URL = findJar("openejb-jstl", "javax.servlet.jsp.jstl.core.ConditionalTagSupport"); + private static final URL JSTL_URL = findJar("taglibs-standard-jstlel", "javax.servlet.jsp.jstl.core.ConditionalTagSupport"); private static final Map<String, TldResourcePath> URI_TLD_RESOURCE = new HashMap<>(); private static final Map<TldResourcePath, TaglibXml> TLD_RESOURCE_TAG_LIB = new HashMap<>(); @@ -7215,7 +7215,7 @@ public class TomEETldScanner extends TldScanner { System.out.println("{"); System.out.println("final TldResourcePath path = new TldResourcePath(" + (entry.getValue().getUrl().toExternalForm().contains("myfaces")? "MYFACES_URL" : - (entry.getValue().getUrl().toExternalForm().contains("openejb-jstl")? "JSTL_URL" : "???")) + (entry.getValue().getUrl().toExternalForm().contains("taglibs-standard-jstlel")? "JSTL_URL" : "???")) + ", null, \"" + entry.getValue().getEntryName() + "\");"); System.out.println("URI_TLD_RESOURCE.put(\"" + entry.getKey() + "\", path);"); http://git-wip-us.apache.org/repos/asf/tomee/blob/938168f5/tomee/tomee-embedded/pom.xml ---------------------------------------------------------------------- diff --git a/tomee/tomee-embedded/pom.xml b/tomee/tomee-embedded/pom.xml index 7db2b3b..7247a2a 100644 --- a/tomee/tomee-embedded/pom.xml +++ b/tomee/tomee-embedded/pom.xml @@ -330,9 +330,9 @@ <groupId>commons-beanutils</groupId> </dependency> <dependency> - <groupId>org.apache.openejb.patch</groupId> - <artifactId>openejb-jstl</artifactId> - <version>1.2</version> + <groupId>org.apache.taglibs</groupId> + <artifactId>taglibs-standard-jstlel</artifactId> + <version>1.2.5</version> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> http://git-wip-us.apache.org/repos/asf/tomee/blob/938168f5/tomee/tomee-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml index e81b3ce..dc24cef 100644 --- a/tomee/tomee-webapp/pom.xml +++ b/tomee/tomee-webapp/pom.xml @@ -167,9 +167,9 @@ <version>${commons-beanutils.version}</version> </dependency> <dependency> - <groupId>org.apache.openejb.patch</groupId> - <artifactId>openejb-jstl</artifactId> - <version>1.2</version> + <groupId>org.apache.taglibs</groupId> + <artifactId>taglibs-standard-jstlel</artifactId> + <version>1.2.5</version> </dependency> <dependency> <groupId>${project.groupId}</groupId>
