Skip to content
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.

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

Update to Camel 3.0.0 and Camel-Quarkus 1.0.0-M1 #206

Merged
merged 2 commits into from
Dec 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.io.InputStream;
import java.util.Collections;
import java.util.List;

import javax.xml.bind.UnmarshalException;

import org.apache.camel.builder.RouteBuilder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.camel.k.core.quarkus.deployment;

import java.util.ServiceLoader;

import javax.enterprise.context.ApplicationScoped;
import javax.json.Json;
import javax.json.JsonArrayBuilder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import io.quarkus.vertx.deployment.VertxBuildItem;
import org.apache.camel.component.knative.spi.KnativeEnvironment;
import org.apache.camel.k.quarkus.knative.KnativeRecorder;
import org.apache.camel.quarkus.core.CamelServiceFilter;
import org.apache.camel.quarkus.core.deployment.CamelRuntimeBeanBuildItem;
import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
import org.apache.camel.quarkus.core.deployment.CamelServiceFilterBuildItem;

public class DeploymentProcessor {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.camel.k.loader.js.quarkus.deployment;

import java.nio.charset.StandardCharsets;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.json.Json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;

import javax.ws.rs.core.MediaType;

import io.quarkus.test.junit.QuarkusTest;
Expand Down Expand Up @@ -54,4 +55,4 @@ public void testLoadRoutes() throws IOException {
assertThat(p.getList("routes", String.class)).contains("js");
assertThat(p.getList("endpoints", String.class)).contains("direct://js", "log://js");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.camel.k.loader.xml.quarkus.deployment;

import java.nio.charset.StandardCharsets;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.json.Json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;

import javax.ws.rs.core.MediaType;

import io.quarkus.test.junit.QuarkusTest;
Expand Down Expand Up @@ -54,4 +55,4 @@ public void testLoadRoutes() throws IOException {
assertThat(p.getList("routes", String.class)).contains("xml");
assertThat(p.getList("endpoints", String.class)).contains("direct://xml", "log://xml");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.camel.k.loader.yaml.quarkus.deployment;

import java.nio.charset.StandardCharsets;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.json.Json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;

import javax.ws.rs.core.MediaType;

import io.quarkus.test.junit.QuarkusTest;
Expand Down Expand Up @@ -54,4 +55,4 @@ public void testLoadRoutes() throws IOException {
assertThat(p.getList("routes", String.class)).contains("yaml");
assertThat(p.getList("endpoints", String.class)).contains("direct://yaml", "log://yaml");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void testLoadCustomizersWithList() {
@Test
public void testLoadCustomizers() {
CamelContext context = new DefaultCamelContext();
context.getRegistry().bind("converters", (ContextCustomizer) (camelContext) -> camelContext.setLoadTypeConverters(false));
context.getRegistry().bind("converters", (ContextCustomizer)camelContext -> camelContext.setLoadTypeConverters(false));

List<ContextCustomizer> customizers = RuntimeSupport.configureContextCustomizers(context);
assertThat(context.getName()).isNotEqualTo("from-registry");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.io.IOException;
import java.io.PrintWriter;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Set;

import javax.servlet.Servlet;

/**
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<camel.version>3.0.0-RC3</camel.version>
<camel-quarkus.version>0.4.0</camel-quarkus.version>
<camel.version>3.0.0</camel.version>
<camel-quarkus.version>1.0.0-M1</camel-quarkus.version>
<catalog.version>${camel.version}</catalog.version>
<junit.version>5.5.2</junit.version>
<joor.version>0.9.12</joor.version>
Expand All @@ -60,8 +60,8 @@
<undertow.version>1.4.26.Final</undertow.version>
<vertx.version>3.8.3</vertx.version>
<graalvm.version>19.2.1</graalvm.version>
<quarkus.version>1.0.0.CR1</quarkus.version>
<jandex.version>2.1.1.Final</jandex.version>
<quarkus.version>1.0.1.Final</quarkus.version>
<jandex.version>2.1.2.Final</jandex.version>
<javapoet.version>1.11.1</javapoet.version>
<auto-service.version>1.0-rc6</auto-service.version>
<gmavenplus-plugin.version>1.7.1</gmavenplus-plugin.version>
Expand All @@ -73,14 +73,14 @@
<directory-maven-plugin.version>0.3.1</directory-maven-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<mycila-license.version>3.0</mycila-license.version>
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
<maven-checkstyle.version>7.6.1</maven-checkstyle.version>
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
<maven-checkstyle.version>8.26</maven-checkstyle.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.1.0</maven-source-plugin.version>
<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
<jandex-maven-plugin.version>1.0.6</jandex-maven-plugin.version>
<jandex-maven-plugin.version>1.0.7</jandex-maven-plugin.version>
<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
</properties>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.nio.file.StandardOpenOption;
import java.util.Set;
import java.util.function.BiConsumer;

import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.Processor;
import javax.annotation.processing.RoundEnvironment;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;

import org.apache.camel.catalog.DefaultCamelCatalog;
import org.apache.camel.k.tooling.maven.model.CamelArtifact;
import org.apache.camel.k.tooling.maven.model.CatalogComponentDefinition;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.io.IOException;
import java.nio.file.Paths;

import javax.lang.model.element.Modifier;

import com.fasterxml.jackson.core.Version;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.io.IOException;
import java.nio.file.Paths;

import javax.lang.model.element.Modifier;

import com.fasterxml.jackson.annotation.JsonAlias;
Expand Down