camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: 8819: Jetty Maven Plugin - 8.1.7 does not exist
Date Fri, 29 May 2015 13:44:37 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 97e039bb5 -> 7dfb61aa8


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/7dfb61aa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7dfb61aa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7dfb61aa

Branch: refs/heads/camel-2.15.x
Commit: 7dfb61aa8fafb8884347f8a442a6c8052586117e
Parents: 97e039b
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Fri May 29 15:48:00 2015 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Fri May 29 15:49:24 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/7dfb61aa/examples/camel-example-reportincident/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-reportincident/pom.xml b/examples/camel-example-reportincident/pom.xml
index b5d2583..8c119ca 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/7dfb61aa/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 af76e6f..e94cdd6 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/7dfb61aa/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 964598f..98f0794 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/7dfb61aa/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 d6078e4..ee170eb 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/7dfb61aa/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 304950f..e8b7d5b 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/7dfb61aa/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 434ade9..85c3662 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/7dfb61aa/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d27411a..9ee7f31 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -259,6 +259,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>
@@ -2950,7 +2952,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>
@@ -3214,6 +3216,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/7dfb61aa/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>


Mime
View raw message