Repository: camel Updated Branches: refs/heads/master f1286916d -> efb898b43
Upgrade archetype to use jetty 9 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/efb898b4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/efb898b4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/efb898b4 Branch: refs/heads/master Commit: efb898b43fd9b5cd26a90363d5115d93285c5739 Parents: f128691 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Apr 8 08:37:59 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Apr 8 08:37:59 2016 +0200 ---------------------------------------------------------------------- .../META-INF/maven/archetype-metadata.xml | 4 ++-- .../main/resources/archetype-resources/pom.xml | 18 +++++------------- 2 files changed, 7 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/efb898b4/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml index c9f7378..d7e1b83 100644 --- a/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ b/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -24,8 +24,8 @@ <requiredProperty key="camel-version"> <defaultValue>${project.version}</defaultValue> </requiredProperty> - <requiredProperty key="jetty-version"> - <defaultValue>${jetty-version}</defaultValue> + <requiredProperty key="jetty9-version"> + <defaultValue>${jetty9-version}</defaultValue> </requiredProperty> <requiredProperty key="jetty-plugin-version"> <defaultValue>${jetty-plugin-version}</defaultValue> http://git-wip-us.apache.org/repos/asf/camel/blob/efb898b4/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml index 460f863..243ec70 100644 --- a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml @@ -113,23 +113,15 @@ </configuration> </plugin> - <!-- plugin so you can run mvn jetty:run --> + <!-- allows running this example with mvn jetty:run --> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty-plugin-version}</version> + <version>${jetty9-version}</version> <configuration> - <webAppConfig> + <webApp> <contextPath>/${project.artifactId}</contextPath> - </webAppConfig> - <systemProperties> - <!-- enable easy JMX connection to JConsole --> - <systemProperty> - <name>com.sun.management.jmxremote</name> - <value/> - </systemProperty> - </systemProperties> - <scanIntervalSeconds>10</scanIntervalSeconds> + </webApp> </configuration> </plugin>
