You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/08/13 21:23:56 UTC
[camel-k-runtime] branch master updated (34db63b -> 9192091)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git.
from 34db63b knative: true knative-http component
new daa0d11 chore: restructure repository
new 84071b7 chore(deps): update junit to v5.5.1
new 50b18c1 chore(deps): update assertj to v3.13.2
new 998be7d chore(deps): update graalvm to v19.1.1
new ae2d3ff chore(deps): update groovy to v2.5.8
new f8ba6de chore(deps): update common-collections4 to v4.4
new f694492 chore(deps): update slf4j to v1.7.28
new 2de43f2 chore(deps): update log4j to v2.12.1
new 9192091 chore(build): migrate deprecate classes
The 9 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.
Summary of changes:
camel-k-loader-js/pom.xml | 4 ----
.../java/org/apache/camel/k/main/RuntimeTest.java | 2 +-
.../camel-k-runtime-example-health/README.adoc | 0
.../camel-k-runtime-example-health/pom.xml | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/routes.groovy | 0
.../camel-k-runtime-example-servlet/README.adoc | 0
.../camel-k-runtime-example-servlet/pom.xml | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/routes.groovy | 0
.../camel-k-runtime-example-yaml/pom.xml | 0
.../main/java/org/apache/camel/k/example/Event.java | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/routes.yaml | 0
{camel-k-runtime-examples => examples}/pom.xml | 0
pom.xml | 19 ++++++++++---------
.../camel-k-maven-plugin}/pom.xml | 2 +-
.../camel/k/tooling/maven/GenerateCatalogMojo.java | 0
.../k/tooling/maven/GenerateDependencyListMojo.java | 0
.../apache/camel/k/tooling/maven/GenerateRestXML.java | 0
.../apache/camel/k/tooling/maven/GenerateSupport.java | 0
.../apache/camel/k/tooling/maven/model/Artifact.java | 0
.../camel/k/tooling/maven/model/CamelArtifact.java | 0
.../camel/k/tooling/maven/model/CamelScheme.java | 0
.../maven/model/CatalogComponentDefinition.java | 0
.../maven/model/CatalogDataFormatDefinition.java | 0
.../maven/model/CatalogLanguageDefinition.java | 0
.../camel/k/tooling/maven/model/CatalogProcessor.java | 0
.../camel/k/tooling/maven/model/CatalogSupport.java | 0
.../camel/k/tooling/maven/model/crd/CamelCatalog.java | 0
.../k/tooling/maven/model/crd/CamelCatalogSpec.java | 0
.../camel/k/tooling/maven/model/k8s/ObjectMeta.java | 0
.../camel/k/tooling/maven/model/k8s/TypeMeta.java | 0
.../tooling/maven/processors/CatalogProcessor3x.java | 0
...pache.camel.k.tooling.maven.model.CatalogProcessor | 0
.../src/main/resources/catalog-license.txt | 0
.../maven/processors/AbstractCataloProcessorTest.java | 0
.../maven/processors/CatalogProcessor3Test.java | 0
{camel-k-runtime-examples => tooling}/pom.xml | 6 ++----
39 files changed, 14 insertions(+), 19 deletions(-)
rename {camel-k-runtime-examples => examples}/camel-k-runtime-example-health/README.adoc (100%)
rename {camel-k-runtime-examples => examples}/camel-k-runtime-example-health/pom.xml (100%)
rename {camel-k-runtime-examples => examples}/camel-k-runtime-example-health/src/main/resources/application.properties (100%)
rename {camel-k-runtime-examples/camel-k-runtime-example-servlet => examples/camel-k-runtime-example-health}/src/main/resources/routes.groovy (100%)
rename {camel-k-runtime-examples => examples}/camel-k-runtime-example-servlet/README.adoc (100%)
rename {camel-k-runtime-examples => examples}/camel-k-runtime-example-servlet/pom.xml (100%)
rename {camel-k-runtime-examples => examples}/camel-k-runtime-example-servlet/src/main/resources/application.properties (100%)
rename {camel-k-runtime-examples/camel-k-runtime-example-health => examples/camel-k-runtime-example-servlet}/src/main/resources/routes.groovy (100%)
rename {camel-k-runtime-examples => examples}/camel-k-runtime-example-yaml/pom.xml (100%)
rename {camel-k-runtime-examples => examples}/camel-k-runtime-example-yaml/src/main/java/org/apache/camel/k/example/Event.java (100%)
rename {camel-k-runtime-examples => examples}/camel-k-runtime-example-yaml/src/main/resources/application.properties (100%)
rename {camel-k-runtime-examples => examples}/camel-k-runtime-example-yaml/src/main/resources/routes.yaml (100%)
copy {camel-k-runtime-examples => examples}/pom.xml (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/pom.xml (99%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/GenerateRestXML.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/model/Artifact.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/model/CamelScheme.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogComponentDefinition.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogDataFormatDefinition.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogLanguageDefinition.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogProcessor.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogSupport.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalog.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalogSpec.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/ObjectMeta.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/TypeMeta.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/resources/META-INF/services/org.apache.camel.k.tooling.maven.model.CatalogProcessor (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/main/resources/catalog-license.txt (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java (100%)
rename {camel-k-runtime-examples => tooling}/pom.xml (85%)
[camel-k-runtime] 02/09: chore(deps): update junit to v5.5.1
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 84071b7e176538d7d379b75b0523e31e3521066c
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Aug 13 18:55:32 2019 +0200
chore(deps): update junit to v5.5.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ae365be..ca203ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<camel.version>3.0.0-M4</camel.version>
<catalog.version>${camel.version}</catalog.version>
- <junit.version>5.5.0</junit.version>
+ <junit.version>5.5.1</junit.version>
<joor.version>0.9.12</joor.version>
<commons-io.version>2.6</commons-io.version>
<commons-lang.version>3.9</commons-lang.version>
[camel-k-runtime] 01/09: chore: restructure repository
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit daa0d1102b690d33d7af27d9808a838ca7be4e64
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Aug 13 18:54:34 2019 +0200
chore: restructure repository
---
camel-k-loader-js/pom.xml | 4 ----
.../camel-k-runtime-example-health/README.adoc | 0
.../camel-k-runtime-example-health/pom.xml | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/routes.groovy | 0
.../camel-k-runtime-example-servlet/README.adoc | 0
.../camel-k-runtime-example-servlet/pom.xml | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/routes.groovy | 0
.../camel-k-runtime-example-yaml/pom.xml | 0
.../src/main/java/org/apache/camel/k/example/Event.java | 0
.../src/main/resources/application.properties | 0
.../camel-k-runtime-example-yaml/src/main/resources/routes.yaml | 0
{camel-k-runtime-examples => examples}/pom.xml | 0
pom.xml | 5 +++--
{camel-k-maven-plugin => tooling/camel-k-maven-plugin}/pom.xml | 2 +-
.../java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java | 0
.../apache/camel/k/tooling/maven/GenerateDependencyListMojo.java | 0
.../main/java/org/apache/camel/k/tooling/maven/GenerateRestXML.java | 0
.../main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java | 0
.../main/java/org/apache/camel/k/tooling/maven/model/Artifact.java | 0
.../java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java | 0
.../java/org/apache/camel/k/tooling/maven/model/CamelScheme.java | 0
.../camel/k/tooling/maven/model/CatalogComponentDefinition.java | 0
.../camel/k/tooling/maven/model/CatalogDataFormatDefinition.java | 0
.../camel/k/tooling/maven/model/CatalogLanguageDefinition.java | 0
.../org/apache/camel/k/tooling/maven/model/CatalogProcessor.java | 0
.../java/org/apache/camel/k/tooling/maven/model/CatalogSupport.java | 0
.../org/apache/camel/k/tooling/maven/model/crd/CamelCatalog.java | 0
.../apache/camel/k/tooling/maven/model/crd/CamelCatalogSpec.java | 0
.../java/org/apache/camel/k/tooling/maven/model/k8s/ObjectMeta.java | 0
.../java/org/apache/camel/k/tooling/maven/model/k8s/TypeMeta.java | 0
.../apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java | 0
.../org.apache.camel.k.tooling.maven.model.CatalogProcessor | 0
.../camel-k-maven-plugin}/src/main/resources/catalog-license.txt | 0
.../k/tooling/maven/processors/AbstractCataloProcessorTest.java | 0
.../camel/k/tooling/maven/processors/CatalogProcessor3Test.java | 0
{camel-k-runtime-examples => tooling}/pom.xml | 6 ++----
38 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/camel-k-loader-js/pom.xml b/camel-k-loader-js/pom.xml
index 99d2cb7..2a5dac2 100644
--- a/camel-k-loader-js/pom.xml
+++ b/camel-k-loader-js/pom.xml
@@ -132,10 +132,6 @@
<version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-endpointdsl</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-health/README.adoc b/examples/camel-k-runtime-example-health/README.adoc
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-health/README.adoc
rename to examples/camel-k-runtime-example-health/README.adoc
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml b/examples/camel-k-runtime-example-health/pom.xml
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml
rename to examples/camel-k-runtime-example-health/pom.xml
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-health/src/main/resources/application.properties b/examples/camel-k-runtime-example-health/src/main/resources/application.properties
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-health/src/main/resources/application.properties
rename to examples/camel-k-runtime-example-health/src/main/resources/application.properties
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-servlet/src/main/resources/routes.groovy b/examples/camel-k-runtime-example-health/src/main/resources/routes.groovy
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-servlet/src/main/resources/routes.groovy
rename to examples/camel-k-runtime-example-health/src/main/resources/routes.groovy
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-servlet/README.adoc b/examples/camel-k-runtime-example-servlet/README.adoc
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-servlet/README.adoc
rename to examples/camel-k-runtime-example-servlet/README.adoc
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml b/examples/camel-k-runtime-example-servlet/pom.xml
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml
rename to examples/camel-k-runtime-example-servlet/pom.xml
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-servlet/src/main/resources/application.properties b/examples/camel-k-runtime-example-servlet/src/main/resources/application.properties
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-servlet/src/main/resources/application.properties
rename to examples/camel-k-runtime-example-servlet/src/main/resources/application.properties
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-health/src/main/resources/routes.groovy b/examples/camel-k-runtime-example-servlet/src/main/resources/routes.groovy
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-health/src/main/resources/routes.groovy
rename to examples/camel-k-runtime-example-servlet/src/main/resources/routes.groovy
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-yaml/pom.xml b/examples/camel-k-runtime-example-yaml/pom.xml
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-yaml/pom.xml
rename to examples/camel-k-runtime-example-yaml/pom.xml
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-yaml/src/main/java/org/apache/camel/k/example/Event.java b/examples/camel-k-runtime-example-yaml/src/main/java/org/apache/camel/k/example/Event.java
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-yaml/src/main/java/org/apache/camel/k/example/Event.java
rename to examples/camel-k-runtime-example-yaml/src/main/java/org/apache/camel/k/example/Event.java
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-yaml/src/main/resources/application.properties b/examples/camel-k-runtime-example-yaml/src/main/resources/application.properties
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-yaml/src/main/resources/application.properties
rename to examples/camel-k-runtime-example-yaml/src/main/resources/application.properties
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-yaml/src/main/resources/routes.yaml b/examples/camel-k-runtime-example-yaml/src/main/resources/routes.yaml
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-yaml/src/main/resources/routes.yaml
rename to examples/camel-k-runtime-example-yaml/src/main/resources/routes.yaml
diff --git a/camel-k-runtime-examples/pom.xml b/examples/pom.xml
similarity index 100%
copy from camel-k-runtime-examples/pom.xml
copy to examples/pom.xml
diff --git a/pom.xml b/pom.xml
index dfacccc..ae365be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,7 +187,6 @@
<modules>
<module>camel-knative-http</module>
<module>camel-knative</module>
- <module>camel-k-maven-plugin</module>
<module>camel-k-runtime-core</module>
<module>camel-k-runtime-main</module>
@@ -200,10 +199,12 @@
<module>camel-k-runtime-health</module>
<module>camel-k-runtime-servlet</module>
- <module>camel-k-runtime-examples</module>
<module>camel-k-runtime-knative</module>
<module>camel-k-runtime-bom</module>
<module>camel-k-runtime-legacy</module>
+
+ <module>tooling</module>
+ <module>examples</module>
<module>distribution</module>
</modules>
diff --git a/camel-k-maven-plugin/pom.xml b/tooling/camel-k-maven-plugin/pom.xml
similarity index 99%
rename from camel-k-maven-plugin/pom.xml
rename to tooling/camel-k-maven-plugin/pom.xml
index f9989ad..fa8e2e2 100644
--- a/camel-k-maven-plugin/pom.xml
+++ b/tooling/camel-k-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
+ <artifactId>camel-k-tooling</artifactId>
<version>1.0.1-SNAPSHOT</version>
</parent>
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateRestXML.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateRestXML.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateRestXML.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateRestXML.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/Artifact.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/Artifact.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/Artifact.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/Artifact.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelScheme.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelScheme.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelScheme.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelScheme.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogComponentDefinition.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogComponentDefinition.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogComponentDefinition.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogComponentDefinition.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogDataFormatDefinition.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogDataFormatDefinition.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogDataFormatDefinition.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogDataFormatDefinition.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogLanguageDefinition.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogLanguageDefinition.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogLanguageDefinition.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogLanguageDefinition.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogProcessor.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogProcessor.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogProcessor.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogProcessor.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogSupport.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogSupport.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogSupport.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogSupport.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalog.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalog.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalog.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalog.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalogSpec.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalogSpec.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalogSpec.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalogSpec.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/ObjectMeta.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/ObjectMeta.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/ObjectMeta.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/ObjectMeta.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/TypeMeta.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/TypeMeta.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/TypeMeta.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/TypeMeta.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java
diff --git a/camel-k-maven-plugin/src/main/resources/META-INF/services/org.apache.camel.k.tooling.maven.model.CatalogProcessor b/tooling/camel-k-maven-plugin/src/main/resources/META-INF/services/org.apache.camel.k.tooling.maven.model.CatalogProcessor
similarity index 100%
rename from camel-k-maven-plugin/src/main/resources/META-INF/services/org.apache.camel.k.tooling.maven.model.CatalogProcessor
rename to tooling/camel-k-maven-plugin/src/main/resources/META-INF/services/org.apache.camel.k.tooling.maven.model.CatalogProcessor
diff --git a/camel-k-maven-plugin/src/main/resources/catalog-license.txt b/tooling/camel-k-maven-plugin/src/main/resources/catalog-license.txt
similarity index 100%
rename from camel-k-maven-plugin/src/main/resources/catalog-license.txt
rename to tooling/camel-k-maven-plugin/src/main/resources/catalog-license.txt
diff --git a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java b/tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java
similarity index 100%
rename from camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java
rename to tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java
diff --git a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java b/tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
similarity index 100%
rename from camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
rename to tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
diff --git a/camel-k-runtime-examples/pom.xml b/tooling/pom.xml
similarity index 85%
rename from camel-k-runtime-examples/pom.xml
rename to tooling/pom.xml
index 5ad05fd..a473ef7 100644
--- a/camel-k-runtime-examples/pom.xml
+++ b/tooling/pom.xml
@@ -26,13 +26,11 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <artifactId>camel-k-runtime-examples</artifactId>
+ <artifactId>camel-k-tooling</artifactId>
<modules>
- <module>camel-k-runtime-example-servlet</module>
- <module>camel-k-runtime-example-health</module>
- <module>camel-k-runtime-example-yaml</module>
+ <module>camel-k-maven-plugin</module>
</modules>
</project>
[camel-k-runtime] 09/09: chore(build): migrate deprecate classes
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 91920914e2e6a65704ad7765bd29c01d36c4785a
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Aug 13 19:03:43 2019 +0200
chore(build): migrate deprecate classes
---
.../src/test/java/org/apache/camel/k/main/RuntimeTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java b/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java
index 8333955..b5eca85 100644
--- a/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java
+++ b/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java
@@ -28,7 +28,7 @@ import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public class RuntimeTest {
@Disabled
[camel-k-runtime] 05/09: chore(deps): update groovy to v2.5.8
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit ae2d3ff1743538aac92cf91becb587b7f130f5ec
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Aug 13 18:57:48 2019 +0200
chore(deps): update groovy to v2.5.8
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0e1d503..da8a914 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<assertj.version>3.13.2</assertj.version>
<log4j2.version>2.12.0</log4j2.version>
<slf4j.version>1.7.26</slf4j.version>
- <groovy.version>2.5.7</groovy.version>
+ <groovy.version>2.5.8</groovy.version>
<kotlin.version>1.3.41</kotlin.version>
<snakeyaml.version>1.24</snakeyaml.version>
<spock.version>1.3-groovy-2.5</spock.version>
[camel-k-runtime] 07/09: chore(deps): update slf4j to v1.7.28
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit f6944927145e3ff01eff94c8fdeace8559b615b1
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Aug 13 18:59:02 2019 +0200
chore(deps): update slf4j to v1.7.28
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1cfd4cd..4997c28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<commons-collections4.version>4.4</commons-collections4.version>
<assertj.version>3.13.2</assertj.version>
<log4j2.version>2.12.0</log4j2.version>
- <slf4j.version>1.7.26</slf4j.version>
+ <slf4j.version>1.7.28</slf4j.version>
<groovy.version>2.5.8</groovy.version>
<kotlin.version>1.3.41</kotlin.version>
<snakeyaml.version>1.24</snakeyaml.version>
[camel-k-runtime] 06/09: chore(deps): update common-collections4 to
v4.4
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit f8ba6de24fef1d44b606eb9cb463b8fb98103a4b
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Aug 13 18:58:33 2019 +0200
chore(deps): update common-collections4 to v4.4
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index da8a914..1cfd4cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<joor.version>0.9.12</joor.version>
<commons-io.version>2.6</commons-io.version>
<commons-lang.version>3.9</commons-lang.version>
- <commons-collections4.version>4.3</commons-collections4.version>
+ <commons-collections4.version>4.4</commons-collections4.version>
<assertj.version>3.13.2</assertj.version>
<log4j2.version>2.12.0</log4j2.version>
<slf4j.version>1.7.26</slf4j.version>
[camel-k-runtime] 04/09: chore(deps): update graalvm to v19.1.1
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 998be7d9634c14d3aaeb6d0bcf61b081a43e30ae
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Aug 13 18:57:05 2019 +0200
chore(deps): update graalvm to v19.1.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index de8b899..0e1d503 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
<immutables.version>2.7.5</immutables.version>
<semver4j.version>2.2.0</semver4j.version>
<undertow.version>1.4.26.Final</undertow.version>
- <graalvm.version>19.0.2</graalvm.version>
+ <graalvm.version>19.1.1</graalvm.version>
<gmavenplus-plugin.version>1.7.1</gmavenplus-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
[camel-k-runtime] 08/09: chore(deps): update log4j to v2.12.1
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 2de43f22d102dc3e1a08e585f2bb351e081aeab9
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Aug 13 18:59:45 2019 +0200
chore(deps): update log4j to v2.12.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4997c28..21a7a89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
<commons-lang.version>3.9</commons-lang.version>
<commons-collections4.version>4.4</commons-collections4.version>
<assertj.version>3.13.2</assertj.version>
- <log4j2.version>2.12.0</log4j2.version>
+ <log4j2.version>2.12.1</log4j2.version>
<slf4j.version>1.7.28</slf4j.version>
<groovy.version>2.5.8</groovy.version>
<kotlin.version>1.3.41</kotlin.version>
[camel-k-runtime] 03/09: chore(deps): update assertj to v3.13.2
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 50b18c1fc088253880dea414f973b9f4c5ba5f0f
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Aug 13 18:56:12 2019 +0200
chore(deps): update assertj to v3.13.2
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ca203ed..de8b899 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<commons-io.version>2.6</commons-io.version>
<commons-lang.version>3.9</commons-lang.version>
<commons-collections4.version>4.3</commons-collections4.version>
- <assertj.version>3.12.2</assertj.version>
+ <assertj.version>3.13.2</assertj.version>
<log4j2.version>2.12.0</log4j2.version>
<slf4j.version>1.7.26</slf4j.version>
<groovy.version>2.5.7</groovy.version>