You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/03/24 09:18:51 UTC

[camel-karaf] 02/02: Regen

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git

commit b6380d0188433d3d2f2700dd6162dd2de8c0545a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 24 09:59:05 2020 +0100

    Regen
---
 .../services/org/apache/camel/other.properties     |  2 +-
 .../camel-kura/src/generated/resources/kura.json   |  2 +-
 .../services/org/apache/camel/component.properties |  2 +-
 .../camel/component/paxlogging/paxlogging.json     |  2 +-
 components/pom.xml                                 | 14 +++++++++++
 core/pom.xml                                       | 27 +++++++++++-----------
 6 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/components/camel-kura/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-kura/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index 343cb4c..840e6a5 100644
--- a/components/camel-kura/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-kura/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -1,6 +1,6 @@
 # Generated by camel build tools - do NOT edit this file!
 name=kura
-groupId=org.apache.camel
+groupId=org.apache.camel.karaf
 artifactId=camel-kura
 version=3.2.0-SNAPSHOT
 projectName=Camel :: Kura
diff --git a/components/camel-kura/src/generated/resources/kura.json b/components/camel-kura/src/generated/resources/kura.json
index 1d8e69d..a38c454 100644
--- a/components/camel-kura/src/generated/resources/kura.json
+++ b/components/camel-kura/src/generated/resources/kura.json
@@ -7,7 +7,7 @@
     "deprecated": false,
     "firstVersion": "2.15.0",
     "label": "iot,osgi",
-    "groupId": "org.apache.camel",
+    "groupId": "org.apache.camel.karaf",
     "artifactId": "camel-kura",
     "version": "3.2.0-SNAPSHOT"
   }
diff --git a/components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 86311c8..710d8f4 100644
--- a/components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-paxlogging/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -1,6 +1,6 @@
 # Generated by camel build tools - do NOT edit this file!
 components=paxlogging
-groupId=org.apache.camel
+groupId=org.apache.camel.karaf
 artifactId=camel-paxlogging
 version=3.2.0-SNAPSHOT
 projectName=Camel :: Pax Logging
diff --git a/components/camel-paxlogging/src/generated/resources/org/apache/camel/component/paxlogging/paxlogging.json b/components/camel-paxlogging/src/generated/resources/org/apache/camel/component/paxlogging/paxlogging.json
index 7f61f17..56e76a0 100644
--- a/components/camel-paxlogging/src/generated/resources/org/apache/camel/component/paxlogging/paxlogging.json
+++ b/components/camel-paxlogging/src/generated/resources/org/apache/camel/component/paxlogging/paxlogging.json
@@ -14,7 +14,7 @@
     "lenientProperties": false,
     "javaType": "org.apache.camel.component.paxlogging.PaxLoggingComponent",
     "firstVersion": "2.6.0",
-    "groupId": "org.apache.camel",
+    "groupId": "org.apache.camel.karaf",
     "artifactId": "camel-paxlogging",
     "version": "3.2.0-SNAPSHOT"
   },
diff --git a/components/pom.xml b/components/pom.xml
index 19a1315..9fe8905 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -108,6 +108,20 @@
                         </archive>
                     </configuration>
                 </plugin>
+      <plugin>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-package-maven-plugin</artifactId>
+        <version>${camel-version}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <goals>
+              <goal>generate-component</goal>
+            </goals>
+            <phase>process-classes</phase>
+          </execution>
+        </executions>
+      </plugin>
         </plugins>
     </build>
 
diff --git a/core/pom.xml b/core/pom.xml
index fcc891b..029b870 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -40,19 +40,20 @@
 
     <build>
         <plugins>
-            <!--<plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-package-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate</id>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                        <phase>process-classes</phase>
-                    </execution>
-                </executions>
-            </plugin>-->
+      <plugin>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-package-maven-plugin</artifactId>
+        <version>${camel-version}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <goals>
+              <goal>generate-component</goal>
+            </goals>
+            <phase>process-classes</phase>
+          </execution>
+        </executions>
+      </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <executions>