Examples cleanup Signed-off-by: jansupol <jan.supol@oracle.com>
diff --git a/examples/bookstore-webapp/pom.xml b/examples/bookstore-webapp/pom.xml index f2d9c25..36d1409 100644 --- a/examples/bookstore-webapp/pom.xml +++ b/examples/bookstore-webapp/pom.xml
@@ -79,9 +79,8 @@ <plugins> <!-- Run the application using "mvn jetty:run" --> <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.plugin.version}</version> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> <configuration> <webApp> <contextPath>/bookstore-webapp</contextPath>
diff --git a/examples/cdi-webapp/pom.xml b/examples/cdi-webapp/pom.xml index 6117e18..0831fbb 100644 --- a/examples/cdi-webapp/pom.xml +++ b/examples/cdi-webapp/pom.xml
@@ -180,6 +180,7 @@ <dependency> <groupId>org.jboss.weld.servlet</groupId> <artifactId>weld-servlet-core</artifactId> + <version>${weld.version}</version> </dependency> </dependencies> </profile> @@ -199,7 +200,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>always</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <enableAssertions>false</enableAssertions> </configuration> </plugin>
diff --git a/examples/extended-wadl-webapp/pom.xml b/examples/extended-wadl-webapp/pom.xml index 410bf9b..63e91c8 100644 --- a/examples/extended-wadl-webapp/pom.xml +++ b/examples/extended-wadl-webapp/pom.xml
@@ -109,7 +109,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.6.4</version> + <version>${slf4j.version}</version> <scope>test</scope> </dependency> @@ -259,7 +259,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>always</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <enableAssertions>false</enableAssertions> <excludes> <exclude>org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java</exclude>
diff --git a/examples/freemarker-webapp/pom.xml b/examples/freemarker-webapp/pom.xml index 90490a4..5cd52a5 100644 --- a/examples/freemarker-webapp/pom.xml +++ b/examples/freemarker-webapp/pom.xml
@@ -52,9 +52,8 @@ <plugins> <!-- Run the application using "mvn jetty:run" --> <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.plugin.version}</version> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> </plugin> </plugins> </build>
diff --git a/examples/helloworld-cdi2-se/pom.xml b/examples/helloworld-cdi2-se/pom.xml index c7a9c0b..987c73b 100644 --- a/examples/helloworld-cdi2-se/pom.xml +++ b/examples/helloworld-cdi2-se/pom.xml
@@ -39,6 +39,17 @@ </dependency> <dependency> + <groupId>org.jboss.weld.se</groupId> + <artifactId>weld-se-core</artifactId> + <exclusions> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> <groupId>org.glassfish.jersey.test-framework</groupId> <artifactId>jersey-test-framework-util</artifactId> <scope>test</scope> @@ -76,25 +87,6 @@ </plugins> </build> </profile> - - <profile> - <id>jdk11</id> - <activation> - <jdk>[11,)</jdk> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.weld.se</groupId> - <artifactId>weld-se-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </profile> </profiles> </project>
diff --git a/examples/helloworld-spring-webapp/pom.xml b/examples/helloworld-spring-webapp/pom.xml index a1471eb..3c0a565 100644 --- a/examples/helloworld-spring-webapp/pom.xml +++ b/examples/helloworld-spring-webapp/pom.xml
@@ -113,9 +113,8 @@ <plugins> <!-- Run the application using "mvn jetty:run" to deploy to Jetty--> <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.plugin.version}</version> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> <configuration> <webApp> <contextPath>/helloworld-spring-webapp</contextPath>
diff --git a/examples/helloworld-webapp/pom.xml b/examples/helloworld-webapp/pom.xml index 5ff86d7..a603cd4 100644 --- a/examples/helloworld-webapp/pom.xml +++ b/examples/helloworld-webapp/pom.xml
@@ -59,9 +59,8 @@ <plugins> <!-- Run the application using "mvn jetty:run" to deploy to Jetty--> <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.plugin.version}</version> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> <configuration> <webApp> <contextPath>/helloworld-webapp</contextPath>
diff --git a/examples/java8-webapp/pom.xml b/examples/java8-webapp/pom.xml index 4f0576d..2f1b099 100644 --- a/examples/java8-webapp/pom.xml +++ b/examples/java8-webapp/pom.xml
@@ -53,9 +53,8 @@ </plugin> <!-- Run the application using "mvn jetty:run" --> <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.plugin.version}</version> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> <configuration> <stopWait>5</stopWait> <stopPort>9999</stopPort>
diff --git a/examples/json-jackson1/pom.xml b/examples/json-jackson1/pom.xml deleted file mode 100644 index e69de29..0000000 --- a/examples/json-jackson1/pom.xml +++ /dev/null
diff --git a/examples/json-processing-webapp/pom.xml b/examples/json-processing-webapp/pom.xml index 45f266c..a3bca59 100644 --- a/examples/json-processing-webapp/pom.xml +++ b/examples/json-processing-webapp/pom.xml
@@ -50,9 +50,8 @@ <build> <plugins> <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.plugin.version}</version> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> </plugin> </plugins> </build>
diff --git a/examples/managed-client-simple-webapp/pom.xml b/examples/managed-client-simple-webapp/pom.xml index 70c94ec..d388fcc 100644 --- a/examples/managed-client-simple-webapp/pom.xml +++ b/examples/managed-client-simple-webapp/pom.xml
@@ -36,9 +36,8 @@ <build> <plugins> <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.plugin.version}</version> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> <configuration> <webApp> <contextPath>/managed-client-simple-webapp/</contextPath>
diff --git a/examples/managed-client-webapp/pom.xml b/examples/managed-client-webapp/pom.xml index f68dba3..40ea0b2 100644 --- a/examples/managed-client-webapp/pom.xml +++ b/examples/managed-client-webapp/pom.xml
@@ -48,9 +48,8 @@ <build> <plugins> <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.plugin.version}</version> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> <configuration> <webApp> <contextPath>/managed-client-webapp/</contextPath>
diff --git a/examples/multipart-webapp/pom.xml b/examples/multipart-webapp/pom.xml index 6e81be8..9c88b6d 100644 --- a/examples/multipart-webapp/pom.xml +++ b/examples/multipart-webapp/pom.xml
@@ -50,9 +50,8 @@ <build> <plugins> <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.plugin.version}</version> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> </plugin> </plugins> </build>
diff --git a/examples/osgi-helloworld-webapp/functional-test/pom.xml b/examples/osgi-helloworld-webapp/functional-test/pom.xml index b5ff14d..97c8e25 100644 --- a/examples/osgi-helloworld-webapp/functional-test/pom.xml +++ b/examples/osgi-helloworld-webapp/functional-test/pom.xml
@@ -204,7 +204,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>always</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <enableAssertions>false</enableAssertions> <classpathDependencyExcludes> <classpathDepenencyExclude>org.apache.felix:org.osgi.core</classpathDepenencyExclude>
diff --git a/examples/osgi-http-service/functional-test/pom.xml b/examples/osgi-http-service/functional-test/pom.xml index 3cc6981..ccc2999 100644 --- a/examples/osgi-http-service/functional-test/pom.xml +++ b/examples/osgi-http-service/functional-test/pom.xml
@@ -204,7 +204,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>always</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <enableAssertions>false</enableAssertions> </configuration> <executions>
diff --git a/examples/rx-client-webapp/pom.xml b/examples/rx-client-webapp/pom.xml index cdd9b69..9f5acfb 100644 --- a/examples/rx-client-webapp/pom.xml +++ b/examples/rx-client-webapp/pom.xml
@@ -66,9 +66,8 @@ <plugins> <!-- Run the application using "mvn jetty:run" --> <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.plugin.version}</version> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> </plugin> </plugins> </build>
diff --git a/examples/servlet3-webapp/pom.xml b/examples/servlet3-webapp/pom.xml index 371c705..c079a0a 100644 --- a/examples/servlet3-webapp/pom.xml +++ b/examples/servlet3-webapp/pom.xml
@@ -61,9 +61,8 @@ <!-- <artifactId>maven-failsafe-plugin</artifactId>--> <!-- </plugin>--> <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.plugin.version}</version> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> <configuration> <!-- <skip>${skip.tests}</skip>--> <!-- <stopWait>10</stopWait>-->
diff --git a/examples/sse-item-store-jaxrs-webapp/pom.xml b/examples/sse-item-store-jaxrs-webapp/pom.xml index 27eb45c..8742ea1 100644 --- a/examples/sse-item-store-jaxrs-webapp/pom.xml +++ b/examples/sse-item-store-jaxrs-webapp/pom.xml
@@ -56,10 +56,8 @@ <plugins> <!-- Run the application using "mvn jetty:run" --> <plugin> - <!-- TODO unify Jetty in all examples --> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.plugin.version}</version> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> <configuration> <stopWait>10</stopWait> <stopPort>9999</stopPort>
diff --git a/examples/sse-item-store-jersey-webapp/pom.xml b/examples/sse-item-store-jersey-webapp/pom.xml index 9576db7..e9727b2 100644 --- a/examples/sse-item-store-jersey-webapp/pom.xml +++ b/examples/sse-item-store-jersey-webapp/pom.xml
@@ -56,10 +56,8 @@ <plugins> <!-- Run the application using "mvn jetty:run" --> <plugin> - <!-- TODO unify Jetty in all examples --> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.plugin.version}</version> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> <configuration> <stopWait>10</stopWait> <stopPort>9999</stopPort>
diff --git a/pom.xml b/pom.xml index b916f12..04970eb 100644 --- a/pom.xml +++ b/pom.xml
@@ -734,11 +734,6 @@ </plugin> <!-- TODO: remove the old jetty plugin dependencies --> <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>8.1.8.v20121106</version> - </plugin> - <plugin> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-maven-plugin</artifactId> <version>${jetty.plugin.version}</version> @@ -2067,20 +2062,6 @@ </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <version>${jetty.plugin.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>${jetty.plugin.version}</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.junit</groupId> <artifactId>junit-bom</artifactId> <version>${junit5.version}</version>