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 8d8acbb1837cadf319a75e30597ac7e8189899cf
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Tue Jul 16 09:43:33 2019 +0200
camel-k-runtime-jvm is misleading #101
---
camel-k-runtime-bom/pom.xml | 7 ++++-
.../{ => camel-k-runtime-jvm}/pom.xml | 30 +++++++++++++++-------
camel-k-runtime-legacy/pom.xml | 2 +-
.../pom.xml | 19 +-------------
.../java/org/apache/camel/k/main}/Application.java | 2 +-
.../apache/camel/k/main}/ApplicationRuntime.java | 2 +-
.../apache/camel/k/main}/ApplicationSupport.java | 2 +-
.../src/main/resources/log4j2.properties | 0
.../org/apache/camel/k/main}/PropertiesTest.java | 2 +-
.../java/org/apache/camel/k/main}/RuntimeTest.java | 2 +-
.../org/apache/camel/k/main}/TestCustomizer.java | 2 +-
.../services/org/apache/camel/k/customizer/test | 2 +-
.../src/test/resources/conf.d/001/conf.properties | 0
.../src/test/resources/conf.d/002/conf.properties | 0
.../src/test/resources/conf.properties | 0
.../src/test/resources/log4j2-test.xml | 0
.../src/test/resources/my-resource.txt | 0
.../src/test/resources/r1.js | 0
.../src/test/resources/r2.mytype | 0
pom.xml | 11 +++++---
20 files changed, 44 insertions(+), 39 deletions(-)
diff --git a/camel-k-runtime-bom/pom.xml b/camel-k-runtime-bom/pom.xml
index c337d8d..f34f89d 100644
--- a/camel-k-runtime-bom/pom.xml
+++ b/camel-k-runtime-bom/pom.xml
@@ -112,7 +112,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-jvm</artifactId>
+ <artifactId>camel-k-runtime-main</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -180,6 +180,11 @@
<artifactId>camel-k-runtime-yaml</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-jvm</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- log4j2 -->
<dependency>
diff --git a/camel-k-runtime-legacy/pom.xml
b/camel-k-runtime-legacy/camel-k-runtime-jvm/pom.xml
similarity index 62%
copy from camel-k-runtime-legacy/pom.xml
copy to camel-k-runtime-legacy/camel-k-runtime-jvm/pom.xml
index dc41242..87e95fc 100644
--- a/camel-k-runtime-legacy/pom.xml
+++ b/camel-k-runtime-legacy/camel-k-runtime-jvm/pom.xml
@@ -20,19 +20,31 @@
<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-runtime-legacy</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <artifactId>camel-k-runtime-legacy</artifactId>
-
-
- <modules>
- <module>camel-k-runtime-kotlin</module>
- <module>camel-k-runtime-groovy</module>
- <module>camel-k-runtime-yaml</module>
- </modules>
+ <artifactId>camel-k-runtime-jvm</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-loader-xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-loader-js</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-loader-java</artifactId>
+ </dependency>
+ </dependencies>
</project>
diff --git a/camel-k-runtime-legacy/pom.xml b/camel-k-runtime-legacy/pom.xml
index dc41242..fc22916 100644
--- a/camel-k-runtime-legacy/pom.xml
+++ b/camel-k-runtime-legacy/pom.xml
@@ -28,11 +28,11 @@
<packaging>pom</packaging>
<artifactId>camel-k-runtime-legacy</artifactId>
-
<modules>
<module>camel-k-runtime-kotlin</module>
<module>camel-k-runtime-groovy</module>
<module>camel-k-runtime-yaml</module>
+ <module>camel-k-runtime-jvm</module>
</modules>
</project>
diff --git a/camel-k-runtime-jvm/pom.xml b/camel-k-runtime-main/pom.xml
similarity index 89%
rename from camel-k-runtime-jvm/pom.xml
rename to camel-k-runtime-main/pom.xml
index 1390ffb..7422b59 100644
--- a/camel-k-runtime-jvm/pom.xml
+++ b/camel-k-runtime-main/pom.xml
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-k-runtime-jvm</artifactId>
+ <artifactId>camel-k-runtime-main</artifactId>
<dependencies>
@@ -57,23 +57,6 @@
<version>${log4j2.version}</version>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.graalvm.js</groupId>
- <artifactId>js</artifactId>
- <version>${graalvm.version}</version>
- </dependency>
-
<!-- ****************************** -->
<!-- -->
<!-- TESTS -->
diff --git
a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/Application.java
b/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/Application.java
similarity index 98%
rename from
camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/Application.java
rename to
camel-k-runtime-main/src/main/java/org/apache/camel/k/main/Application.java
index 615a775..f5cc571 100644
--- a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/Application.java
+++
b/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/Application.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.jvm;
+package org.apache.camel.k.main;
import java.util.ServiceLoader;
diff --git
a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationRuntime.java
b/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationRuntime.java
similarity index 99%
rename from
camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationRuntime.java
rename to
camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationRuntime.java
index c1e205a..2df43e4 100644
---
a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationRuntime.java
+++
b/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationRuntime.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.jvm;
+package org.apache.camel.k.main;
import java.util.Comparator;
import java.util.LinkedHashSet;
diff --git
a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationSupport.java
b/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationSupport.java
similarity index 98%
rename from
camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationSupport.java
rename to
camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationSupport.java
index 05612d5..a45703c 100644
---
a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationSupport.java
+++
b/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationSupport.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.jvm;
+package org.apache.camel.k.main;
import java.util.Properties;
diff --git a/camel-k-runtime-jvm/src/main/resources/log4j2.properties
b/camel-k-runtime-main/src/main/resources/log4j2.properties
similarity index 100%
rename from camel-k-runtime-jvm/src/main/resources/log4j2.properties
rename to camel-k-runtime-main/src/main/resources/log4j2.properties
diff --git
a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/PropertiesTest.java
b/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/PropertiesTest.java
similarity index 99%
rename from
camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/PropertiesTest.java
rename to
camel-k-runtime-main/src/test/java/org/apache/camel/k/main/PropertiesTest.java
index 43cbed8..94e266a 100644
---
a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/PropertiesTest.java
+++
b/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/PropertiesTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.jvm;
+package org.apache.camel.k.main;
import java.util.Properties;
import java.util.concurrent.ThreadLocalRandom;
diff --git
a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RuntimeTest.java
b/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java
similarity index 98%
rename from
camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RuntimeTest.java
rename to
camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java
index 824e2d3..8333955 100644
--- a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RuntimeTest.java
+++
b/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.jvm;
+package org.apache.camel.k.main;
import java.util.List;
diff --git
a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/TestCustomizer.java
b/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/TestCustomizer.java
similarity index 97%
rename from
camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/TestCustomizer.java
rename to
camel-k-runtime-main/src/test/java/org/apache/camel/k/main/TestCustomizer.java
index f580316..4676101 100644
---
a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/TestCustomizer.java
+++
b/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/TestCustomizer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.k.jvm;
+package org.apache.camel.k.main;
import org.apache.camel.CamelContext;
import org.apache.camel.k.ContextCustomizer;
diff --git
a/camel-k-runtime-jvm/src/test/resources/META-INF/services/org/apache/camel/k/customizer/test
b/camel-k-runtime-main/src/test/resources/META-INF/services/org/apache/camel/k/customizer/test
similarity index 94%
rename from
camel-k-runtime-jvm/src/test/resources/META-INF/services/org/apache/camel/k/customizer/test
rename to
camel-k-runtime-main/src/test/resources/META-INF/services/org/apache/camel/k/customizer/test
index dc0dd22..a393d0e 100644
---
a/camel-k-runtime-jvm/src/test/resources/META-INF/services/org/apache/camel/k/customizer/test
+++
b/camel-k-runtime-main/src/test/resources/META-INF/services/org/apache/camel/k/customizer/test
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.k.jvm.TestCustomizer
\ No newline at end of file
+class=org.apache.camel.k.main.TestCustomizer
\ No newline at end of file
diff --git a/camel-k-runtime-jvm/src/test/resources/conf.d/001/conf.properties
b/camel-k-runtime-main/src/test/resources/conf.d/001/conf.properties
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/conf.d/001/conf.properties
rename to camel-k-runtime-main/src/test/resources/conf.d/001/conf.properties
diff --git a/camel-k-runtime-jvm/src/test/resources/conf.d/002/conf.properties
b/camel-k-runtime-main/src/test/resources/conf.d/002/conf.properties
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/conf.d/002/conf.properties
rename to camel-k-runtime-main/src/test/resources/conf.d/002/conf.properties
diff --git a/camel-k-runtime-jvm/src/test/resources/conf.properties
b/camel-k-runtime-main/src/test/resources/conf.properties
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/conf.properties
rename to camel-k-runtime-main/src/test/resources/conf.properties
diff --git a/camel-k-runtime-jvm/src/test/resources/log4j2-test.xml
b/camel-k-runtime-main/src/test/resources/log4j2-test.xml
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/log4j2-test.xml
rename to camel-k-runtime-main/src/test/resources/log4j2-test.xml
diff --git a/camel-k-runtime-jvm/src/test/resources/my-resource.txt
b/camel-k-runtime-main/src/test/resources/my-resource.txt
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/my-resource.txt
rename to camel-k-runtime-main/src/test/resources/my-resource.txt
diff --git a/camel-k-runtime-jvm/src/test/resources/r1.js
b/camel-k-runtime-main/src/test/resources/r1.js
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/r1.js
rename to camel-k-runtime-main/src/test/resources/r1.js
diff --git a/camel-k-runtime-jvm/src/test/resources/r2.mytype
b/camel-k-runtime-main/src/test/resources/r2.mytype
similarity index 100%
rename from camel-k-runtime-jvm/src/test/resources/r2.mytype
rename to camel-k-runtime-main/src/test/resources/r2.mytype
diff --git a/pom.xml b/pom.xml
index 7c58b02..e627a8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,7 +187,7 @@
<module>camel-knative</module>
<module>camel-k-maven-plugin</module>
<module>camel-k-runtime-core</module>
- <module>camel-k-runtime-jvm</module>
+ <module>camel-k-runtime-main</module>
<module>camel-k-loader-groovy</module>
<module>camel-k-loader-kotlin</module>
@@ -258,10 +258,9 @@
<artifactId>camel-k-runtime-core</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-jvm</artifactId>
+ <artifactId>camel-k-runtime-main</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -328,6 +327,12 @@
<artifactId>camel-k-runtime-yaml</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-jvm</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
