updated jetty plugin

apilayer · Jul 29, 2014 · 569e0cd · 569e0cd
1 parent 8d4363a
commit 569e0cd
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 45 deletions.
diff --git a/pom.xml b/pom.xml
@@ -79,60 +79,54 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
+				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
-				<version>8.1.13.v20130916</version>
+				<version>9.2.2.v20140723</version>
 				<configuration>
 					<contextPath>/</contextPath>
 					<useTestClasspath>true</useTestClasspath>
-					<connectors>
-						<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
-							<port>8081</port>
-							<maxIdleTime>60000</maxIdleTime>
-						</connector>
-					</connectors>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>com.google.code.maven-replacer-plugin</groupId>
-           		<artifactId>replacer</artifactId>
-           		<version>1.5.2</version>
-           		<executions>
-	               <execution>
-	                   <phase>prepare-package</phase>
-	                   <goals>
-	                       <goal>replace</goal>
-	                   </goals>                   
-	               </execution>
-	           </executions>
-	           <configuration>
-	           		<includes>
-	           			<include>src/main/webapp/**.html</include>
-	           			<include>src/main/webapp/v0.10</include>
-	           		</includes>
-               		<replacements>
-                   		<replacement>
-                       		<token>PROJECT_VERSION</token>
-                       		<value>${project.version}</value>
-                   		</replacement> 
-                   		<replacement>
-                   			<token>localhost:8081</token>
-                   			<value>restcountries.eu</value>
-                   		</replacement>      
-               		</replacements>
-           		</configuration>
+				<artifactId>replacer</artifactId>
+				<version>1.5.2</version>
+				<executions>
+					<execution>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>replace</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<includes>
+						<include>src/main/webapp/**.html</include>
+						<include>src/main/webapp/v0.10</include>
+					</includes>
+					<replacements>
+						<replacement>
+							<token>PROJECT_VERSION</token>
+							<value>${project.version}</value>
+						</replacement>
+						<replacement>
+							<token>localhost:8081</token>
+							<value>restcountries.eu</value>
+						</replacement>
+					</replacements>
+				</configuration>
 
 			</plugin>
 		</plugins>
 	</build>
 
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.6</version>
-            </plugin>
-        </plugins>
-    </reporting>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>cobertura-maven-plugin</artifactId>
+				<version>2.6</version>
+			</plugin>
+		</plugins>
+	</reporting>
 </project>
diff --git a/src/test/java/vaeke/restcountries/v1/CountryRestTest.java b/src/test/java/vaeke/restcountries/v1/CountryRestTest.java
@@ -28,7 +28,7 @@
 public class CountryRestTest {
 
 	@Rule
-	public Destination destination = new Destination(this, "http://localhost:8081/rest/v1");
+	public Destination destination = new Destination(this, "http://localhost:8080/rest/v1");
 
 	@Context
 	private Response response;
@@ -98,7 +98,6 @@ public void language() {
 		org.junit.Assert.assertEquals(2, countries.size());
 		for(DesCountry country : countries) {
 			org.junit.Assert.assertTrue(country.getLanguages().contains("no"));
-			System.out.println(country.getName());
 		}
 	}