mirror of
https://github.com/jetty/jetty.project.git
synced 2025-02-24 00:17:18 +00:00
3efefe37bc
Upgrade to the latest pax-exam
Support for felix-3.x and 4.x as tested
Fix the spdy MANIFEST.MF generations
Add an integration test for SPDY
Refactor the test code
Squashed commit of the following:
commit bd020ee1214992d8d21a11dc800e04dc5e9b2001
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Sat Oct 6 16:58:43 2012 +0800
Add spdy integration test for OSGi and clean-up
Refacor the pax-exam OSGi integration tests
Add an integration test for spdy.
Execute the test under 2 versions of felix and 2 versions of equinox.
commit f3151a272ab92560432f3b76f564bf06b19bc22b
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Sat Oct 6 16:28:51 2012 +0800
Fix the generated MANIFEST.MF
OSGi integration test in the next commit.
commit 3152aa2b5e39cf2d3b81f8400488c0672e922b8d
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Fri Oct 5 16:58:29 2012 +0800
Fix the startup of the servlet.
setInitOrder(0) was working in jetty-7 and jetty-8 but not in jetty-9
anymore. setInitOrder(1) is fine.
commit 8038d314f4f423e8608fd09dd42b840e101a0c13
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Thu Oct 4 17:53:28 2012 +0800
Upgrade to pax-exam-2.6
commit 7136fa88e2410ac345b6ae0657d882c7e9714c0b
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Thu Oct 4 17:53:07 2012 +0800
Support for felix-3.x and felix-4.x
commit 0bcc6b0d8ed5144150f90f578a90c558419349d1
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Thu Oct 4 17:53:28 2012 +0800
Upgrade to pax-exam-2.6
commit 2e17466624650df433b6c5f11abafb56539ee740
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Thu Oct 4 17:53:07 2012 +0800
Support for felix-3.x and felix-4.x
108 lines
3.5 KiB
XML
108 lines
3.5 KiB
XML
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
|
<parent>
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
<artifactId>jetty-project</artifactId>
|
|
<version>9.0.0-SNAPSHOT</version>
|
|
</parent>
|
|
<modelVersion>4.0.0</modelVersion>
|
|
<artifactId>jetty-plus</artifactId>
|
|
<name>Jetty :: Plus</name>
|
|
<description>Jetty JavaEE style services</description>
|
|
<properties>
|
|
<bundle-symbolic-name>${project.groupId}.plus</bundle-symbolic-name>
|
|
</properties>
|
|
<build>
|
|
<plugins>
|
|
<!--
|
|
COMMENTED OUT UNTIL CORRECT CONFIG IS FOUND FOR Export uses clauses
|
|
-->
|
|
<plugin>
|
|
<groupId>org.apache.felix</groupId>
|
|
<artifactId>maven-bundle-plugin</artifactId>
|
|
<extensions>true</extensions>
|
|
<executions>
|
|
<execution>
|
|
<goals>
|
|
<goal>manifest</goal>
|
|
</goals>
|
|
<configuration>
|
|
<instructions>
|
|
<_versionpolicy> </_versionpolicy>
|
|
<Import-Package>javax.sql.*,javax.security.*,javax.naming.*,
|
|
javax.servlet.*;version="2.6.0",javax.transaction.*;version="[1.1,1.2)",
|
|
*</Import-Package>
|
|
</instructions>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-jar-plugin</artifactId>
|
|
<configuration>
|
|
<archive>
|
|
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
|
</archive>
|
|
</configuration>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-assembly-plugin</artifactId>
|
|
<executions>
|
|
<execution>
|
|
<phase>package</phase>
|
|
<goals>
|
|
<goal>single</goal>
|
|
</goals>
|
|
<configuration>
|
|
<descriptorRefs>
|
|
<descriptorRef>config</descriptorRef>
|
|
</descriptorRefs>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
<!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
|
|
with a snapshot. -->
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-source-plugin</artifactId>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<artifactId>findbugs-maven-plugin</artifactId>
|
|
<configuration>
|
|
<onlyAnalyze>org.eclipse.jetty.plus.*</onlyAnalyze>
|
|
</configuration>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>org.apache.derby</groupId>
|
|
<artifactId>derby</artifactId>
|
|
<version>10.1.2.1</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty.toolchain</groupId>
|
|
<artifactId>jetty-test-helper</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty.orbit</groupId>
|
|
<artifactId>javax.transaction</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
<artifactId>jetty-webapp</artifactId>
|
|
<version>${project.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
<artifactId>jetty-jndi</artifactId>
|
|
<version>${project.version}</version>
|
|
</dependency>
|
|
</dependencies>
|
|
</project>
|