camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: Fixed maven warning
Date Sun, 06 Sep 2015 05:55:16 GMT
Repository: camel
Updated Branches:
  refs/heads/master f9e409e3c -> ae30d8815


Fixed maven warning


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

Branch: refs/heads/master
Commit: ae30d8815a9a13b500debfd1e43d9aad0342e0b9
Parents: f9e409e
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sun Sep 6 07:56:05 2015 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sun Sep 6 07:56:05 2015 +0200

----------------------------------------------------------------------
 .../camel-olingo2-component/pom.xml             |   9 +-
 .../camel-olingo2-component/pom.xml.bak         | 328 -------------------
 2 files changed, 1 insertion(+), 336 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ae30d881/components/camel-olingo2/camel-olingo2-component/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index 34e3f1d..25dd78c 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -222,14 +222,7 @@
               </sources>
             </configuration>
           </execution>
-        </executions>
-      </plugin>
-
-      <!-- add the olingo odata2 sample service source. See profile get-olingo2-sample
below --> 
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
+          <!-- add the olingo odata2 sample service source. See profile get-olingo2-sample
below -->
           <execution>
             <id>add-test-source</id>
             <phase>generate-test-sources</phase>

http://git-wip-us.apache.org/repos/asf/camel/blob/ae30d881/components/camel-olingo2/camel-olingo2-component/pom.xml.bak
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml.bak b/components/camel-olingo2/camel-olingo2-component/pom.xml.bak
deleted file mode 100644
index a133cdc..0000000
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml.bak
+++ /dev/null
@@ -1,328 +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>camel-olingo2-parent</artifactId>
-    <version>2.16-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>camel-olingo2</artifactId>
-  <packaging>bundle</packaging>
-  <name>Camel :: Olingo2 :: Component</name>
-  <description>Camel Olingo2 component</description>
-
-  <properties>
-    <schemeName>olingo2</schemeName>
-    <componentName>Olingo2</componentName>
-    <componentPackage>org.apache.camel.component.olingo2</componentPackage>
-    <outPackage>org.apache.camel.component.olingo2.internal</outPackage>
-
-    <camel.osgi.export.pkg>${componentPackage}</camel.osgi.export.pkg>
-    <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-olingo2-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>${commons-lang-version}</version>
-    </dependency>
-
-    <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>spi-annotations</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Component API javadoc in provided scope to read API signatures -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-olingo2-api</artifactId>
-      <version>${project.version}</version>
-      <classifier>javadoc</classifier>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- logging -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- testing -->
-    <dependency>
-      <groupId>org.apache.olingo</groupId>
-      <artifactId>olingo-odata2-core</artifactId>
-      <version>${olingo2-version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.ws.rs</groupId>
-          <artifactId>javax.ws.rs-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.olingo</groupId>
-      <artifactId>olingo-odata2-api-annotation</artifactId>
-      <version>${olingo2-version}</version>
-      <scope>test</scope>
-	</dependency>
-    <dependency>
-      <groupId>org.apache.olingo</groupId>
-      <artifactId>olingo-odata2-annotation-processor-api</artifactId>
-      <version>${olingo2-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.olingo</groupId>
-      <artifactId>olingo-odata2-annotation-processor-core</artifactId>
-      <version>${olingo2-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-      <version>${cxf-version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <version>${jetty9-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>${jetty9-version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty.orbit</groupId>
-          <artifactId>javax.servlet</artifactId>         
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
-      <version>${jetty9-version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <defaultGoal>install</defaultGoal>
-
-    <plugins>
-      
-      <!-- generate Component source and test source -->
-      <plugin>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-api-component-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>generate-test-component-classes</id>
-            <goals>
-              <goal>fromApis</goal>
-            </goals>
-            <configuration>
-              <apis>
-                <api>
-                  <apiName />
-                  <proxyClass>org.apache.camel.component.olingo2.api.Olingo2App</proxyClass>
-                  <fromSignatureFile>src/signatures/olingo-api-signature.txt</fromSignatureFile>
-                  <excludeConfigNames>edm|responseHandler</excludeConfigNames>
-                  <extraOptions>
-                    <extraOption>
-                      <name>keyPredicate</name>
-                      <type>java.lang.String</type>
-                    </extraOption>
-                  </extraOptions>
-                  <nullableOptions>
-                    <nullableOption>queryParams</nullableOption>
-                  </nullableOptions>
-                </api>
-              </apis>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- add generated source and test source to build -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-generated-sources</id>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${project.build.directory}/generated-sources/camel-component</source>
-              </sources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>add-generated-test-sources</id>
-            <goals>
-              <goal>add-test-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${project.build.directory}/generated-test-sources/camel-component</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-	  <!-- add the olingo odata2 sample service source. See profile get-olingo2-sample below
--> 
-	  <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-test-source</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>add-test-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${project.build.directory}/olingo2-my-car-service/src/main/java</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-    </plugins>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.camel</groupId>
-          <artifactId>camel-api-component-maven-plugin</artifactId>
-          <version>${project.version}</version>
-          <configuration>
-            <scheme>${schemeName}</scheme>
-            <componentName>${componentName}</componentName>
-            <componentPackage>${componentPackage}</componentPackage>
-            <outPackage>${outPackage}</outPackage>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-
-  </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-api-component-maven-plugin</artifactId>
-        <version>${project.version}</version>
-        <configuration>
-          <scheme>${schemeName}</scheme>
-          <componentName>${componentName}</componentName>
-          <componentPackage>${componentPackage}</componentPackage>
-          <outPackage>${outPackage}</outPackage>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-
-  <profiles>
-    <profile>
-	  <!-- REVISIT as of now, the olingo odata2 sample service that is used in the tests

-		   is not available in nexus and needs to be generated and built using its architype plugin.
-		   If the sample service jar becomes available, we can use it directly -->
-      <id>get-olingo2-sample</id>
-	  <activation>
-		<file>
-          <missing>target/olingo2-my-car-service</missing>
-		</file>
-      </activation>
-      <build>
-        <plugins>
-		  <plugin>
-			<groupId>org.codehaus.mojo</groupId>
-			<artifactId>exec-maven-plugin</artifactId>
-			<executions>
-			  <execution>
-				<id>generate-sources</id>
-				<phase>generate-test-sources</phase>
-				<goals>
-				  <goal>exec</goal>
-				</goals>
-			  </execution>
-			</executions>
-			<configuration>
-			  <executable>mvn</executable>
-			  <workingDirectory>${project.build.directory}</workingDirectory>
-			  <arguments>
-				<argument>archetype:generate</argument>
-				<argument>-DinteractiveMode=false</argument>
-				<argument>-Dversion=${project.version}</argument>
-				<argument>-DgroupId=org.apache.camel</argument>
-				<argument>-DartifactId=olingo2-my-car-service</argument>
-				<argument>-DarchetypeGroupId=org.apache.olingo</argument>
-				<argument>-DarchetypeArtifactId=olingo-odata2-sample-cars-annotation-archetype</argument>
-				<argument>-DarchetypeVersion=${olingo2-version}</argument>
-			  </arguments>
-			</configuration>
-		  </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>


Mime
View raw message