From 82457b406b8198f26c470ee0b55485abdfd7b903 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Mon, 30 Apr 2012 16:24:57 +0200
Subject: [PATCH 7/7] disable jetty-osgi
---
jetty-jsp/pom.xml | 9 ++++++++-
pom.xml | 18 ------------------
2 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml
index 55e8d29..4a3a5a9 100644
--- a/jetty-jsp/pom.xml
+++ b/jetty-jsp/pom.xml
@@ -48,11 +48,18 @@
<artifactId>com.sun.el</artifactId>
<version>2.2.0.v201108011116</version>
</dependency>
- <!-- Eclipse Java Compiler (for JSP Compilation) -->
+ <!-- Eclipse Java Compiler (for JSP Compilation). Replaced by
+ glassfish
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.7.1</version>
+ </dependency> -->
+
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>javax.servlet.jsp</artifactId>
+ <version>2.2.3</version>
</dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 65cf13a..65abba7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -352,7 +352,6 @@
<module>jetty-start</module>
<module>jetty-nested</module>
<module>jetty-overlay-deployer</module>
- <module>jetty-osgi</module>
<module>jetty-nosql</module>
<module>jetty-http-spi</module>
<module>jetty-jsp</module>
@@ -545,23 +544,6 @@
</modules>
</profile>
<profile>
- <!--
- Moves the jetty-osgi build tree to a profile called 'osgi'.
- It is active by default, but being in a profile allows it to be
- disabled via the "-P-osgi" command line on maven (if need be).
- -->
- <id>osgi</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <file>
- <exists>${basedir}/pom.xml</exists>
- </file>
- </activation>
- <modules>
- <module>jetty-osgi</module>
- </modules>
- </profile>
- <profile>
<id>update-version</id>
<build>
<plugins>
--
1.7.7.6