camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astefanu...@apache.org
Subject camel git commit: Fix merge issue
Date Wed, 30 Mar 2016 19:43:48 GMT
Repository: camel
Updated Branches:
  refs/heads/master 0343d3fe5 -> b50bf4c80


Fix merge issue


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b50bf4c8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b50bf4c8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b50bf4c8

Branch: refs/heads/master
Commit: b50bf4c80cff7aae6120b3d98a6acc4eb214123d
Parents: 0343d3f
Author: Antonin Stefanutti <antonin@stefanutti.fr>
Authored: Wed Mar 30 21:43:36 2016 +0200
Committer: Antonin Stefanutti <antonin@stefanutti.fr>
Committed: Wed Mar 30 21:43:36 2016 +0200

----------------------------------------------------------------------
 components/camel-gae/pom.xml | 211 --------------------------------------
 1 file changed, 211 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b50bf4c8/components/camel-gae/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-gae/pom.xml b/components/camel-gae/pom.xml
deleted file mode 100644
index 2590d28..0000000
--- a/components/camel-gae/pom.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>components</artifactId>
-    <version>2.18-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>camel-gae</artifactId>
-  <packaging>jar</packaging>
-  <name>Camel :: GAE</name>
-  <description>Camel GAE support (deprecated)</description>
-
-  <properties>
-    <camel.osgi.import.before.defaults>
-      javax.servlet.*;version="${servlet-version-range}"
-    </camel.osgi.import.before.defaults>
-    <camel.osgi.export.pkg>org.apache.camel.component.gae.*</camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=gauth,
-      org.apache.camel.spi.ComponentResolver;component=ghttp,
-      org.apache.camel.spi.ComponentResolver;component=ghttps,
-      org.apache.camel.spi.ComponentResolver;component=glogin,
-      org.apache.camel.spi.ComponentResolver;component=gmail,
-      org.apache.camel.spi.ComponentResolver;component=gtask
-    </camel.osgi.export.service>
-  </properties>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-servlet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.appengine</groupId>
-      <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>${google-app-engine-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.appengine</groupId>
-      <artifactId>appengine-api-labs</artifactId>
-      <version>${google-app-engine-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gdata</groupId>
-      <artifactId>core</artifactId>
-      <version>1.47.1</version>
-    </dependency>
-
-    <!-- need to exclude dependencies as they are not in maven central -->
-    <dependency>
-      <groupId>org.openengsb.wrapped</groupId>
-      <artifactId>com.google.gdata</artifactId>
-      <version>${google-gdata-version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.gdata</groupId>
-          <artifactId>gdata-contacts-3.0</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.google.gdata</groupId>
-          <artifactId>gdata-calendar-2.0</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.google.gdata</groupId>
-          <artifactId>gdata-client-1.0</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.google.gdata</groupId>
-          <artifactId>gdata-core-1.0</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.openengsb.wrapped</groupId>
-      <artifactId>com.google.gdata-contacts</artifactId>
-      <version>${google-gdata-version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.gdata</groupId>
-          <artifactId>gdata-contacts-3.0</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.google.gdata</groupId>
-          <artifactId>gdata-client-1.0</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.google.gdata</groupId>
-          <artifactId>gdata-core-1.0</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.openengsb.wrapped</groupId>
-      <artifactId>com.google.gdata-calendar</artifactId>
-      <version>${google-gdata-version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.gdata</groupId>
-          <artifactId>gdata-client-1.0</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.google.gdata</groupId>
-          <artifactId>gdata-calendar-2.0</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.google.gdata</groupId>
-          <artifactId>gdata-core-1.0</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <!-- testing -->
-    <dependency>
-      <groupId>com.google.appengine</groupId>
-      <artifactId>appengine-api-stubs</artifactId>
-      <version>${google-app-engine-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.appengine</groupId>
-      <artifactId>appengine-testing</artifactId>
-      <version>${google-app-engine-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>${jetty-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <version>${jetty-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-spring</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>httpunit</groupId>
-      <artifactId>httpunit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <forkCount>1</forkCount>
-          <reuseForks>false</reuseForks>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>


Mime
View raw message