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 af593de435d6915e92d5b619ff5d9b535421f682
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Tue Jul 16 12:52:23 2019 +0200
Fix modularization leftovers
---
camel-k-loader-groovy/pom.xml | 19 ++--
.../org.codehaus.groovy.runtime.ExtensionModule | 2 +-
.../k/loader/groovy/dsl/IntegrationTest.groovy | 2 +-
camel-k-loader-java/pom.xml | 20 +---
camel-k-loader-js/pom.xml | 20 +---
camel-k-loader-kotlin/pom.xml | 16 ++--
.../camel/k/loader/kotlin/dsl/IntegrationTest.kt | 2 +-
.../camel/k/loader/yaml/YamlRoutesLoader.java | 2 +-
.../maven/processors/CatalogProcessor3x.java | 104 ++++++++++++++++++---
.../maven/processors/CatalogProcessor3Test.java | 45 ++++++---
.../camel-k-runtime-example-servlet/pom.xml | 2 +-
.../camel-k-runtime-example-yaml/pom.xml | 2 +-
camel-k-runtime-health/pom.xml | 2 +-
.../camel-k-runtime-groovy/pom.xml | 1 -
.../java/org/apache/camel/k/groovy/Runtime.java | 20 ++++
camel-k-runtime-legacy/camel-k-runtime-jvm/pom.xml | 1 -
.../java/org/apache/camel/k/jvm}/Application.java | 26 +-----
.../camel-k-runtime-kotlin/pom.xml | 1 -
.../java/org/apache/camel/k/kotlin/Runtime.java | 20 ++++
.../camel-k-runtime-yaml/pom.xml | 1 -
.../main/java/org/apache/camel/k/yaml/Runtime.java | 20 ++++
.../java/org/apache/camel/k/main/Application.java | 2 +-
camel-k-runtime-servlet/pom.xml | 2 +-
23 files changed, 219 insertions(+), 113 deletions(-)
diff --git a/camel-k-loader-groovy/pom.xml b/camel-k-loader-groovy/pom.xml
index 64300db..cd51a88 100644
--- a/camel-k-loader-groovy/pom.xml
+++ b/camel-k-loader-groovy/pom.xml
@@ -30,9 +30,8 @@
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-jvm</artifactId>
+ <artifactId>camel-k-runtime-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
@@ -48,7 +47,6 @@
<artifactId>camel-log</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-groovy</artifactId>
@@ -60,7 +58,6 @@
</exclusions>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
@@ -68,12 +65,11 @@
<scope>provided</scope>
</dependency>
- <!-- ****************************** -->
- <!-- -->
- <!-- TESTS -->
- <!-- -->
- <!-- ****************************** -->
-
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-main</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-timer</artifactId>
@@ -99,7 +95,6 @@
<artifactId>camel-properties</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-test</artifactId>
@@ -129,13 +124,13 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
diff --git
a/camel-k-loader-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
b/camel-k-loader-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
index 435a95c..09569be 100644
---
a/camel-k-loader-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
+++
b/camel-k-loader-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
@@ -1,4 +1,4 @@
-moduleName=camel-k-runtime-groovy
+moduleName=camel-k-loader-groovy
moduleVersion=0.0.3-SNAPSHOT
extensionClasses=org.apache.camel.k.loader.groovy.extension.LogComponentExtension
#staticExtensionClasses=support.StaticStringExtension
\ No newline at end of file
diff --git
a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationTest.groovy
b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationTest.groovy
index 3c241ad..577d59b 100644
---
a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationTest.groovy
+++
b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/dsl/IntegrationTest.groovy
@@ -20,8 +20,8 @@ import org.apache.camel.Processor
import org.apache.camel.component.log.LogComponent
import org.apache.camel.component.seda.SedaComponent
import org.apache.camel.k.Runtime
-import org.apache.camel.k.jvm.ApplicationRuntime
import org.apache.camel.k.listener.RoutesConfigurer
+import org.apache.camel.k.main.ApplicationRuntime
import org.apache.camel.processor.FatalFallbackErrorHandler
import org.apache.camel.processor.SendProcessor
import org.apache.camel.processor.channel.DefaultChannel
diff --git a/camel-k-loader-java/pom.xml b/camel-k-loader-java/pom.xml
index 23d09e7..c575a5b 100644
--- a/camel-k-loader-java/pom.xml
+++ b/camel-k-loader-java/pom.xml
@@ -28,36 +28,26 @@
<artifactId>camel-k-loader-java</artifactId>
<dependencies>
-
- <!-- ****************************** -->
- <!-- -->
- <!-- RUNTIME -->
- <!-- -->
- <!-- ****************************** -->
-
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.jooq</groupId>
<artifactId>joor-java-8</artifactId>
<version>${joor.version}</version>
</dependency>
- <!-- ****************************** -->
- <!-- -->
- <!-- TESTS -->
- <!-- -->
- <!-- ****************************** -->
-
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-main</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-undertow</artifactId>
diff --git a/camel-k-loader-js/pom.xml b/camel-k-loader-js/pom.xml
index 7a7a2dd..7b496c7 100644
--- a/camel-k-loader-js/pom.xml
+++ b/camel-k-loader-js/pom.xml
@@ -28,36 +28,26 @@
<artifactId>camel-k-loader-js</artifactId>
<dependencies>
-
- <!-- ****************************** -->
- <!-- -->
- <!-- RUNTIME -->
- <!-- -->
- <!-- ****************************** -->
-
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js</artifactId>
<version>${graalvm.version}</version>
</dependency>
- <!-- ****************************** -->
- <!-- -->
- <!-- TESTS -->
- <!-- -->
- <!-- ****************************** -->
-
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-main</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-undertow</artifactId>
diff --git a/camel-k-loader-kotlin/pom.xml b/camel-k-loader-kotlin/pom.xml
index 91f4d5a..478ca74 100644
--- a/camel-k-loader-kotlin/pom.xml
+++ b/camel-k-loader-kotlin/pom.xml
@@ -30,9 +30,8 @@
<dependencies>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-jvm</artifactId>
+ <artifactId>camel-k-runtime-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
@@ -48,7 +47,6 @@
<artifactId>camel-log</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
@@ -70,12 +68,11 @@
<version>${kotlin.version}</version>
</dependency>
- <!-- ****************************** -->
- <!-- -->
- <!-- TESTS -->
- <!-- -->
- <!-- ****************************** -->
-
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-main</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-timer</artifactId>
@@ -120,6 +117,7 @@
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
diff --git
a/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/dsl/IntegrationTest.kt
b/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/dsl/IntegrationTest.kt
index 991d909..7124fbf 100644
---
a/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/dsl/IntegrationTest.kt
+++
b/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/dsl/IntegrationTest.kt
@@ -20,8 +20,8 @@ import org.apache.camel.Processor
import org.apache.camel.component.log.LogComponent
import org.apache.camel.component.seda.SedaComponent
import org.apache.camel.k.Runtime
-import org.apache.camel.k.jvm.ApplicationRuntime
import org.apache.camel.k.listener.RoutesConfigurer
+import org.apache.camel.k.main.ApplicationRuntime
import org.apache.camel.model.ModelCamelContext
import org.apache.camel.processor.FatalFallbackErrorHandler
import org.apache.camel.spi.ExchangeFormatter
diff --git
a/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/YamlRoutesLoader.java
b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/YamlRoutesLoader.java
index 2512a89..00e08db 100644
---
a/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/YamlRoutesLoader.java
+++
b/camel-k-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/YamlRoutesLoader.java
@@ -25,10 +25,10 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.k.RoutesLoader;
import org.apache.camel.k.Source;
-import org.apache.camel.k.support.URIResolver;
import org.apache.camel.k.loader.yaml.model.Route;
import org.apache.camel.k.loader.yaml.parser.StartStepParser;
import org.apache.camel.k.loader.yaml.parser.StepParser;
+import org.apache.camel.k.support.URIResolver;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RoutesDefinition;
diff --git
a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java
b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java
index 881d0f8..698850f 100644
---
a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java
+++
b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java
@@ -84,14 +84,14 @@ public class CatalogProcessor3x implements CatalogProcessor
{
// ************************
//
- // camel-k-runtime-jvm
+ // camel-k-runtime-main
//
// ************************
{
CamelArtifact artifact = new CamelArtifact();
artifact.setGroupId("org.apache.camel.k");
- artifact.setArtifactId("camel-k-runtime-jvm");
+ artifact.setArtifactId("camel-k-runtime-main");
artifact.setVersion(project.getVersion());
artifact.addDependency("org.apache.camel", "camel-core-engine");
artifact.addDependency("org.apache.camel", "camel-main");
@@ -102,14 +102,14 @@ public class CatalogProcessor3x implements
CatalogProcessor {
// ************************
//
- // camel-k-runtime-groovy
+ // camel-k-loader-groovy
//
// ************************
{
CamelArtifact artifact = new CamelArtifact();
artifact.setGroupId("org.apache.camel.k");
- artifact.setArtifactId("camel-k-runtime-groovy");
+ artifact.setArtifactId("camel-k-loader-groovy");
artifact.setVersion(project.getVersion());
artifact.addDependency("org.apache.camel", "camel-groovy");
@@ -118,14 +118,59 @@ public class CatalogProcessor3x implements
CatalogProcessor {
// ************************
//
- // camel-k-runtime-kotlin
+ // camel-k-loader-kotlin
//
// ************************
{
CamelArtifact artifact = new CamelArtifact();
artifact.setGroupId("org.apache.camel.k");
- artifact.setArtifactId("camel-k-runtime-kotlin");
+ artifact.setArtifactId("camel-k-loader-kotlin");
+ artifact.setVersion(project.getVersion());
+
+ artifacts.put(artifact.getArtifactId(), artifact);
+ }
+
+ // ************************
+ //
+ // camel-k-loader-js
+ //
+ // ************************
+
+ {
+ CamelArtifact artifact = new CamelArtifact();
+ artifact.setGroupId("org.apache.camel.k");
+ artifact.setArtifactId("camel-k-loader-js");
+ artifact.setVersion(project.getVersion());
+
+ artifacts.put(artifact.getArtifactId(), artifact);
+ }
+
+ // ************************
+ //
+ // camel-k-loader-xml
+ //
+ // ************************
+
+ {
+ CamelArtifact artifact = new CamelArtifact();
+ artifact.setGroupId("org.apache.camel.k");
+ artifact.setArtifactId("camel-k-loader-xml");
+ artifact.setVersion(project.getVersion());
+
+ artifacts.put(artifact.getArtifactId(), artifact);
+ }
+
+ // ************************
+ //
+ // camel-k-loader-java
+ //
+ // ************************
+
+ {
+ CamelArtifact artifact = new CamelArtifact();
+ artifact.setGroupId("org.apache.camel.k");
+ artifact.setArtifactId("camel-k-loader-java");
artifact.setVersion(project.getVersion());
artifacts.put(artifact.getArtifactId(), artifact);
@@ -190,7 +235,7 @@ public class CatalogProcessor3x implements CatalogProcessor
{
CamelArtifact artifact = new CamelArtifact();
artifact.setGroupId("org.apache.camel.k");
artifact.setArtifactId("camel-k-runtime-knative");
- artifact.addDependency("org.apache.camel.k",
"camel-k-runtime-yaml");
+ artifact.addDependency("org.apache.camel.k",
"camel-k-loader-yaml");
artifact.addDependency("org.apache.camel.k", "camel-knative");
artifact.addDependency("org.apache.camel.k", "camel-knative-http");
artifact.addDependency("org.apache.camel", "camel-netty4-http");
@@ -200,22 +245,55 @@ public class CatalogProcessor3x implements
CatalogProcessor {
// ************************
//
- // camel-http4
+ // legacy
//
// ************************
{
CamelArtifact artifact = new CamelArtifact();
artifact.setGroupId("org.apache.camel.k");
- artifact.setArtifactId("camel-k-runtime-knative");
- artifact.addDependency("org.apache.camel.k",
"camel-k-runtime-yaml");
- artifact.addDependency("org.apache.camel.k", "camel-knative");
- artifact.addDependency("org.apache.camel.k", "camel-knative-http");
- artifact.addDependency("org.apache.camel", "camel-netty4-http");
+ artifact.setArtifactId("camel-k-runtime-jvm");
+ artifact.setVersion(project.getVersion());
+ artifact.addDependency("org.apache.camel.k",
"camel-k-runtime-main");
+ artifact.addDependency("org.apache.camel.k", "camel-k-loader-js");
+ artifact.addDependency("org.apache.camel.k", "camel-k-loader-xml");
+ artifact.addDependency("org.apache.camel.k",
"camel-k-loader-java");
+ artifact.addDependency("org.apache.camel", "camel-core-engine");
+ artifact.addDependency("org.apache.camel", "camel-main");
+ artifact.addDependency("org.apache.camel", "camel-properties");
+
+ artifacts.put(artifact.getArtifactId(), artifact);
+ }
+
+ {
+ CamelArtifact artifact = new CamelArtifact();
+ artifact.setGroupId("org.apache.camel.k");
+ artifact.setArtifactId("camel-k-runtime-groovy");
+ artifact.setVersion(project.getVersion());
+ artifact.addDependency("org.apache.camel.k",
"camel-k-loader-groovy");
+ artifact.addDependency("org.apache.camel", "camel-groovy");
artifacts.put(artifact.getArtifactId(), artifact);
+ }
+ {
+ CamelArtifact artifact = new CamelArtifact();
+ artifact.setGroupId("org.apache.camel.k");
+ artifact.setArtifactId("camel-k-runtime-kotlin");
+ artifact.setVersion(project.getVersion());
+ artifact.addDependency("org.apache.camel.k",
"camel-k-loader-kotlin");
+ artifacts.put(artifact.getArtifactId(), artifact);
+ }
+
+ {
+ CamelArtifact artifact = new CamelArtifact();
+ artifact.setGroupId("org.apache.camel.k");
+ artifact.setArtifactId("camel-k-runtime-yaml");
+ artifact.setVersion(project.getVersion());
+ artifact.addDependency("org.apache.camel.k",
"camel-k-loader-yaml");
+
+ artifacts.put(artifact.getArtifactId(), artifact);
}
// ************************
diff --git
a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
b/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
index 295e8e2..c1457ea 100644
---
a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
+++
b/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
@@ -83,20 +83,6 @@ public class CatalogProcessor3Test extends
AbstractCataloProcessorTest {
assertThat(processor.accepts(catalog)).isTrue();
processor.process(new MavenProject(), catalog, artifactMap);
-
- assertThat(artifactMap.get("camel-k-runtime-jvm")).satisfies(a -> {
- assertThat(a.getDependencies()).anyMatch(
- d -> d.getGroupId().equals("org.apache.camel") &&
d.getArtifactId().equals("camel-core-engine")
- );
- assertThat(a.getDependencies()).anyMatch(
- d -> d.getGroupId().equals("org.apache.camel") &&
d.getArtifactId().equals("camel-properties")
- );
- });
- assertThat(artifactMap.get("camel-k-runtime-groovy")).satisfies(a -> {
- assertThat(a.getDependencies()).anyMatch(
- d -> d.getGroupId().equals("org.apache.camel") &&
d.getArtifactId().equals("camel-groovy")
- );
- });
assertThat(artifactMap.get("camel-k-runtime-health")).satisfies(a -> {
assertThat(a.getDependencies()).anyMatch(
d -> d.getGroupId().equals("org.apache.camel") &&
d.getArtifactId().equals("camel-servlet")
@@ -110,6 +96,7 @@ public class CatalogProcessor3Test extends
AbstractCataloProcessorTest {
d -> d.getGroupId().equals("org.apache.camel") &&
d.getArtifactId().equals("camel-servlet")
);
});
+
assertThat(artifactMap.get("camel-k-runtime-knative")).satisfies(a -> {
assertThat(a.getDependencies()).anyMatch(
d -> d.getGroupId().equals("org.apache.camel.k") &&
d.getArtifactId().equals("camel-knative")
@@ -118,7 +105,7 @@ public class CatalogProcessor3Test extends
AbstractCataloProcessorTest {
d -> d.getGroupId().equals("org.apache.camel.k") &&
d.getArtifactId().equals("camel-knative-http")
);
assertThat(a.getDependencies()).anyMatch(
- d -> d.getGroupId().equals("org.apache.camel.k") &&
d.getArtifactId().equals("camel-k-runtime-yaml")
+ d -> d.getGroupId().equals("org.apache.camel.k") &&
d.getArtifactId().equals("camel-k-loader-yaml")
);
assertThat(a.getDependencies()).anyMatch(
d -> d.getGroupId().equals("org.apache.camel") &&
d.getArtifactId().equals("camel-netty4-http")
@@ -137,4 +124,32 @@ public class CatalogProcessor3Test extends
AbstractCataloProcessorTest {
);
});
}
+
+ @Test
+ public void testLegacyArtifactsEnrichment() {
+ CatalogProcessor processor = new CatalogProcessor3x();
+ CamelCatalog catalog = versionCamelCatalog("3.0.0");
+ Map<String, CamelArtifact> artifactMap = new HashMap<>();
+ artifactMap.put("camel-http4", new CamelArtifact());
+
+ assertThat(processor.accepts(catalog)).isTrue();
+ processor.process(new MavenProject(), catalog, artifactMap);
+
+
+ assertThat(artifactMap.get("camel-k-runtime-jvm")).satisfies(a -> {
+ assertThat(a.getDependencies()).anyMatch(
+ d -> d.getGroupId().equals("org.apache.camel.k") &&
d.getArtifactId().equals("camel-k-runtime-main")
+ );
+ });
+ assertThat(artifactMap.get("camel-k-runtime-groovy")).satisfies(a -> {
+ assertThat(a.getDependencies()).anyMatch(
+ d -> d.getGroupId().equals("org.apache.camel.k") &&
d.getArtifactId().equals("camel-k-loader-groovy")
+ );
+ });
+ assertThat(artifactMap.get("camel-k-runtime-kotlin")).satisfies(a -> {
+ assertThat(a.getDependencies()).anyMatch(
+ d -> d.getGroupId().equals("org.apache.camel.k") &&
d.getArtifactId().equals("camel-k-loader-kotlin")
+ );
+ });
+ }
}
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml
b/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml
index 443a376..8a41b27 100644
--- a/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml
+++ b/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml
@@ -53,7 +53,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-jvm</artifactId>
+ <artifactId>camel-k-runtime-main</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-yaml/pom.xml
b/camel-k-runtime-examples/camel-k-runtime-example-yaml/pom.xml
index 38d92ed..7e5b532 100644
--- a/camel-k-runtime-examples/camel-k-runtime-example-yaml/pom.xml
+++ b/camel-k-runtime-examples/camel-k-runtime-example-yaml/pom.xml
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-jvm</artifactId>
+ <artifactId>camel-k-runtime-main</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
diff --git a/camel-k-runtime-health/pom.xml b/camel-k-runtime-health/pom.xml
index 0888876..73ec089 100644
--- a/camel-k-runtime-health/pom.xml
+++ b/camel-k-runtime-health/pom.xml
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-jvm</artifactId>
+ <artifactId>camel-k-runtime-main</artifactId>
<scope>test</scope>
</dependency>
diff --git a/camel-k-runtime-legacy/camel-k-runtime-groovy/pom.xml
b/camel-k-runtime-legacy/camel-k-runtime-groovy/pom.xml
index 673ddac..b696b72 100644
--- a/camel-k-runtime-legacy/camel-k-runtime-groovy/pom.xml
+++ b/camel-k-runtime-legacy/camel-k-runtime-groovy/pom.xml
@@ -25,7 +25,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
<artifactId>camel-k-runtime-groovy</artifactId>
<dependencies>
diff --git
a/camel-k-runtime-legacy/camel-k-runtime-groovy/src/main/java/org/apache/camel/k/groovy/Runtime.java
b/camel-k-runtime-legacy/camel-k-runtime-groovy/src/main/java/org/apache/camel/k/groovy/Runtime.java
new file mode 100644
index 0000000..d42dbd3
--- /dev/null
+++
b/camel-k-runtime-legacy/camel-k-runtime-groovy/src/main/java/org/apache/camel/k/groovy/Runtime.java
@@ -0,0 +1,20 @@
+/*
+ * 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
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.k.groovy;
+
+public class Runtime {
+}
diff --git a/camel-k-runtime-legacy/camel-k-runtime-jvm/pom.xml
b/camel-k-runtime-legacy/camel-k-runtime-jvm/pom.xml
index 87e95fc..5dfd737 100644
--- a/camel-k-runtime-legacy/camel-k-runtime-jvm/pom.xml
+++ b/camel-k-runtime-legacy/camel-k-runtime-jvm/pom.xml
@@ -25,7 +25,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
<artifactId>camel-k-runtime-jvm</artifactId>
<dependencies>
diff --git
a/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/Application.java
b/camel-k-runtime-legacy/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/Application.java
similarity index 56%
copy from
camel-k-runtime-main/src/main/java/org/apache/camel/k/main/Application.java
copy to
camel-k-runtime-legacy/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/Application.java
index f5cc571..14fae24 100644
---
a/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/Application.java
+++
b/camel-k-runtime-legacy/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/Application.java
@@ -14,33 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.main;
+package org.apache.camel.k.jvm;
-import java.util.ServiceLoader;
-
-import org.apache.camel.k.Runtime;
-import org.apache.camel.k.support.PropertiesSupport;
+import org.slf4j.LoggerFactory;
public final class Application {
- static {
- //
- // Configure the logging subsystem log4j2 using a subset of spring boot
- // conventions:
- //
- // logging.level.${nane} = OFF|FATAL|ERROR|WARN|INFO|DEBUG|TRACE|ALL
- //
- // We now support setting the logging level only
- //
- ApplicationSupport.configureLogging();
- }
-
private Application() {
}
public static void main(String[] args) throws Exception {
- ApplicationRuntime runtime = new ApplicationRuntime();
- runtime.setProperties(PropertiesSupport.loadProperties());
- runtime.addListeners(ServiceLoader.load(Runtime.Listener.class));
- runtime.run();
+ LoggerFactory.getLogger(Application.class).warn("Legacy Camel K
runtime detected");
+
+ org.apache.camel.k.main.Application.main(args);
}
}
diff --git a/camel-k-runtime-legacy/camel-k-runtime-kotlin/pom.xml
b/camel-k-runtime-legacy/camel-k-runtime-kotlin/pom.xml
index 297cd0d..ab3ce5c 100644
--- a/camel-k-runtime-legacy/camel-k-runtime-kotlin/pom.xml
+++ b/camel-k-runtime-legacy/camel-k-runtime-kotlin/pom.xml
@@ -25,7 +25,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
<artifactId>camel-k-runtime-kotlin</artifactId>
<dependencies>
diff --git
a/camel-k-runtime-legacy/camel-k-runtime-kotlin/src/main/java/org/apache/camel/k/kotlin/Runtime.java
b/camel-k-runtime-legacy/camel-k-runtime-kotlin/src/main/java/org/apache/camel/k/kotlin/Runtime.java
new file mode 100644
index 0000000..1095673
--- /dev/null
+++
b/camel-k-runtime-legacy/camel-k-runtime-kotlin/src/main/java/org/apache/camel/k/kotlin/Runtime.java
@@ -0,0 +1,20 @@
+/*
+ * 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
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.k.kotlin;
+
+public class Runtime {
+}
diff --git a/camel-k-runtime-legacy/camel-k-runtime-yaml/pom.xml
b/camel-k-runtime-legacy/camel-k-runtime-yaml/pom.xml
index b014507..8712b8b 100644
--- a/camel-k-runtime-legacy/camel-k-runtime-yaml/pom.xml
+++ b/camel-k-runtime-legacy/camel-k-runtime-yaml/pom.xml
@@ -25,7 +25,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
<artifactId>camel-k-runtime-yaml</artifactId>
<dependencies>
diff --git
a/camel-k-runtime-legacy/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/Runtime.java
b/camel-k-runtime-legacy/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/Runtime.java
new file mode 100644
index 0000000..bf90dcc
--- /dev/null
+++
b/camel-k-runtime-legacy/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/Runtime.java
@@ -0,0 +1,20 @@
+/*
+ * 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
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.k.yaml;
+
+public class Runtime {
+}
diff --git
a/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/Application.java
b/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/Application.java
index f5cc571..7725bab 100644
---
a/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/Application.java
+++
b/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/Application.java
@@ -36,7 +36,7 @@ public final class Application {
private Application() {
}
-
+
public static void main(String[] args) throws Exception {
ApplicationRuntime runtime = new ApplicationRuntime();
runtime.setProperties(PropertiesSupport.loadProperties());
diff --git a/camel-k-runtime-servlet/pom.xml b/camel-k-runtime-servlet/pom.xml
index 3e9c69f..cd03968 100644
--- a/camel-k-runtime-servlet/pom.xml
+++ b/camel-k-runtime-servlet/pom.xml
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-jvm</artifactId>
+ <artifactId>camel-k-runtime-main</artifactId>
<scope>test</scope>
</dependency>
<dependency>
