You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/05/29 15:44:00 UTC
camel git commit: 8819: Jetty Maven Plugin - 8.1.7 does not exist
Repository: camel
Updated Branches:
refs/heads/master 14d377091 -> 5719d4905
8819: Jetty Maven Plugin - 8.1.7 does not exist
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5719d490
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5719d490
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5719d490
Branch: refs/heads/master
Commit: 5719d4905277e659e9aa94c64d9e04576da398fe
Parents: 14d3770
Author: Claus Ibsen <da...@apache.org>
Authored: Fri May 29 15:48:00 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri May 29 15:48:00 2015 +0200
----------------------------------------------------------------------
examples/camel-example-reportincident/pom.xml | 2 +-
examples/camel-example-restlet-jdbc/pom.xml | 2 +-
examples/camel-example-servlet-tomcat-no-spring/pom.xml | 2 +-
examples/camel-example-servlet-tomcat/pom.xml | 2 +-
examples/camel-example-spring-security/pom.xml | 2 +-
examples/camel-example-spring-ws/pom.xml | 2 +-
parent/pom.xml | 5 ++++-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
8 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5719d490/examples/camel-example-reportincident/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-reportincident/pom.xml b/examples/camel-example-reportincident/pom.xml
index 149fccc..f723695 100755
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -158,7 +158,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty-plugin-version}</version>
<configuration>
<connectors>
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
http://git-wip-us.apache.org/repos/asf/camel/blob/5719d490/examples/camel-example-restlet-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-restlet-jdbc/pom.xml b/examples/camel-example-restlet-jdbc/pom.xml
index b61fe21..7f03bd6 100755
--- a/examples/camel-example-restlet-jdbc/pom.xml
+++ b/examples/camel-example-restlet-jdbc/pom.xml
@@ -84,7 +84,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty-plugin-version}</version>
<configuration>
<connectors>
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
http://git-wip-us.apache.org/repos/asf/camel/blob/5719d490/examples/camel-example-servlet-tomcat-no-spring/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-tomcat-no-spring/pom.xml b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
index fc85b3f..211e597 100755
--- a/examples/camel-example-servlet-tomcat-no-spring/pom.xml
+++ b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
@@ -66,7 +66,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/camel/blob/5719d490/examples/camel-example-servlet-tomcat/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-tomcat/pom.xml b/examples/camel-example-servlet-tomcat/pom.xml
index dd57c69..1afaf4a 100755
--- a/examples/camel-example-servlet-tomcat/pom.xml
+++ b/examples/camel-example-servlet-tomcat/pom.xml
@@ -70,7 +70,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty9-version}</version>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/camel/blob/5719d490/examples/camel-example-spring-security/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-security/pom.xml b/examples/camel-example-spring-security/pom.xml
index e1ecfb3..7dea29a 100755
--- a/examples/camel-example-spring-security/pom.xml
+++ b/examples/camel-example-spring-security/pom.xml
@@ -76,7 +76,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty-plugin-version}</version>
<configuration>
<connectors>
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
http://git-wip-us.apache.org/repos/asf/camel/blob/5719d490/examples/camel-example-spring-ws/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-ws/pom.xml b/examples/camel-example-spring-ws/pom.xml
index 7a2ea9b..e3c3996 100644
--- a/examples/camel-example-spring-ws/pom.xml
+++ b/examples/camel-example-spring-ws/pom.xml
@@ -85,7 +85,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty-plugin-version}</version>
<configuration>
<connectors>
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
http://git-wip-us.apache.org/repos/asf/camel/blob/5719d490/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 770b2de..d50ea24 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -266,6 +266,8 @@
<jetty8-version>8.1.17.v20150415</jetty8-version>
<jetty9-version>9.2.10.v20150310</jetty9-version>
<jetty-version>${jetty8-version}</jetty-version>
+ <!-- jetty-plugin 8.1.7 does not exists -->
+ <jetty-plugin-version>8.1.16.v20140903</jetty-plugin-version>
<jetty-runner-groupId>org.mortbay.jetty</jetty-runner-groupId>
<jettison-version>1.3.7</jettison-version>
<jexcelapi-bundle-version>2.4.2_4</jexcelapi-bundle-version>
@@ -2984,7 +2986,7 @@
<plugin>
<groupId>${jetty-runner-groupId}</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty-plugin-version}</version>
</plugin>
<!-- Eclipse m2e Lifecycle Management -->
<plugin>
@@ -3275,6 +3277,7 @@
<id>jetty9</id>
<properties>
<jetty-version>${jetty9-version}</jetty-version>
+ <jetty-plugin-version>${jetty9-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
</properties>
</profile>
http://git-wip-us.apache.org/repos/asf/camel/blob/5719d490/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 8eab99e..e74525a 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
@@ -112,7 +112,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty-plugin-version}</version>
<configuration>
<webAppConfig>
<contextPath>/</contextPath>