You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/04/01 04:03:32 UTC

[camel-k-runtime] branch m2 created (now b28b5db)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch m2
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git.


      at b28b5db  chore(version): Upgrade to Camel 3.0.0-M2 and make it compile with both 2.x and 3.x

This branch includes the following new commits:

     new b28b5db  chore(version): Upgrade to Camel 3.0.0-M2 and make it compile with both 2.x and 3.x

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[camel-k-runtime] 01/01: chore(version): Upgrade to Camel 3.0.0-M2 and make it compile with both 2.x and 3.x

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch m2
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git

commit b28b5db8de959e2b5c517672141259a1182d2814
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Apr 1 06:03:21 2019 +0200

    chore(version): Upgrade to Camel 3.0.0-M2 and make it compile with both 2.x and 3.x
---
 .../processors/AbstractCataloProcessorTest.java    | 374 +--------------------
 pom.xml                                            |   2 +-
 2 files changed, 4 insertions(+), 372 deletions(-)

diff --git a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java b/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java
index 891d334..7189b1b 100644
--- a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java
+++ b/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java
@@ -1,386 +1,18 @@
 package org.apache.camel.k.tooling.maven.processors;
 
 import org.apache.camel.catalog.CamelCatalog;
-import org.apache.camel.catalog.EndpointValidationResult;
-import org.apache.camel.catalog.JSonSchemaResolver;
-import org.apache.camel.catalog.LanguageValidationResult;
-import org.apache.camel.catalog.RuntimeProvider;
-import org.apache.camel.catalog.SimpleValidationResult;
-import org.apache.camel.catalog.SuggestionStrategy;
-import org.apache.camel.catalog.VersionManager;
-
-import java.net.URISyntaxException;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import org.apache.camel.catalog.DefaultCamelCatalog;
 
 public abstract class AbstractCataloProcessorTest {
-    protected CamelCatalog versionCamelCatalog(String version){
-        return new CamelCatalog() {
-            @Override
-            public JSonSchemaResolver getJSonSchemaResolver() {
-                return null;
-            }
-
-            @Override
-            public void setJSonSchemaResolver(JSonSchemaResolver resolver) {
-
-            }
-
-            @Override
-            public void setRuntimeProvider(RuntimeProvider provider) {
-
-            }
-
-            @Override
-            public RuntimeProvider getRuntimeProvider() {
-                return null;
-            }
-
-            @Override
-            public void enableCache() {
-
-            }
-
-            @Override
-            public boolean isCaching() {
-                return false;
-            }
-
-            @Override
-            public void setSuggestionStrategy(SuggestionStrategy suggestionStrategy) {
-
-            }
-
-            @Override
-            public SuggestionStrategy getSuggestionStrategy() {
-                return null;
-            }
 
-            @Override
-            public void setVersionManager(VersionManager versionManager) {
-
-            }
-
-            @Override
-            public VersionManager getVersionManager() {
-                return null;
-            }
-
-            @Override
-            public void addComponent(String name, String className) {
-
-            }
-
-            @Override
-            public void addComponent(String name, String className, String jsonSchema) {
-
-            }
-
-            @Override
-            public void addDataFormat(String name, String className) {
-
-            }
-
-            @Override
-            public void addDataFormat(String name, String className, String jsonSchema) {
-
-            }
+    protected CamelCatalog versionCamelCatalog(String version){
+        return new DefaultCamelCatalog() {
 
             @Override
             public String getCatalogVersion() {
                 return version;
             }
 
-            @Override
-            public boolean loadVersion(String version) {
-                return false;
-            }
-
-            @Override
-            public String getLoadedVersion() {
-                return null;
-            }
-
-            @Override
-            public String getRuntimeProviderLoadedVersion() {
-                return null;
-            }
-
-            @Override
-            public boolean loadRuntimeProviderVersion(String groupId, String artifactId, String version) {
-                return false;
-            }
-
-            @Override
-            public List<String> findComponentNames() {
-                return null;
-            }
-
-            @Override
-            public List<String> findDataFormatNames() {
-                return null;
-            }
-
-            @Override
-            public List<String> findLanguageNames() {
-                return null;
-            }
-
-            @Override
-            public List<String> findModelNames() {
-                return null;
-            }
-
-            @Override
-            public List<String> findOtherNames() {
-                return null;
-            }
-
-            @Override
-            public List<String> findComponentNames(String filter) {
-                return null;
-            }
-
-            @Override
-            public List<String> findDataFormatNames(String filter) {
-                return null;
-            }
-
-            @Override
-            public List<String> findLanguageNames(String filter) {
-                return null;
-            }
-
-            @Override
-            public List<String> findModelNames(String filter) {
-                return null;
-            }
-
-            @Override
-            public List<String> findOtherNames(String filter) {
-                return null;
-            }
-
-            @Override
-            public String componentJSonSchema(String name) {
-                return null;
-            }
-
-            @Override
-            public String dataFormatJSonSchema(String name) {
-                return null;
-            }
-
-            @Override
-            public String languageJSonSchema(String name) {
-                return null;
-            }
-
-            @Override
-            public String otherJSonSchema(String name) {
-                return null;
-            }
-
-            @Override
-            public String modelJSonSchema(String name) {
-                return null;
-            }
-
-            @Override
-            public String componentAsciiDoc(String name) {
-                return null;
-            }
-
-            @Override
-            public String componentHtmlDoc(String name) {
-                return null;
-            }
-
-            @Override
-            public String dataFormatAsciiDoc(String name) {
-                return null;
-            }
-
-            @Override
-            public String dataFormatHtmlDoc(String name) {
-                return null;
-            }
-
-            @Override
-            public String languageAsciiDoc(String name) {
-                return null;
-            }
-
-            @Override
-            public String languageHtmlDoc(String name) {
-                return null;
-            }
-
-            @Override
-            public String otherAsciiDoc(String name) {
-                return null;
-            }
-
-            @Override
-            public String otherHtmlDoc(String name) {
-                return null;
-            }
-
-            @Override
-            public Set<String> findComponentLabels() {
-                return null;
-            }
-
-            @Override
-            public Set<String> findDataFormatLabels() {
-                return null;
-            }
-
-            @Override
-            public Set<String> findLanguageLabels() {
-                return null;
-            }
-
-            @Override
-            public Set<String> findModelLabels() {
-                return null;
-            }
-
-            @Override
-            public Set<String> findOtherLabels() {
-                return null;
-            }
-
-            @Override
-            public String archetypeCatalogAsXml() {
-                return null;
-            }
-
-            @Override
-            public String springSchemaAsXml() {
-                return null;
-            }
-
-            @Override
-            public String blueprintSchemaAsXml() {
-                return null;
-            }
-
-            @Override
-            public Map<String, String> endpointProperties(String uri) throws URISyntaxException {
-                return null;
-            }
-
-            @Override
-            public Map<String, String> endpointLenientProperties(String uri) throws URISyntaxException {
-                return null;
-            }
-
-            @Override
-            public boolean validateTimePattern(String pattern) {
-                return false;
-            }
-
-            @Override
-            public EndpointValidationResult validateEndpointProperties(String uri) {
-                return null;
-            }
-
-            @Override
-            public EndpointValidationResult validateEndpointProperties(String uri, boolean ignoreLenientProperties) {
-                return null;
-            }
-
-            @Override
-            public EndpointValidationResult validateEndpointProperties(String uri, boolean ignoreLenientProperties, boolean consumerOnly, boolean producerOnly) {
-                return null;
-            }
-
-            @Override
-            public SimpleValidationResult validateSimpleExpression(String simple) {
-                return null;
-            }
-
-            @Override
-            public SimpleValidationResult validateSimpleExpression(ClassLoader classLoader, String simple) {
-                return null;
-            }
-
-            @Override
-            public SimpleValidationResult validateSimplePredicate(String simple) {
-                return null;
-            }
-
-            @Override
-            public SimpleValidationResult validateSimplePredicate(ClassLoader classLoader, String simple) {
-                return null;
-            }
-
-            @Override
-            public LanguageValidationResult validateLanguagePredicate(ClassLoader classLoader, String language, String text) {
-                return null;
-            }
-
-            @Override
-            public LanguageValidationResult validateLanguageExpression(ClassLoader classLoader, String language, String text) {
-                return null;
-            }
-
-            @Override
-            public String endpointComponentName(String uri) {
-                return null;
-            }
-
-            @Override
-            public String asEndpointUri(String scheme, String json, boolean encode) throws URISyntaxException {
-                return null;
-            }
-
-            @Override
-            public String asEndpointUriXml(String scheme, String json, boolean encode) throws URISyntaxException {
-                return null;
-            }
-
-            @Override
-            public String asEndpointUri(String scheme, Map<String, String> properties, boolean encode) throws URISyntaxException {
-                return null;
-            }
-
-            @Override
-            public String asEndpointUriXml(String scheme, Map<String, String> properties, boolean encode) throws URISyntaxException {
-                return null;
-            }
-
-            @Override
-            public String listComponentsAsJson() {
-                return null;
-            }
-
-            @Override
-            public String listDataFormatsAsJson() {
-                return null;
-            }
-
-            @Override
-            public String listLanguagesAsJson() {
-                return null;
-            }
-
-            @Override
-            public String listModelsAsJson() {
-                return null;
-            }
-
-            @Override
-            public String listOthersAsJson() {
-                return null;
-            }
-
-            @Override
-            public String summaryAsJson() {
-                return null;
-            }
         };
     }
 }
diff --git a/pom.xml b/pom.xml
index 8fb4c26..7d78f73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <camel2.version>2.23.1</camel2.version>
-        <camel3.version>3.0.0-M1</camel3.version>
+        <camel3.version>3.0.0-M2</camel3.version>
         <camel.version>${camel2.version}</camel.version>
         <catalog.version>${camel.version}</catalog.version>
         <junit.version>4.12</junit.version>