Skip to content

Commit a219b87

Browse files
cunningtcunningt
authored
Fix conflicting artifactIds in tomcat-jdbc/spring-boot (apache#165)
1 parent c7d492e commit a219b87

File tree

2 files changed

+73
-70
lines changed

2 files changed

+73
-70
lines changed

‎README.adoc‎

Lines changed: 72 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -27,140 +27,143 @@ readme's instructions.
2727
=== Examples
2828

2929
// examples: START
30-
3130
Number of Examples: 61 (0 deprecated)
3231

33-
34-
35-
[width = "100%", cols = "2,6,2,2", options = "header"]
32+
[width="100%",cols="4,2,4",options="header"]
3633
|===
34+
| Example | Category | Description
3735

38-
| Example | Category | Description| Deploy with devfile
39-
| link:activemq/README.adoc[ActiveMQ] (activemq) | Messaging | An example showing how to work with Camel, ActiveMQ openwire and Spring Boot | No
36+
| link:spring-boot-jta-jpa-autoconfigure/README.adoc[Spring Boot Jta Jpa Autoconfigure] (spring-boot-jta-jpa-autoconfigure) | Advanced | An example showing JTA with Spring Boot Autoconfiguration
4037

41-
| link:actuator-http-metrics/README.adoc[Actuator HTTP Metrics] (actuator-http-metrics) | Management and Monitoring | Example on how to use Spring Boot's Actuator endpoints to gather info like mappings or metrics | No
38+
| link:spring-boot-jta-jpa-xml/README.adoc[Spring Boot Jta Jpa Xml] (spring-boot-jta-jpa-xml) | Advanced | An example showing JTA with Spring Boot using Spring XML configuration
4239

43-
| link:amqp/README.adoc[Amqp] (amqp) | Messaging | An example showing how to work with Camel, ActiveMQ Amqp and Spring Boot | No
40+
| link:webhook/README.adoc[Webhook] (webhook) | Advanced | Example on how to use the Camel Webhook component
4441

45-
| link:amqp-salesforce/README.adoc[AMQP Salesforce] (amqp-salesforce) | Messaging | AMQP message sending is created as contacts in Salesforce | No
42+
| link:endpointdsl/README.adoc[Endpointdsl] (endpointdsl) | Beginner | Using type-safe Endpoint DSL
4643

47-
| link:arangodb/README.adoc[ArangoDB] (arangodb) | Database | An example showing the Camel ArangoDb component with Spring Boot | No
44+
| link:jira/README.adoc[Jira] (jira) | Beginner | An example that uses Jira Camel API
4845

49-
| link:artemis/README.adoc[artemis] (artemis) | Messaging | An example showing how to work with Camel, ActiveMQ Artemis and Spring Boot | No
46+
| link:kamelet-chucknorris/README.adoc[Kamelet Chucknorris] (kamelet-chucknorris) | Beginner | How easy it is to create your own Kamelets
5047

51-
| link:aws2-s3/README.adoc[AWS2 S3] (aws2-s3) | Cloud | An example showing the Camel AWS2 S3 component with Spring Boot | No
48+
| link:load-balancer-eip/README.adoc[Load Balancer Eip] (load-balancer-eip) | Beginner | An example showing Load Balancer EIP with Camel and Spring Boot
5249

53-
| link:azure/camel-example-spring-boot-azure-eventhubs/README.adoc[Azure Event Hubs] (azure-eventhubs) | Cloud | An example showing how to work with Camel, Azure Event Hubs and Spring Boot | No
50+
| link:pojo/README.adoc[Pojo] (pojo) | Beginner | An example showing how to work with Camel POJO routing with Spring Boot
5451

55-
| link:azure/camel-example-spring-boot-azure-servicebus/README.adoc[Azure Service Bus] (azure-servicebus) | Cloud | An example showing how to work with Camel, Azure Service Bus and Spring Boot | No
52+
| link:quartz/README.adoc[Quartz] (quartz) | Beginner | An example showing how to work with Camel Quartz and Camel Log with Spring Boot
5653

57-
| link:endpointdsl/README.adoc[Endpoint DSL] (camel-example-endpointdsl) | Beginner | Using type-safe Endpoint DSL | No
54+
| link:rest-openapi-simple/README.adoc[REST OpenApi] (rest-openapi-simple) | Beginner | This example shows how to call a Rest service defined using OpenApi specification
5855

59-
| link:fhir/README.adoc[FHIR] (fhir) | Health Care | An example showing how to work with Camel, FHIR and Spring Boot | No
56+
| link:route-reload/README.adoc[Spring Boot Route Reload] (route-reload) | Beginner | Live reload of routes if file is updated and saved
6057

61-
| link:fhir-auth-tx/README.adoc[Transaction] (fhir-auth-tx) | Health Care | An example showing how to work with Camel, FHIR Authorization, FHIR Transaction and Spring Boot | Yes
58+
| link:routes-configuration/README.adoc[Routes Configuration] (routes-configuration) | Beginner | Example with global routes configuration for error handling
6259

63-
| link:health-checks/README.adoc[Health Checks] (health-checks) | Health Care | An example on how to work with health checks ib a simple Apache Camel application using Spring Boot. | Yes
60+
| link:routetemplate/README.adoc[Routetemplate] (routetemplate) | Beginner | How to use route templates (parameterized routes)
6461

65-
| link:http-ssl/README.adoc[HTTP SSL] (http-ssl) | Rest | An example showing the Camel HTTP component with Spring Boot and SSL | No
62+
| link:routetemplate-xml/README.adoc[Routetemplate Xml] (routetemplate-xml) | Beginner | How to use route templates (parameterized routes) in XML
6663

67-
| link:infinispan/README.adoc[Infinispan] (infinispan) | Cloud | An example showing the Camel Infinispan component with Spring Boot | No
64+
| link:splitter-eip/README.adoc[Splitter Eip] (splitter-eip) | Beginner | An example showing Splitter EIP with Camel and Spring Boot
6865

69-
| link:jira/README.adoc[Jira] (jira) | Beginner | An example that uses Jira Camel API | No
66+
| link:spring-boot/README.adoc[Spring Boot] (spring-boot) | Beginner | An example showing how to work with Camel and Spring Boot
7067

71-
| link:jolokia/README.adoc[Jolokia] (jolokia) | Management and Monitoring | An example that uses Jolokia to monitor and to manage Camel Routes | No
68+
| link:spring-jdbc/README.adoc[Spring Jdbc] (spring-jdbc) | Beginner | Camel transacted routes integrating local Spring Transaction
7269

73-
| link:kafka-avro/README.adoc[Avro] (kafka-avro) | Messaging | An example for Kafka avro | No
70+
| link:tomcat-jdbc/README.adoc[Tomcat Jdbc] (tomcat-jdbc) | Beginner | An example showing how to deploy a Camel Spring Boot application in Tomcat using its JDBC Data Source
7471

75-
| link:kafka-offsetrepository/README.adoc[offsetrepository] (kafka-offsetrepository) | Messaging | An example for Kafka offsetrepository | No
72+
| link:type-converter/README.adoc[Type Converter] (type-converter) | Beginner | An example showing how to create custom type converter with Camel and Spring Boot
7673

77-
| link:kamelet-chucknorris/README.adoc[Kamelet Chuck Norris] (kamelet-chucknorris) | Beginner | How easy it is to create your own Kamelets | Yes
74+
| link:xml/README.adoc[Spring Boot XML] (xml) | Beginner | An example showing how to work with Camel routes in XML files and Spring Boot
7875

79-
| link:load-balancer-eip/README.adoc[Custom Type Converter] (load-balancer-eip) | Beginner | An example showing Load Balancer EIP with Camel and Spring Boot | Yes
76+
| link:xml-import/README.adoc[Spring Boot XML Import] (xml-import) | Beginner | An example showing how to work with Spring XML files imported with embedded CamelContext
8077

81-
| link:mail-ms-exchange-oauth2/README.adoc[Microsoft Exchange Oauth2 Authentication] (mail-exchange-oauth2) | Mail | An example showing how to use Camel on Spring Boot to connect with IMAP protocol and access email data for Office 365 users using OAuth2 authentication | No
78+
| link:aws2-s3/README.adoc[Aws2 S3] (aws2-s3) | Cloud | An example showing the Camel AWS2 S3 component with Spring Boot
8279

83-
| link:master/README.adoc[Master] (master) | Clustering | An example showing how to work with Camel's Master component and Spring Boot | No
80+
| link:azure/camel-example-spring-boot-azure-eventhubs/README.adoc[Spring Boot Azure Eventhubs] (camel-example-spring-boot-azure-eventhubs) | Cloud | An example showing how to work with Camel, Azure Event Hubs and Spring Boot
8481

85-
| link:metrics/README.adoc[Metrics] (metrics) | Management and Monitoring | An example showing how to work with Camel and Spring Boot and report metrics to Graphite | Yes
82+
| link:azure/camel-example-spring-boot-azure-servicebus/README.adoc[Spring Boot Azure Servicebus] (camel-example-spring-boot-azure-servicebus) | Cloud | An example showing how to work with Camel, Azure Service Bus and Spring Boot
8683

87-
| link:monitoring-micrometrics-grafana-prometheus/README.adoc[Monitoring] (monitoring) | Management and Monitoring | Example on how to use Spring Boot's Actuator endpoints to gather info like mappings or metrics | No
84+
| link:infinispan/README.adoc[Infinispan] (infinispan) | Cloud | An example showing the Camel Infinispan component with Spring Boot
8885

89-
| link:multi-datasource-2pc/README.adoc[Multiple pooled datasources with two-phase commit] (muti-datasources-2pc) | Database | An example showing how to work with Camel and Spring Boot using multiple pooled datasources with two-phase commit | No
86+
| link:servicecall/README.adoc[Spring Boot ServiceCall] (servicecall) | Cloud | An example showing how to work with Camel ServiceCall EIP and Spring Boot
9087

91-
| link:observation/README.adoc[Observation] (observation) | Management and Monitoring | An example showing how to trace incoming and outgoing messages from Camel with Micrometer Observation | No
88+
| link:master/README.adoc[Master] (master) | Clustering | An example showing how to work with Camel's Master component and Spring Boot
9289

93-
| link:openapi-contract-first/README.adoc[OpenAPI Contract First] (openapi-contract-first) | Rest | Contract First OpenAPI example | No
90+
| link:rest-cxf-opentelemetry/README.adoc[Rest Cxf Opentelemetry] (rest-cxf-opentelemetry) | CXF | An example showing Camel REST using CXF and OpenTelemetry with Spring Boot
9491

95-
| link:opentelemetry/README.adoc[OpenTelemetry] (opentelemetry) | Management and Monitoring | An example showing how to use Camel with OpenTelemetry | No
92+
| link:soap-cxf/README.adoc[Soap Cxf] (soap-cxf) | CXF | An example showing the Camel SOAP CXF
9693

97-
| link:paho-mqtt5-shared-subscriptions/README.adoc[Paho MQTT5 Shared Subscriptions] (paho-mqtt5-shared-subscriptions) | Messaging | An example showing how to set up multiple mqtt5 consumers that use shared subscription feature of MQTT5 | Yes
94+
| link:arangodb/README.adoc[Arangodb] (arangodb) | Database | An example showing the Camel ArangoDb component with Spring Boot
9895

99-
| link:platform-http/README.adoc[REST DSL and Platform HTTP] (platform-http) | Rest | An example showing Camel REST DSL with platform HTTP | No
96+
| link:multi-datasource-2pc/README.adoc[Multi Datasource 2pc] (multi-datasource-2pc) | Database | An example showing how to work with Camel and Spring Boot using multiple pooled datasources with two-phase commit
10097

101-
| link:pojo/README.adoc[POJO Routing] (pojo) | Beginner | An example showing how to work with Camel POJO routing with Spring Boot | Yes
98+
| link:resilience4j/README.adoc[Resilience4j] (resilience4j) | EIP | An example showing how to use Resilience4j EIP as circuit breaker in Camel routes
10299

103-
| link:quartz/README.adoc[Quartz] (quartz) | Beginner | An example showing how to work with Camel Quartz and Camel Log with Spring Boot | Yes
100+
| link:saga/README.adoc[Saga] (saga) | EIP | This example shows how to work with a simple Apache Camel application using Spring Boot and Narayana LRA Coordinator to manage distributed actions implementing SAGA pattern
104101

105-
| link:rabbitmq/README.adoc[RabbitMQ] (rabbitmq) | Messaging | An example showing how to work with Camel and RabbitMQ | No
102+
| link:fhir/README.adoc[Fhir] (fhir) | Health Care | An example showing how to work with Camel, FHIR and Spring Boot
106103

107-
| link:reactive-streams/README.adoc[Reactive Streams] (reactive-streams) | Reactive | An example that shows how Camel can exchange data using reactive streams with Spring Boot reactor | Yes
104+
| link:fhir-auth-tx/README.adoc[Fhir Auth Tx] (fhir-auth-tx) | Health Care | An example showing how to work with Camel, FHIR Authorization, FHIR Transaction and Spring Boot
105+
108106

109-
| link:resilience4j/README.adoc[Resilience4j] (resilience4j) | EIP | An example showing how to use Resilience4j EIP as circuit breaker in Camel routes | No
107+
| link:health-checks/README.adoc[Health Checks] (health-checks) | Health Care | An example on how to work with health checks ib a simple Apache Camel application using Spring Boot.
110108

111-
| link:rest-cxf-opentelemetry/README.adoc[REST using CXF and OpenTelemetry] (rest-cxf-opentelemetry) | CXF | An example showing Camel REST using CXF and OpenTelemetry with Spring Boot | No
109+
| link:validator/README.adoc[Validator Spring Boot] (validator) | Input/Output Type Contract | An example showing how to work with declarative validation and Spring Boot
112110

113-
| link:rest-openapi/README.adoc[REST DSL and OpenApi] (rest-openapi) | Rest | An example showing Camel REST DSL and OpenApi with Spring Boot | Yes
111+
| link:mail-ms-exchange-oauth2/README.adoc[Mail Ms Exchange Oauth2] (mail-ms-exchange-oauth2) | Mail | An example showing how to use Camel on Spring Boot to connect
112+
with IMAP protocol and access email data for Office 365 users using OAuth2 authentication
114113

115-
| link:rest-openapi-simple/README.adoc[OpenApi Simple] (rest-openapi-simple) | Beginner | This example shows how to call a Rest service defined using OpenApi specification | No
114+
| link:actuator-http-metrics/README.adoc[Actuator Http Metrics] (actuator-http-metrics) | Management and Monitoring | Example on how to use Spring Boot's Actuator endpoints to gather info like mappings or metrics
116115

117-
| link:rest-openapi-springdoc/README.adoc[REST DSL and OpenApi] (rest-openapi-springdoc) | Rest | An example showing Camel REST DSL and OpenApi with a Springdoc UI in a Spring Boot application | Yes
116+
| link:jolokia/README.adoc[Jolokia] (jolokia) | Management and Monitoring | An example that uses Jolokia to monitor and to manage Camel Routes
118117

119-
| link:route-reload/README.adoc[Route Reload] (route-reload) | Beginner | Live reload of routes if file is updated and saved | Yes
118+
| link:metrics/README.adoc[Metrics] (metrics) | Management and Monitoring | An example showing how to work with Camel and Spring Boot and report metrics to Graphite
120119

121-
| link:routes-configuration/README.adoc[Routes Configuration] (routes-configuration) | Beginner | Example with global routes configuration for error handling | No
120+
| link:monitoring-micrometrics-grafana-prometheus/README.adoc[Monitoring Micrometrics Grafana Prometheus] (monitoring-micrometrics-grafana-prometheus) | Management and Monitoring | Example on how to use Spring Boot's Actuator endpoints to
121+
gather info like mappings or metrics
122+
122123

123-
| link:routetemplate/README.adoc[Route Template] (routetemplate) | Beginner | How to use route templates (parameterized routes) | Yes
124+
| link:observation/README.adoc[Micrometer Observation] (observation) | Management and Monitoring | An example showing how to trace incoming and outgoing messages from Camel with Micrometer Observation
125+
124126

125-
| link:routetemplate-xml/README.adoc[XML] (routetemplate-xml) | Beginner | How to use route templates (parameterized routes) in XML | No
127+
| link:opentelemetry/README.adoc[OpenTelemetry] (opentelemetry) | Management and Monitoring | An example showing how to use Camel with OpenTelemetry
128+
126129

127-
| link:saga/README.adoc[Saga] (saga) | EIP | This example shows how to work with a simple Apache Camel application using Spring Boot and Narayana LRA Coordinator to manage distributed actions implementing SAGA pattern | No
130+
| link:supervising-route-controller/README.adoc[Supervising Route Controller] (supervising-route-controller) | Management and Monitoring | An example showing how to work with Camel's Supervising Route Controller and Spring Boot
128131

129-
| link:servicecall/README.adoc[ServiceCall] (servicecall) | Cloud | An example showing how to work with Camel ServiceCall EIP and Spring Boot | No
132+
| link:activemq/README.adoc[Activemq] (activemq) | Messaging | An example showing how to work with Camel, ActiveMQ openwire and Spring Boot
130133

131-
| link:soap-cxf/README.adoc[SOAP CXF] (soap-cxf) | CXF | An example showing the Camel SOAP CXF | No
134+
| link:amqp/README.adoc[Amqp] (amqp) | Messaging | An example showing how to work with Camel, ActiveMQ Amqp and Spring Boot
132135

133-
| link:splitter-eip/README.adoc[Camel Splitter EIP] (splitter-eip) | Beginner | An example showing Splitter EIP with Camel and Spring Boot | Yes
136+
| link:amqp-salesforce/README.adoc[Amqp Salesforce] (amqp-salesforce) | Messaging | AMQP message sending is created as contacts in Salesforce
134137

135-
| link:spring-boot/README.adoc[Spring Boot] (camel-example-spring-boot) | Beginner | An example showing how to work with Camel and Spring Boot | No
138+
| link:artemis/README.adoc[Artemis] (artemis) | Messaging | An example showing how to work with Camel, ActiveMQ Artemis and Spring Boot
136139

137-
| link:spring-boot-jta-jpa-autoconfigure/README.adoc[JTA] (spring-boot-jta-jpa-autoconfigure) | Advanced | An example showing JTA with Spring Boot Autoconfiguration | No
140+
| link:kafka-avro/README.adoc[Kafka Avro] (kafka-avro) | Messaging | An example for Kafka avro
138141

139-
| link:spring-boot-jta-jpa-xml/README.adoc[JTA] (spring-boot-jta-jpa-xml) | Advanced | An example showing JTA with Spring Boot using Spring XML configuration | No
142+
| link:kafka-offsetrepository/README.adoc[Kafka Offsetrepository] (kafka-offsetrepository) | Messaging | An example for Kafka offsetrepository
140143

141-
| link:spring-jdbc/README.adoc[Spring JDBC] (spring-jdbc) | Beginner | Camel transacted routes integrating local Spring Transaction | No
144+
| link:paho-mqtt5-shared-subscriptions/README.adoc[Paho Mqtt5 Shared Subscriptions] (paho-mqtt5-shared-subscriptions) | Messaging | An example showing how to set up multiple mqtt5 consumers that use shared subscription feature of MQTT5
142145

143-
| link:strimzi/README.adoc[Strimzi] (strimzi) | Messaging | Camel example which a route is defined in XML for Strimzi integration on Openshift/Kubernetes | No
146+
| link:rabbitmq/README.adoc[Rabbitmq] (rabbitmq) | Messaging | An example showing how to work with Camel and RabbitMQ
144147

145-
| link:supervising-route-controller/README.adoc[Supervising Route Controller] (supervising-route-controller) | Management and Monitoring | An example showing how to work with Camel's Supervising Route Controller and Spring Boot | Yes
148+
| link:strimzi/README.adoc[Strimzi] (strimzi) | Messaging | Camel example which a route is defined in XML for Strimzi
149+
integration on Openshift/Kubernetes
150+
146151

147-
| link:tomcat-jdbc/README.adoc[Tomcat JDBC] (camel-example-spring-boot) | Beginner | An example showing how to deploy a Camel Spring Boot application in Tomcat using its JDBC Data Source | No
152+
| link:widget-gadget/README.adoc[Widget Gadget] (widget-gadget) | Messaging | The widget and gadget example from EIP book, running on Spring Boot
148153

149-
| link:type-converter/README.adoc[Custom Type Converter] (type-converter) | Beginner | An example showing how to create custom type converter with Camel and Spring Boot | Yes
154+
| link:reactive-streams/README.adoc[Reactive Streams] (reactive-streams) | Reactive | An example that shows how Camel can exchange data using reactive streams with Spring Boot reactor
155+
150156

151-
| link:validator/README.adoc[Validator] (validator) | Input/Output Type Contract | An example showing how to work with declarative validation and Spring Boot | Yes
157+
| link:http-ssl/README.adoc[Http Ssl] (http-ssl) | Rest | An example showing the Camel HTTP component with Spring Boot and SSL
152158

153-
| link:webhook/README.adoc[Webhook] (webhook) | Advanced | Example on how to use the Camel Webhook component | No
159+
| link:openapi-contract-first/README.adoc[Openapi Contract First] (openapi-contract-first) | Rest | Contract First OpenAPI example
154160

155-
| link:widget-gadget/README.adoc[Widget Gadget] (widget-gadget) | Messaging | The widget and gadget example from EIP book, running on Spring Boot | No
156-
157-
| link:xml/README.adoc[XML] (xml) | Beginner | An example showing how to work with Camel routes in XML files and Spring Boot | Yes
158-
159-
| link:xml-import/README.adoc[XML Import] (xml-import) | Beginner | An example showing how to work with Spring XML files imported with embedded CamelContext | Yes
161+
| link:platform-http/README.adoc[Platform Http] (platform-http) | Rest | An example showing Camel REST DSL with platform HTTP
160162

163+
| link:rest-openapi/README.adoc[Rest Openapi] (rest-openapi) | Rest | An example showing Camel REST DSL and OpenApi with Spring Boot
161164

165+
| link:rest-openapi-springdoc/README.adoc[Rest Openapi Springdoc] (rest-openapi-springdoc) | Rest | An example showing Camel REST DSL and OpenApi with a Springdoc UI in a Spring Boot application
162166
|===
163-
164167
// examples: END
165168

166169

‎tomcat-jdbc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<version>4.8.0-SNAPSHOT</version>
2828
</parent>
2929

30-
<artifactId>camel-example-spring-boot</artifactId>
30+
<artifactId>camel-example-tomcat-jdbc</artifactId>
3131
<name>Camel SB Examples :: Tomcat JDBC</name>
3232
<description>An example showing how to deploy a Camel Spring Boot application in Tomcat using its JDBC Data Source</description>
3333
<packaging>war</packaging>

0 commit comments

Comments
 (0)