Skip to content

Align 3.7.x #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oscerd merged 3 commits into from
Dec 16, 2020
Merged

Align 3.7.x #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7f4797
Release train is 3.7.0
oscerd Dec 16, 2020
4c658e1
Move version to 3.7.0
oscerd Dec 16, 2020
ce96b16
Regen
oscerd Dec 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/camel-example-activemq-tomcat/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-activemq-tomcat</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-aggregate-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-aggregate-dist</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-aggregate/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-aggregate</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-any23/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-any23</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-artemis-large-messages/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-artemis-large-messages</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-artemis/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-artemis</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-as2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>
<artifactId>camel-example-as2</artifactId>
<name>Camel :: Example :: AS2</name>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-basic/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-basic</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-bigxml-split/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-bigxml-split</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-billboard-aggr/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-billboard-aggr</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-cafe-endpointdsl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-cafe-endpointdsl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-cafe/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-cafe</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions examples/camel-example-cassandra-kubernetes/README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,14 @@ You should then see an output similar to this:
[INFO] k8s: 2020-08-07 12:34:34,150 [main ] INFO Cluster - New Cassandra host cassandra/172.17.0.6:9042 added
[INFO] k8s: 2020-08-07 12:34:36,780 [main ] INFO CqlPopulateBean - Cassandra was populated with sample values for test.users table
[INFO] k8s: 2020-08-07 12:34:37,372 [main ] INFO LRUCacheFactory - Detected and using LRUCacheFactory: camel-caffeine-lrucache
[INFO] k8s: 2020-08-07 12:34:38,012 [main ] INFO AbstractCamelContext - Apache Camel 3.7.0-SNAPSHOT (camel-1) is starting
[INFO] k8s: 2020-08-07 12:34:38,012 [main ] INFO AbstractCamelContext - Apache Camel 3.7.0 (camel-1) is starting
[INFO] k8s: 2020-08-07 12:34:38,019 [main ] INFO AbstractCamelContext - StreamCaching is not in use. If using streams then its recommended to enable stream caching. See more details at http://camel.apache.org/stream-caching.html
[INFO] k8s: 2020-08-07 12:34:38,019 [main ] INFO AbstractCamelContext - Using HealthCheck: camel-health
[INFO] k8s: 2020-08-07 12:34:38,664 [main ] INFO DefaultMavenCoordinates - DataStax Java driver for Apache Cassandra(R) (com.datastax.oss:java-driver-core) version 4.8.0
[INFO] k8s: 2020-08-07 12:34:39,554 [s0-admin-0 ] INFO Clock - Using native clock for microsecond precision
[INFO] k8s: 2020-08-07 12:34:41,453 [main ] INFO InternalRouteStartupManager - Route: cassandra-route started and consuming from: timer://foo
[INFO] k8s: 2020-08-07 12:34:41,454 [main ] INFO AbstractCamelContext - Total 1 routes, of which 1 are started
[INFO] k8s: 2020-08-07 12:34:41,455 [main ] INFO AbstractCamelContext - Apache Camel 3.7.0-SNAPSHOT (camel-1) started in 3.441 seconds
[INFO] k8s: 2020-08-07 12:34:41,455 [main ] INFO AbstractCamelContext - Apache Camel 3.7.0 (camel-1) started in 3.441 seconds
[INFO] k8s: 2020-08-07 12:34:41,469 [main ] INFO BaseMainSupport - Using properties from: classpath:application.properties;optional=true
[INFO] k8s: 2020-08-07 12:34:41,557 [main ] INFO DefaultRoutesCollector - No additional Camel XML routes discovered from: classpath:camel/*.xml
[INFO] k8s: 2020-08-07 12:34:41,557 [main ] INFO DefaultRoutesCollector - No additional Camel XML route templates discovered from: classpath:camel-template/*.xml
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-cassandra-kubernetes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-cassandra-kubernetes</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-cdi-aws-s3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-cdi-aws-s3</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-cdi-cassandraql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-cdi-cassandraql</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-cdi-kubernetes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-cdi-kubernetes</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-cdi-metrics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-cdi-metrics</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions examples/camel-example-cdi-minio/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>examples</artifactId>
<groupId>org.apache.camel.example</groupId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-cdi-minio</artifactId>
Expand Down Expand Up @@ -83,7 +83,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-maven-plugin</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
<dependencies>
<dependency>
<groupId>org.apache.deltaspike.cdictrl</groupId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-cdi-properties/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-cdi-properties</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-cdi-rest-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-cdi-rest-servlet</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-cdi-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-cdi-test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-cdi-xml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-cdi-xml</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-cdi</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-console/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-console</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-csimple-joor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-csimple-joor</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-csimple/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-csimple</artifactId>
Expand Down
3 changes: 0 additions & 3 deletions ...les/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@

import org.apache.camel.*;
import org.apache.camel.util.*;
import org.apache.camel.spi.*;
import static org.apache.camel.language.csimple.CSimpleHelper.*;


public class CSimpleScript1 extends org.apache.camel.language.csimple.CSimpleSupport {

Language bean;

public CSimpleScript1() {
}

Expand Down
3 changes: 0 additions & 3 deletions ...les/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@

import org.apache.camel.*;
import org.apache.camel.util.*;
import org.apache.camel.spi.*;
import static org.apache.camel.language.csimple.CSimpleHelper.*;


public class CSimpleScript2 extends org.apache.camel.language.csimple.CSimpleSupport {

Language bean;

public CSimpleScript2() {
}

Expand Down
3 changes: 0 additions & 3 deletions ...les/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@

import org.apache.camel.*;
import org.apache.camel.util.*;
import org.apache.camel.spi.*;
import static org.apache.camel.language.csimple.CSimpleHelper.*;


public class CSimpleScript3 extends org.apache.camel.language.csimple.CSimpleSupport {

Language bean;

public CSimpleScript3() {
}

Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-cxf-proxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-cxf-proxy</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-cxf-tomcat/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-cxf-tomcat</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-cxf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-cxf</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-debezium-eventhubs-blob/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-debezium-eventhubs-blob</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-debezium/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-debezium</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-fhir/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-fhir</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-ftp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-ftp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-hazelcast-kubernetes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-hazelcast-kubernetes</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-java8/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-java8</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.example</groupId>
<artifactId>examples</artifactId>
<version>3.7.0-SNAPSHOT</version>
<version>3.7.0</version>
</parent>

<artifactId>camel-example-jdbc</artifactId>
Expand Down
Loading