You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2017/09/02 18:15:26 UTC
[2/2] tomee git commit: Revert "TOMEE-1066 upgrade jstl"
Revert "TOMEE-1066 upgrade jstl"
This reverts commit 2c5c66b9a82f4d5100c6dc4704403afa48663d40.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/99d00f3e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/99d00f3e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/99d00f3e
Branch: refs/heads/tomee-1.7.x
Commit: 99d00f3ea1ee733b29b55b17f7f30a25ab0c6e38
Parents: b0b83b1
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Sat Sep 2 15:49:16 2017 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Sat Sep 2 15:49:16 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 +++++-
tomee/tomee-embedded/pom.xml | 6 +++---
tomee/tomee-webapp/pom.xml | 6 +++---
5 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/99d00f3e/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 c3223b0..18d9ed5 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
@@ -320,7 +320,7 @@ public class TldScanner {
try {
urlSet = URLs.cullSystemJars(urlSet);
- urlSet = applyBuiltinExcludes(urlSet, Filters.tokens("taglibs-standard-jstlel", "myfaces-impl", "javax.faces-2.", "spring-security-taglibs", "spring-webmvc"));
+ urlSet = applyBuiltinExcludes(urlSet, Filters.tokens("openejb-jstl-1.2", "myfaces-impl", "javax.faces-2.", "spring-security-taglibs", "spring-webmvc"));
} 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/99d00f3e/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 5a0cb26..54d67bf 100644
--- a/container/openejb-core/src/main/resources/default.exclusions
+++ b/container/openejb-core/src/main/resources/default.exclusions
@@ -147,6 +147,7 @@ openejb-javaagent
openejb-jee
openejb-jpa-integration
openejb-jsf
+openejb-jstl
openejb-loader
openejb-openwebbeans
openejb-provisionning
@@ -196,7 +197,6 @@ stax2-api-
surefire-
swizzle-
sxc-
-taglibs-standard-
testng-
tomcat-annotations
tomcat-api
http://git-wip-us.apache.org/repos/asf/tomee/blob/99d00f3e/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 2681115..42fe599 100644
--- a/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
+++ b/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
@@ -49,7 +49,11 @@ public class MoviesArquillianHtmlUnitTest {
@Deployment
public static WebArchive createDeployment() {
- Collection<String> dependencies = Arrays.asList("taglibs:standard", "commons-lang:commons-lang");
+ Collection<String> dependencies = Arrays.asList(new String[]{
+ "javax.servlet:jstl",
+ "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/99d00f3e/tomee/tomee-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/pom.xml b/tomee/tomee-embedded/pom.xml
index b7d6afe..2667f81 100644
--- a/tomee/tomee-embedded/pom.xml
+++ b/tomee/tomee-embedded/pom.xml
@@ -113,9 +113,9 @@
<groupId>commons-beanutils</groupId>
</dependency>
<dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-standard-jstlel</artifactId>
- <version>1.2.5</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/99d00f3e/tomee/tomee-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index 4dfaae1..40ebf3f 100644
--- a/tomee/tomee-webapp/pom.xml
+++ b/tomee/tomee-webapp/pom.xml
@@ -163,9 +163,9 @@
<version>${commons-beanutils.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-standard-jstlel</artifactId>
- <version>1.2.5</version>
+ <groupId>org.apache.openejb.patch</groupId>
+ <artifactId>openejb-jstl</artifactId>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>