camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [2/2] git commit: Clean up camel-google-drive pom
Date Tue, 16 Sep 2014 03:20:27 GMT
Clean up camel-google-drive pom


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

Branch: refs/heads/master
Commit: 2678a1adf88b7424877b8a8986ae17d7b402437a
Parents: 1e5c05f
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Tue Sep 16 11:18:04 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Tue Sep 16 11:19:31 2014 +0800

----------------------------------------------------------------------
 components/camel-google-drive/pom.xml | 63 +++++-------------------------
 1 file changed, 10 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2678a1ad/components/camel-google-drive/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/pom.xml b/components/camel-google-drive/pom.xml
index 2bad962..8955b78 100644
--- a/components/camel-google-drive/pom.xml
+++ b/components/camel-google-drive/pom.xml
@@ -35,8 +35,11 @@
     <componentName>GoogleDrive</componentName>
     <componentPackage>org.apache.camel.component.google.drive</componentPackage>
     <outPackage>org.apache.camel.component.google.drive.internal</outPackage>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <camel.osgi.private.pkg>org.apache.camel.component.google.drive.internal</camel.osgi.private.pkg>
+    <camel.osgi.export.pkg>org.apache.camel.component.google.drive</camel.osgi.export.pkg>
+    <camel.osgi.export.service>
+          org.apache.camel.spi.ComponentResolver;component=google-drive
+    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
@@ -69,7 +72,7 @@
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>spi-annotations</artifactId>
-    <version>2.15-SNAPSHOT</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -110,52 +113,6 @@
     <defaultGoal>install</defaultGoal>
 
     <plugins>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.6</version>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-
-      <!-- to generate the MANIFEST-FILE of the bundle -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.7</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Name>Camel Component for ${componentName}</Bundle-Name>
-            <Bundle-SymbolicName>org.apache.camel.camel-google-drive</Bundle-SymbolicName>
-            <Export-Service>org.apache.camel.spi.ComponentResolver;component=${schemeName}</Export-Service>
-            <Export-Package>${componentPackage};version=${project.version}</Export-Package>
-            <Import-Package>
-              ${componentPackage};version=${project.version},
-              org.apache.camel.*;version=${project.version},
-              *
-            </Import-Package>
-            <Private-Package>${outPackage}</Private-Package>
-            <Implementation-Title>Apache Camel</Implementation-Title>
-            <Implementation-Version>${project.version}</Implementation-Version>
-            <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
-            <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-            <_failok>false</_failok>
-          </instructions>
-        </configuration>
-      </plugin>
 
       <!-- generate Component source and test source -->
       <plugin>
@@ -203,7 +160,7 @@
                   <apiName>drive-files</apiName>
                   <proxyClass>com.google.api.services.drive.Drive$Files</proxyClass>
                   <fromJavadoc />
-                </api>                
+                </api>
                 <api>
                   <apiName>drive-parents</apiName>
                   <proxyClass>com.google.api.services.drive.Drive$Parents</proxyClass>
@@ -242,7 +199,7 @@
                       <argType>com.google.api.services.drive.model.Channel</argType>
                       <replacement>contentChannel</replacement>
                     </substitution>
-                  </substitutions> 
+                  </substitutions>
             </configuration>
           </execution>
         </executions>
@@ -286,7 +243,7 @@
         <plugin>
           <groupId>org.apache.camel</groupId>
           <artifactId>camel-api-component-maven-plugin</artifactId>
-          <version>2.15-SNAPSHOT</version>
+          <version>${project.version}</version>
           <configuration>
             <scheme>${schemeName}</scheme>
             <componentName>${componentName}</componentName>
@@ -304,7 +261,7 @@
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-api-component-maven-plugin</artifactId>
-        <version>2.15-SNAPSHOT</version>
+        <version>${project.version}</version>
         <configuration>
           <scheme>${schemeName}</scheme>
           <componentName>${componentName}</componentName>


Mime
View raw message