diff options
| author | Jesse McConnell | 2012-02-01 23:25:08 +0000 |
|---|---|---|
| committer | Jesse McConnell | 2012-02-01 23:25:08 +0000 |
| commit | 6b079ae3d8eb0ef521ccc128078a7bcad805b9e3 (patch) | |
| tree | 42d9e64a3f39b33d0900b04ac5dbdcad2cd0cdb5 /test-jetty-webapp | |
| parent | 730a35ce5255e58e3e75866638d979b49e9cb20a (diff) | |
| parent | b88f5720a37cd01af6cc8dcbfca69d82fbb5c0b1 (diff) | |
| download | org.eclipse.jetty.project-6b079ae3d8eb0ef521ccc128078a7bcad805b9e3.tar.gz org.eclipse.jetty.project-6b079ae3d8eb0ef521ccc128078a7bcad805b9e3.tar.xz org.eclipse.jetty.project-6b079ae3d8eb0ef521ccc128078a7bcad805b9e3.zip | |
merge from master
Diffstat (limited to 'test-jetty-webapp')
| -rw-r--r-- | test-jetty-webapp/pom.xml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml index 520a540878..e773b3cc32 100644 --- a/test-jetty-webapp/pom.xml +++ b/test-jetty-webapp/pom.xml @@ -42,9 +42,9 @@ <descriptors> <descriptor>src/main/assembly/web-bundle.xml</descriptor> </descriptors> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - </archive> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> </configuration> </execution> </executions> @@ -63,10 +63,10 @@ <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> <configuration> - <supportedProjectTypes> - <supportedProjectType>war</supportedProjectType> - </supportedProjectTypes> - </configuration> + <supportedProjectTypes> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + </configuration> <executions> <execution> <id>bundle-manifest</id> @@ -77,7 +77,7 @@ <configuration> <instructions> <Bundle-SymbolicName>org.eclipse.jetty.test-jetty-webapp</Bundle-SymbolicName> - <Import-Package>javax.servlet.jsp.*;version="2.2.0",javax.servlet.*;version="2.6.0",org.eclipse.jetty.servlets,*</Import-Package> + <Import-Package>javax.servlet,org.eclipse.jetty.servlets,*</Import-Package> <Export-Package>!com.acme*</Export-Package> <!-- the test webapp is configured via a jetty xml file in order to add the security handler. --> @@ -162,11 +162,11 @@ <artifactId>jetty-servlets</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>${servlet.spec.groupId}</groupId> - <artifactId>${servlet.spec.artifactId}</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-websocket</artifactId> |