This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new d1f5071 Fixed CS
d1f5071 is described below
commit d1f5071d2e2cf9cf0a18fa8f5bb6dcd7a2f9565d
Author: Claus Ibsen <[email protected]>
AuthorDate: Sat Oct 19 20:55:57 2019 +0200
Fixed CS
---
.../org/apache/camel/spring/boot/SpringBootRoutesCollector.java | 8 ++++----
.../src/main/java/org/apache/camel/main/RoutesConfigurer.java | 8 ++++----
.../test/java/org/apache/camel/main/scan/MyDummyRouteBuilder.java | 8 ++++----
.../test/java/org/apache/camel/main/scan/MyScanRouteBuilder.java | 8 ++++----
.../org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java | 6 +++---
.../java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 6 +++---
.../camel/maven/packaging/PrepareCatalogSpringBootMojo.java | 6 +++---
7 files changed, 25 insertions(+), 25 deletions(-)
diff --git
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootRoutesCollector.java
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootRoutesCollector.java
index 335a46c..7c4f04d 100644
---
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootRoutesCollector.java
+++
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootRoutesCollector.java
@@ -1,13 +1,13 @@
-/**
+/*
* 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * 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.
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java
b/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java
index 589988e..fd60187 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java
@@ -1,13 +1,13 @@
-/**
+/*
* 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * 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.
diff --git
a/core/camel-main/src/test/java/org/apache/camel/main/scan/MyDummyRouteBuilder.java
b/core/camel-main/src/test/java/org/apache/camel/main/scan/MyDummyRouteBuilder.java
index d2a5d78..c03510c 100644
---
a/core/camel-main/src/test/java/org/apache/camel/main/scan/MyDummyRouteBuilder.java
+++
b/core/camel-main/src/test/java/org/apache/camel/main/scan/MyDummyRouteBuilder.java
@@ -1,13 +1,13 @@
-/**
+/*
* 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * 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.
diff --git
a/core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanRouteBuilder.java
b/core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanRouteBuilder.java
index ff258c7..f9b7ba3 100644
---
a/core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanRouteBuilder.java
+++
b/core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanRouteBuilder.java
@@ -1,13 +1,13 @@
-/**
+/*
* 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * 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.
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
index 1ee1bca..b907344 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
@@ -419,9 +419,9 @@ public class PrepareCatalogKarafMojo extends AbstractMojo {
|| "camel-olingo2".equals(dir.getName())
|| "camel-olingo4".equals(dir.getName())
|| "camel-servicenow".equals(dir.getName())
- || "camel-salesforce".equals(dir.getName())
- || "camel-debezium".equals(dir.getName());
- if (special || special2) {
+ || "camel-salesforce".equals(dir.getName());
+ boolean special3 = "camel-debezium".equals(dir.getName());
+ if (special || special2 || special3) {
continue;
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index 7eae919..43d801f 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -849,9 +849,9 @@ public class PrepareCatalogMojo extends AbstractMojo {
|| "camel-olingo4".equals(dir.getName())
|| "camel-servicenow".equals(dir.getName())
|| "camel-salesforce".equals(dir.getName())
- || "camel-fhir".equals(dir.getName())
- || "camel-debezium".equals(dir.getName());
- if (special || special2) {
+ || "camel-fhir".equals(dir.getName());
+ boolean special3 = "camel-debezium".equals(dir.getName());
+ if (special || special2 || special3) {
continue;
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
index ea0d940..14541a2 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
@@ -444,9 +444,9 @@ public class PrepareCatalogSpringBootMojo extends
AbstractMojo {
|| "camel-olingo2".equals(dir.getName())
|| "camel-olingo4".equals(dir.getName())
|| "camel-servicenow".equals(dir.getName())
- || "camel-salesforce".equals(dir.getName())
- || "camel-debezium".equals(dir.getName());
- if (special || special2) {
+ || "camel-salesforce".equals(dir.getName());
+ boolean special3 = "camel-debezium".equals(dir.getName());
+ if (special || special2 || special3) {
continue;
}
