Author: olli
Date: Tue Jan 31 19:39:47 2017
New Revision: 1781150
URL: http://svn.apache.org/viewvc?rev=1781150&view=rev
Log:
SLING-6502 JSP: java.lang.VerifyError (Bad type on operand stack)
remove el-api and jsp-api from bundle
Modified:
sling/trunk/bundles/scripting/jsp/pom.xml
Modified: sling/trunk/bundles/scripting/jsp/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/pom.xml?rev=1781150&r1=1781149&r2=1781150&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/pom.xml (original)
+++ sling/trunk/bundles/scripting/jsp/pom.xml Tue Jan 31 19:39:47 2017
@@ -49,12 +49,7 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.sling.scripting.jsp.jasper.runtime;
- org.apache.sling.scripting.jsp.util;version=2.0.8,
- javax.el; javax.servlet.jsp;
- javax.servlet.jsp.el;
- javax.servlet.jsp.resources;
- javax.servlet.jsp.tagext;version=2.1
+ org.apache.sling.scripting.jsp.util;version=2.0.8
</Export-Package>
<Private-Package>
org.apache.sling.scripting.jsp.*,
@@ -64,11 +59,8 @@
<ScriptEngine-Name>${project.name}</ScriptEngine-Name>
<ScriptEngine-Version>${project.version}</ScriptEngine-Version>
- <!-- Embed EL and JSP API -->
<Embed-Dependency>
jasper-el,
- el-api,
- jsp-api,
org.apache.sling.commons.osgi;inline="org/apache/sling/commons/osgi/PropertiesUtil.*"
</Embed-Dependency>
<Embed-StripGroup>true</Embed-StripGroup>
@@ -92,14 +84,28 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>javax.servlet.jsp-api</artifactId>
+ <version>2.2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>javax.el-api</artifactId>
+ <version>2.2.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -125,23 +131,12 @@
<version>2.1.0</version>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jsp-api</artifactId>
- <version>6.0.14</version>
- </dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper-el</artifactId>
<version>6.0.14</version>
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>el-api</artifactId>
- <version>6.0.14</version>
- </dependency>
- <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.compiler</artifactId>
<version>2.2.0</version>
