Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 8268cf09b -> f5770688c
Remove jetty6 container integration that hasn't been used/built since 2.4.0 # Conflicts: # systests/container-integration/jetty6/pom.xml Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/884fe900 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/884fe900 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/884fe900 Branch: refs/heads/3.1.x-fixes Commit: 884fe900d5a0eed1a6d85c5d43e8b8bc0b3bcc51 Parents: 8268cf0 Author: Daniel Kulp <dk...@apache.org> Authored: Mon Aug 28 10:38:55 2017 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Tue Sep 5 10:10:20 2017 -0400 ---------------------------------------------------------------------- systests/container-integration/jetty6/pom.xml | 127 --------------------- 1 file changed, 127 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/884fe900/systests/container-integration/jetty6/pom.xml ---------------------------------------------------------------------- diff --git a/systests/container-integration/jetty6/pom.xml b/systests/container-integration/jetty6/pom.xml deleted file mode 100644 index 2b66a57..0000000 --- a/systests/container-integration/jetty6/pom.xml +++ /dev/null @@ -1,127 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.cxf.systests</groupId> - <artifactId>cxf-systests-container-integration</artifactId> - <version>2.4.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <groupId>org.apache.cxf.systests</groupId> - <artifactId>cxf-systests-ci-jetty6</artifactId> - <name>Apache CXF Container Integration Test Jetty6</name> - <description>Apache CXF Container Integration Test Jetty6</description> - <version>2.4.0-SNAPSHOT</version> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- disable surefire, all tests are failsafe --> - <excludes> - <exclude>**/**</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-war</id> - <phase>compile</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.cxf.systests</groupId> - <artifactId>cxf-systests-ci-webapp</artifactId> - <version>${project.version}</version> - <type>war</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}</outputDirectory> - <destFileName>hello.war</destFileName> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/wars</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <version>2.5</version> - <executions> - <execution> - <id>integration-test</id> - <goals> - <goal>integration-test</goal> - </goals> - </execution> - <execution> - <id>verify</id> - <goals> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.24</version> - <configuration> - <scanIntervalSeconds>10</scanIntervalSeconds> - <stopPort>8005</stopPort> - <stopKey>STOP</stopKey> - <contextPath>/</contextPath> - </configuration> - <executions> - <execution> - <id>start-jetty</id> - <phase>pre-integration-test</phase> - <goals> - <goal>run-war</goal> - </goals> - <configuration> - <webApp>${project.build.directory}/hello.war</webApp> - <scanIntervalSeconds>0</scanIntervalSeconds> - <daemon>true</daemon> - </configuration> - </execution> - <execution> - <id>stop-jetty</id> - <phase>post-integration-test</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project>
