[camel] branch master updated (fee219a -> 8b921f5)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated (fee219a -> 8b921f5)

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

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from fee219a  Removed reference to Groovy DSL
     new d62dbfa  Removed Camel-Guice remaining stuff
     new 8b921f5  Remove property placeholders for guice

The 2 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:
 bom/camel-bom/pom.xml                              | 10 -----
 parent/pom.xml                                     | 17 --------
 platforms/karaf/features/pom.xml                   |  3 +-
 .../camel-spring-boot-dependencies/pom.xml         | 10 -----
 .../camel/itest/springboot/CamelGuiceTest.java     | 49 ----------------------
 5 files changed, 1 insertion(+), 88 deletions(-)
 delete mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelGuiceTest.java

Reply | Threaded
Open this post in threaded view
|

[camel] 01/02: Removed Camel-Guice remaining stuff

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

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit d62dbfabe760f8d750b35163de517229a34d0ecc
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Fri Jan 11 11:46:30 2019 +0100

    Removed Camel-Guice remaining stuff
---
 bom/camel-bom/pom.xml                              | 10 -----
 parent/pom.xml                                     | 16 -------
 platforms/karaf/features/pom.xml                   |  3 +-
 .../camel-spring-boot-dependencies/pom.xml         | 10 -----
 .../camel/itest/springboot/CamelGuiceTest.java     | 49 ----------------------
 5 files changed, 1 insertion(+), 87 deletions(-)

diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index b037262..ab72dfb 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -945,16 +945,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-guice</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-guice-starter</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-hawtdb</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 642d884..9157ce8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1291,11 +1291,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-guice</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-gson</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -2775,11 +2770,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-guice-starter</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-hawtdb-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -4299,12 +4289,6 @@
         <version>1.0</version>
       </dependency>
 
-      <!-- optional guice dependencies -->
-      <dependency>
-        <groupId>com.google.inject</groupId>
-        <artifactId>guice</artifactId>
-        <version>${guice-version}</version>
-      </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml
index af933bd..bd85bd5 100644
--- a/platforms/karaf/features/pom.xml
+++ b/platforms/karaf/features/pom.xml
@@ -184,8 +184,7 @@
                 <!-- camel-cdi requires to install a cdi provider first -->
                 <!-- camel-cxf uses blueprint but its feature name is different in karaf 3.x vs 4.x -->
                 <!-- camel-ignite requires to install apache ignite first -->
-                <!-- camel-guice does not work in OSGi currently -->
-                <feature>camel|camel-(?!(blueprint|cdi|cxf|ignite|guice))*</feature>
+                <feature>camel|camel-(?!(blueprint|cdi|cxf|ignite))*</feature>
               </features>
             <configuration>file://${project.build.directory}/classes/config.properties</configuration>
             </configuration>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 46b02f7..0076dcf 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -1170,16 +1170,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-guice</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-guice-starter</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-hawtdb</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelGuiceTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelGuiceTest.java
deleted file mode 100644
index 44b4482..0000000
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelGuiceTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * 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.itest.springboot;
-
-import org.apache.camel.itest.springboot.util.ArquillianPackager;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-
-@RunWith(Arquillian.class)
-public class CamelGuiceTest extends AbstractSpringBootTestSupport {
-
-    @Deployment
-    public static Archive<?> createSpringBootPackage() throws Exception {
-        return ArquillianPackager.springBootPackage(createTestConfig());
-    }
-
-    public static ITestConfig createTestConfig() {
-        return new ITestConfigBuilder()
-                .module(inferModuleName(CamelGuiceTest.class))
-                .ignoreLibraryMismatch("org.hamcrest")
-                .build();
-    }
-
-    @Test
-    public void componentTests() throws Exception {
-        // no component test
-        this.runModuleUnitTestsIfEnabled(config);
-    }
-
-
-}

Reply | Threaded
Open this post in threaded view
|

[camel] 02/02: Remove property placeholders for guice

acosentino
In reply to this post by acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 8b921f5719cf216b0244a74fc925c2cda7da0eb5
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Fri Jan 11 11:47:09 2019 +0100

    Remove property placeholders for guice
---
 parent/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 9157ce8..40cf651 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -269,7 +269,6 @@
     <grpc-bundle-version>1.15.0_1</grpc-bundle-version>
     <grpc-errorprone-version>2.2.0</grpc-errorprone-version>
     <gson-version>2.8.5</gson-version>
-    <guice-version>4.0</guice-version>
     <guice3-version>3.0</guice3-version>
     <guice-bundle-version>3.0_1</guice-bundle-version>
     <hadoop-bundle-version>1.2.1_1</hadoop-bundle-version>