This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a1246f64d2001446fbcf40569579491630ae5eda
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Dec 5 11:36:20 2018 +0100
Fixed backport of google-bigquery-sql
---
.../org/apache/camel/component/google/bigquery/sql/SqlHelper.java | 3 ++-
.../sql/springboot/GoogleBigQuerySQLComponentAutoConfiguration.java | 4 ----
.../sql/springboot/GoogleBigQuerySQLComponentConfiguration.java | 4 ----
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git
a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/SqlHelper.java
b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/SqlHelper.java
index 9ecd2e2..9d3c687 100644
---
a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/SqlHelper.java
+++
b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/SqlHelper.java
@@ -28,7 +28,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.RuntimeExchangeException;
-import org.apache.camel.util.ResourceHelper;
+import org.apache.camel.support.ResourceHelper;
+
public final class SqlHelper {
diff --git
a/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentAutoConfiguration.java
b/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentAutoConfiguration.java
index 4bcf9a3..b245bea 100644
---
a/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentAutoConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentAutoConfiguration.java
@@ -30,11 +30,7 @@ import
org.apache.camel.spring.boot.util.CamelPropertiesHelper;
import
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
import org.apache.camel.spring.boot.util.GroupCondition;
import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-<<<<<<< HEAD
import org.apache.camel.support.IntrospectionSupport;
-=======
-import org.apache.camel.util.IntrospectionSupport;
->>>>>>> a8ce423... CAMEL-12930 - Fixed CS and sb starter
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentConfiguration.java
b/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentConfiguration.java
index 20d3b35..fc08356 100644
---
a/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentConfiguration.java
@@ -21,9 +21,6 @@ import
org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
-<<<<<<< HEAD
- * Google BigQuery data warehouse for analytics.
-=======
* Google BigQuery data warehouse for analytics. BigQuery Endpoint Definition
* Represents a table within a BigQuery dataset Contains configuration details
* for a single table and the utility methods (such as check, create) to ease
@@ -34,7 +31,6 @@ import
org.springframework.boot.context.properties.ConfigurationProperties;
* Australian operational day is always split between two UTC days, and,
* therefore, tables Another consideration is that exceptions are not handled
* within the class. They are expected to bubble up and be handled by Camel.
->>>>>>> a8ce423... CAMEL-12930 - Fixed CS and sb starter
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
