You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by oa...@apache.org on 2020/02/10 17:27:28 UTC
[camel-examples] branch master updated: Make the project compile
This is an automated email from the ASF dual-hosted git repository.
oalsafi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-examples.git
The following commit(s) were added to refs/heads/master by this push:
new 20f389e Make the project compile
20f389e is described below
commit 20f389ed4d8926e446b69048efef28037077352c
Author: Omar Al-Safi <om...@gmail.com>
AuthorDate: Mon Feb 10 18:27:05 2020 +0100
Make the project compile
---
examples/README.adoc | 9 ++--
examples/pom.xml | 130 ++++++++++++++++++++++++++++++++++++++++++++++-----
2 files changed, 123 insertions(+), 16 deletions(-)
diff --git a/examples/README.adoc b/examples/README.adoc
index a576120..57ef260 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -118,9 +118,6 @@ Number of Examples: 85 (0 deprecated)
| link:camel-example-management/README.adoc[Management] (camel-example-management) | Management and Monitoring | An example for showing Camel JMX management
-| link:camel-example-opentracing/README.adoc[OpenTracing] (camel-example-opentracing) | Management and Monitoring | An example showing how to trace incoming and outgoing messages from Camel with OpenTracing
-
-
| link:camel-example-splunk/README.adoc[Splunk] (camel-example-splunk) | Management and Monitoring | An example using Splunk
| link:camel-example-activemq-tomcat/README.adoc[ActiveMQ Tomcat] (camel-example-activemq-tomcat) | Messaging | An example using ActiveMQ Broker and Camel with Apache Tomcat
@@ -142,8 +139,6 @@ Number of Examples: 85 (0 deprecated)
| link:camel-example-netty-custom-correlation/readme.adoc[Netty Custom Correlation] (camel-example-netty-custom-correlation) | Messaging | An example for showing Camel Netty with custom codec and correlation id
-| link:camel-example-rabbitmq/readme.adoc[Rabbitmq] (camel-example-rabbitmq) | Messaging | An example showing how to work with Camel and RabbitMQ
-
| link:camel-example-spring-jms/README.adoc[Spring JMS] (camel-example-spring-jms) | Messaging | An example using Spring XML to talk to the JMS server from different kind of client techniques
@@ -159,6 +154,8 @@ Number of Examples: 85 (0 deprecated)
| link:camel-example-olingo4-blueprint/README.adoc[Olingo4 OSGi] (camel-example-olingo4-blueprint) | OSGi | An example which use the Olingo4 component in OSGi Blueprint
+| link:camel-example-openapi-osgi/README.adoc[OpenApi OSGi] (camel-example-openapi-osgi) | OSGi | An example using REST DSL in XML and OpenApi API
+
| link:camel-example-rest-karaf-osgi-activator/README.adoc[Karaf OSGi Activator] (camel-example-rest-karaf-osgi-activator) | OSGi | An example showing how to use Apache Camel on Apache Karaf with the OSGi Activator component
| link:camel-example-servlet-rest-blueprint/README.adoc[Servlet REST Blueprint] (camel-example-servlet-rest-blueprint) | OSGi | An example using Servlet Rest with OSGi Blueprint
@@ -178,6 +175,8 @@ Number of Examples: 85 (0 deprecated)
| link:camel-example-cdi-rest-servlet/README.adoc[CDI Rest] (camel-example-cdi-rest-servlet) | Rest | Rest DSL using Servlet with CDI example
+| link:camel-example-openapi-cdi/README.adoc[OpenApi CDI] (camel-example-openapi-cdi) | Rest | An example using REST DSL and OpenApi Java with CDI
+
| link:camel-example-spark-rest/README.adoc[Spark Rest] (camel-example-spark-rest) | Rest | An example using Spark Rest
| link:camel-example-swagger-cdi/README.adoc[Swagger CDI] (camel-example-swagger-cdi) | Rest | An example using REST DSL and Swagger Java with CDI
diff --git a/examples/pom.xml b/examples/pom.xml
index 6624bf9..da7dd1d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -25,15 +25,60 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
</parent>
- <artifactId>examples</artifactId>
- <name>Camel :: Example</name>
<groupId>org.apache.camel.example</groupId>
- <description>Camel Examples</description>
+ <artifactId>examples</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <name>Camel Examples</name>
+ <description>Examples for Camel</description>
+ <url>https://camel.apache.org</url>
+
+ <developers>
+ <developer>
+ <name>The Apache Camel Team</name>
+ <email>dev@camel.apache.org</email>
+ <url>https://camel.apache.org</url>
+ <organization>Apache Software Foundation</organization>
+ <organizationUrl>http://apache.org/</organizationUrl>
+ </developer>
+ </developers>
+
+ <mailingLists>
+ <mailingList>
+ <name>Development List</name>
+ <subscribe>dev-subscribe@camel.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@camel.apache.org</unsubscribe>
+ <post>dev@camel.apache.org</post>
+ </mailingList>
+ <mailingList>
+ <name>User List</name>
+ <subscribe>users-subscribe@camel.apache.org</subscribe>
+ <unsubscribe>users-unsubscribe@camel.apache.org</unsubscribe>
+ <post>users@camel.apache.org</post>
+ </mailingList>
+ <mailingList>
+ <name>Commits List</name>
+ <subscribe>commits-subscribe@camel.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@camel.apache.org</unsubscribe>
+ <post>commits@camel.apache.org</post>
+ </mailingList>
+ </mailingLists>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>https://issues.apache.org/jira/browse/CAMEL</url>
+ </issueManagement>
+
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>${site-repo-url}</url>
+ </site>
+ </distributionManagement>
+
<modules>
<module>camel-example-activemq-tomcat</module>
<module>camel-example-aggregate</module>
@@ -125,6 +170,24 @@
</modules>
<properties>
+ <!-- Spring-Boot target version -->
+ <spring-boot-version>2.2.4.RELEASE</spring-boot-version>
+
+ <!-- Camel target version -->
+ <camel-version>3.1.0-SNAPSHOT</camel-version>
+
+ <!-- Versions -->
+ <exec-maven-plugin-version>1.6.0</exec-maven-plugin-version>
+ <activemq-artemis-version>2.11.0</activemq-artemis-version>
+ <arquillian-version>1.6.0.Final</arquillian-version>
+ <cdi-api-2.0-version>2.0</cdi-api-2.0-version>
+ <deltaspike-version>1.9.0</deltaspike-version>
+ <log4j2-version>2.13.0</log4j2-version>
+ <hapi-version>2.3</hapi-version>
+ <pax-exam-version>4.13.1</pax-exam-version>
+ <karaf4-version>4.2.8</karaf4-version>
+ <weld3-version>3.0.5.Final</weld3-version>
+
<!-- for symbolicName in OSGi examples we only want the artifactId, eg camel-example-sql -->
<!-- as having org.apache.camel as prefix is not needed and makes the name very long -->
<camel.osgi.symbolic.name>${project.artifactId}</camel.osgi.symbolic.name>
@@ -134,16 +197,61 @@
<camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
</properties>
+ <!-- Comment out the snapshot repositories as we don't need them now -->
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <url>https://repository.apache.org/snapshots/</url>
+ <name>Apache Snapshot Repo</name>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <url>https://repository.apache.org/snapshots/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+
<dependencyManagement>
<dependencies>
- <!--
- CAMEL-13084 Fix the spring-boot examples start up error by overriding servlet API version from camel-parent
- Wqe need to clean it up once camel-parent upgrade the servlet api version.
- -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-core-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-spring-boot-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-spring-boot</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>${camel-version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${google-guava-version}</version>
</dependency>
</dependencies>
</dependencyManagement>