Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugues Malphettes2011-05-10 10:13:48 +0000
committerHugues Malphettes2011-05-10 10:13:48 +0000
commit26a2806d0e71e64dc8f42b223cd6e2fe69244f10 (patch)
tree66db40927ad3239056fb976ab8e33c356faebfc3
parent8f4a3371f8f2f96cdac9377b06bd9f8d19e411c5 (diff)
downloadorg.eclipse.jetty.project-26a2806d0e71e64dc8f42b223cd6e2fe69244f10.tar.gz
org.eclipse.jetty.project-26a2806d0e71e64dc8f42b223cd6e2fe69244f10.tar.xz
org.eclipse.jetty.project-26a2806d0e71e64dc8f42b223cd6e2fe69244f10.zip
jetty-osgi-jsp does compile correctly.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/branches/jetty-8@3112 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--jetty-osgi/jetty-osgi-boot/pom.xml56
-rw-r--r--jetty-osgi/pom.xml2
2 files changed, 1 insertions, 57 deletions
diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml
index a973c108e2..53c5778daf 100644
--- a/jetty-osgi/jetty-osgi-boot/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot/pom.xml
@@ -36,62 +36,6 @@
</dependency>
</dependencies>
- <!--build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <configuration>
- <tasks>
- <replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 8.0.0.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
- <copy todir="target/classes/jettyhome">
- <fileset dir="jettyhome">
- <exclude name="**/*.log" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>artifact-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive>
- <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <onlyAnalyze>org.eclipse.jetty.osgi.boot.*</onlyAnalyze>
- </configuration>
- </plugin>
- </plugins>
- </build-->
-
<build>
<plugins>
<plugin>
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index 1883950dec..5de744bed5 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -20,7 +20,7 @@
<modules>
<module>jetty-osgi-boot</module>
<!-- remove until we update the code to make it work with the jsp-2.2 jars -->
- <!-- module>jetty-osgi-boot-jsp</module -->
+ <module>jetty-osgi-boot-jsp</module>
<module>jetty-osgi-boot-warurl</module>
<module>jetty-osgi-httpservice</module>
<!--module>test-jetty-osgi</module-->

Back to the top