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/30 11:09:05 UTC
[camel-karaf] branch master updated (9aa9994 -> 08551cd)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git.
from 9aa9994 Re-enable the camel-itest-osgi tests
new cbcecd2 Camel-Karaf-bom: setup dependencies management
new 08551cd Camel-Karaf-BOM: Regen
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bom/camel-karaf-bom/pom.xml | 122 +++++++++++++++++++++++++++++++++++++++
{tests => bom}/pom.xml | 51 +++++++---------
bom/target-template-pom.xml | 63 ++++++++++++++++++++
platforms/karaf/commands/pom.xml | 3 +-
pom.xml | 68 +++++++++++++++++++++-
5 files changed, 274 insertions(+), 33 deletions(-)
create mode 100644 bom/camel-karaf-bom/pom.xml
copy {tests => bom}/pom.xml (65%)
create mode 100644 bom/target-template-pom.xml
[camel-karaf] 01/02: Camel-Karaf-bom: setup dependencies management
Posted by ac...@apache.org.
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 cbcecd2a77ec5b2d99dd7d73d52d239904474852
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 30 12:43:54 2020 +0200
Camel-Karaf-bom: setup dependencies management
---
platforms/karaf/commands/pom.xml | 3 +-
pom.xml | 68 ++++++++++++++++++++++++++++++++++++++--
2 files changed, 68 insertions(+), 3 deletions(-)
diff --git a/platforms/karaf/commands/pom.xml b/platforms/karaf/commands/pom.xml
index 6f42d20..32be4fa 100644
--- a/platforms/karaf/commands/pom.xml
+++ b/platforms/karaf/commands/pom.xml
@@ -44,8 +44,9 @@
<!-- camel -->
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.karaf</groupId>
<artifactId>camel-commands-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/pom.xml b/pom.xml
index fd82e4b..2e86410 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,8 +74,7 @@
<module>platforms</module>
<module>catalog</module>
<module>tests</module>
- <!--<module>examples</module>
- <module>docs</module>-->
+ <module>bom</module>
</modules>
<scm>
@@ -854,15 +853,80 @@
</dependency>
<dependency>
<groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-blueprint-main</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
<artifactId>camel-test-blueprint</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-cxf-blueprint</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-cxf-transport-blueprint</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-eventadmin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-kura</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-osgi-activator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-paxlogging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-servlet-osgi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-servlet-osgi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
<artifactId>camel-test-karaf</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-catalog-provider-karaf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-core-osgi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-catalog-provider-karaf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-commands-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>${camel-version}</version>
[camel-karaf] 02/02: Camel-Karaf-BOM: Regen
Posted by ac...@apache.org.
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 08551cd346aef202e13ee044b7148e2da17b3f95
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 30 13:07:50 2020 +0200
Camel-Karaf-BOM: Regen
---
bom/camel-karaf-bom/pom.xml | 122 ++++++++++++++++++++++++++++++++++++++++++++
bom/pom.xml | 70 +++++++++++++++++++++++++
bom/target-template-pom.xml | 63 +++++++++++++++++++++++
3 files changed, 255 insertions(+)
diff --git a/bom/camel-karaf-bom/pom.xml b/bom/camel-karaf-bom/pom.xml
new file mode 100644
index 0000000..8e780df
--- /dev/null
+++ b/bom/camel-karaf-bom/pom.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+ 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
+ <artifactId>camel-karaf-bom</artifactId>
+ <packaging>pom</packaging>
+ <name>Camel Karaf :: BOM</name>
+ <description>Camel Karaf BOM</description>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-blueprint</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-blueprint-main</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-catalog-provider-karaf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-commands-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-core-osgi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-cxf-blueprint</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-cxf-transport-blueprint</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-eventadmin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-kura</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-osgi-activator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-paxlogging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-servlet-osgi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-test-blueprint</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-test-karaf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>bom-generator-maven-plugin</artifactId>
+ <version>${camel-version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>bom-generator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/bom/pom.xml b/bom/pom.xml
new file mode 100644
index 0000000..2395930
--- /dev/null
+++ b/bom/pom.xml
@@ -0,0 +1,70 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>bom-generator</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Camel Karaf :: BOM :: Generator</name>
+ <description>Camel Tooling</description>
+
+ <modules>
+ <module>camel-karaf-bom</module>
+ </modules>
+
+ <properties>
+ <camel.osgi.export.pkg />
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>bom-generator-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <dependencies>
+ <includes>
+ <include>org.apache.camel.karaf:*</include>
+ </includes>
+ </dependencies>
+
+ <sourcePom>${basedir}/target-template-pom.xml</sourcePom>
+ <targetPom>${basedir}/camel-karaf-bom/pom.xml</targetPom>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/bom/target-template-pom.xml b/bom/target-template-pom.xml
new file mode 100644
index 0000000..bd854f3
--- /dev/null
+++ b/bom/target-template-pom.xml
@@ -0,0 +1,63 @@
+<?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/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>${project.version}</version>
+ <relativePath>../../</relativePath>
+ </parent>
+
+ <artifactId>camel-karaf-bom</artifactId>
+
+ <packaging>pom</packaging>
+
+ <name>Camel Karaf :: BOM</name>
+ <description>Camel Karaf BOM</description>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- To be filled in -->
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>bom-generator-maven-plugin</artifactId>
+ <version>${camel-version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>bom-generator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>