|
|
e8eb3e3 |
From 32ba8f2a4688759640570ba3b99d969a2ef53b55 Mon Sep 17 00:00:00 2001
|
|
Stanislav Ochotnicky |
4e7b06c |
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
|
Stanislav Ochotnicky |
4e7b06c |
Date: Mon, 30 Apr 2012 16:24:57 +0200
|
|
|
e8eb3e3 |
Subject: [PATCH 7/8] disable jetty-osgi
|
|
|
a84f62a |
|
|
|
a84f62a |
---
|
|
Stanislav Ochotnicky |
4e7b06c |
jetty-jsp/pom.xml | 9 ++++++++-
|
|
Stanislav Ochotnicky |
4e7b06c |
pom.xml | 18 ------------------
|
|
Stanislav Ochotnicky |
4e7b06c |
2 files changed, 8 insertions(+), 19 deletions(-)
|
|
|
a84f62a |
|
|
Stanislav Ochotnicky |
4e7b06c |
diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml
|
|
|
e8eb3e3 |
index 305766d..03e9965 100644
|
|
Stanislav Ochotnicky |
4e7b06c |
--- a/jetty-jsp/pom.xml
|
|
Stanislav Ochotnicky |
4e7b06c |
+++ b/jetty-jsp/pom.xml
|
|
Stanislav Ochotnicky |
4e7b06c |
@@ -48,11 +48,18 @@
|
|
Stanislav Ochotnicky |
4e7b06c |
<artifactId>com.sun.el</artifactId>
|
|
Stanislav Ochotnicky |
4e7b06c |
<version>2.2.0.v201108011116</version>
|
|
Stanislav Ochotnicky |
4e7b06c |
</dependency>
|
|
Stanislav Ochotnicky |
4e7b06c |
-
|
|
Stanislav Ochotnicky |
4e7b06c |
+
|
|
Stanislav Ochotnicky |
4e7b06c |
+ glassfish
|
|
Stanislav Ochotnicky |
4e7b06c |
<dependency>
|
|
Stanislav Ochotnicky |
4e7b06c |
<groupId>org.eclipse.jetty.orbit</groupId>
|
|
Stanislav Ochotnicky |
4e7b06c |
<artifactId>org.eclipse.jdt.core</artifactId>
|
|
Stanislav Ochotnicky |
4e7b06c |
<version>3.7.1</version>
|
|
Stanislav Ochotnicky |
4e7b06c |
+ </dependency> -->
|
|
Stanislav Ochotnicky |
4e7b06c |
+
|
|
Stanislav Ochotnicky |
4e7b06c |
+ <dependency>
|
|
Stanislav Ochotnicky |
4e7b06c |
+ <groupId>org.glassfish.web</groupId>
|
|
Stanislav Ochotnicky |
4e7b06c |
+ <artifactId>javax.servlet.jsp</artifactId>
|
|
Stanislav Ochotnicky |
4e7b06c |
+ <version>2.2.3</version>
|
|
Stanislav Ochotnicky |
4e7b06c |
</dependency>
|
|
Stanislav Ochotnicky |
4e7b06c |
</dependencies>
|
|
Stanislav Ochotnicky |
4e7b06c |
</project>
|
|
|
a84f62a |
diff --git a/pom.xml b/pom.xml
|
|
|
e8eb3e3 |
index 9eb07e2..4575f76 100644
|
|
|
a84f62a |
--- a/pom.xml
|
|
|
a84f62a |
+++ b/pom.xml
|
|
|
e8eb3e3 |
@@ -351,7 +351,6 @@
|
|
|
a84f62a |
<module>jetty-start</module>
|
|
|
a84f62a |
<module>jetty-nested</module>
|
|
|
a84f62a |
<module>jetty-overlay-deployer</module>
|
|
|
a84f62a |
- <module>jetty-osgi</module>
|
|
|
a84f62a |
<module>jetty-nosql</module>
|
|
Stanislav Ochotnicky |
4e7b06c |
<module>jetty-http-spi</module>
|
|
Stanislav Ochotnicky |
4e7b06c |
<module>jetty-jsp</module>
|
|
|
e8eb3e3 |
@@ -543,23 +542,6 @@
|
|
|
a84f62a |
</modules>
|
|
|
a84f62a |
</profile>
|
|
|
a84f62a |
<profile>
|
|
|
a84f62a |
-
|
|
|
a84f62a |
- Moves the jetty-osgi build tree to a profile called 'osgi'.
|
|
|
a84f62a |
- It is active by default, but being in a profile allows it to be
|
|
|
a84f62a |
- disabled via the "-P-osgi" command line on maven (if need be).
|
|
|
a84f62a |
- -->
|
|
|
a84f62a |
- <id>osgi</id>
|
|
|
a84f62a |
- <activation>
|
|
|
a84f62a |
- <activeByDefault>true</activeByDefault>
|
|
|
a84f62a |
- <file>
|
|
|
a84f62a |
- <exists>${basedir}/pom.xml</exists>
|
|
|
a84f62a |
- </file>
|
|
|
a84f62a |
- </activation>
|
|
|
a84f62a |
- <modules>
|
|
|
a84f62a |
- <module>jetty-osgi</module>
|
|
|
a84f62a |
- </modules>
|
|
|
a84f62a |
- </profile>
|
|
|
a84f62a |
- <profile>
|
|
|
a84f62a |
<id>update-version</id>
|
|
|
a84f62a |
<build>
|
|
|
a84f62a |
<plugins>
|
|
|
a84f62a |
--
|
|
|
a84f62a |
1.7.7.6
|
|
|
a84f62a |
|