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 f26827d05f080330fcca35c3428f8c47115d6bf0
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Jan 10 15:24:15 2019 +0100
CAMEL-13046 - Remove Camel-Openshift
---
bom/camel-bom/pom.xml | 10 ---
.../component/openshift/OpenShiftComponent.java | 94 ----------------------
parent/pom.xml | 10 ---
.../karaf/features/src/main/resources/features.xml | 5 --
.../camel-spring-boot-dependencies/pom.xml | 10 ---
.../camel/itest/karaf/CamelOpenshiftTest.java | 34 --------
.../camel/itest/springboot/CamelOpenshiftTest.java | 48 -----------
7 files changed, 211 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 8d1007c..62192a4 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1896,16 +1896,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-openshift</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-openshift-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-openstack</artifactId>
<version>${project.version}</version>
</dependency>
diff --git
a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftComponent.java
b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftComponent.java
deleted file mode 100644
index c6a0150..0000000
---
a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftComponent.java
+++ /dev/null
@@ -1,94 +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.component.openshift;
-
-import java.util.Map;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
-import org.apache.camel.spi.Metadata;
-
-public class OpenShiftComponent extends DefaultComponent {
-
- @Metadata(label = "security", secret = true)
- private String username;
- @Metadata(label = "security", secret = true)
- private String password;
- private String domain;
- private String server;
-
- public OpenShiftComponent() {
- }
-
- protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
- String clientId = remaining;
-
- OpenShiftEndpoint endpoint = new OpenShiftEndpoint(uri, this);
- endpoint.setClientId(clientId);
- endpoint.setUsername(getUsername());
- endpoint.setPassword(getPassword());
- endpoint.setDomain(getDomain());
- setProperties(endpoint, parameters);
- return endpoint;
- }
-
- public String getUsername() {
- return username;
- }
-
- /**
- * The username to login to openshift server.
- */
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getPassword() {
- return password;
- }
-
- /**
- * The password for login to openshift server.
- */
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getDomain() {
- return domain;
- }
-
- /**
- * Domain name. If not specified then the default domain is used.
- */
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
- public String getServer() {
- return server;
- }
-
- /**
- * Url to the openshift server.
- * If not specified then the default value from the local openshift
configuration file ~/.openshift/express.conf is used.
- * And if that fails as well then "openshift.redhat.com" is used.
- */
- public void setServer(String server) {
- this.server = server;
- }
-}
diff --git a/parent/pom.xml b/parent/pom.xml
index 83535ec..afe13a4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1784,11 +1784,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-openshift</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-openstack</artifactId>
<version>${project.version}</version>
</dependency>
@@ -3253,11 +3248,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-openshift-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-openstack-starter</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 0a83572..2541753 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1617,11 +1617,6 @@
<bundle
dependency='true'>mvn:org.apache.camel/camel-olingo4-api/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-olingo4/${project.version}</bundle>
</feature>
- <feature name='camel-openshift' version='${project.version}'
resolver='(obr)' start-level='50'>
- <feature version='${project.version}'>camel-core</feature>
- <bundle
dependency='true'>wrap:mvn:com.openshift/openshift-java-client/${openshift-java-client-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-openshift/${project.version}</bundle>
- </feature>
<feature name='camel-optaplanner' version='${project.version}'
resolver='(obr)' start-level='50'>
<details>The camel-optaplanner feature can only run on a SUN JVM. You need
to add the package com.sun.tools.xjc to the java platform packages in the
etc/jre.properties file.</details>
<feature version='${project.version}'>camel-core</feature>
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 18b9dec..28169ba 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
@@ -2121,16 +2121,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-openshift</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-openshift-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-openstack</artifactId>
<version>${project.version}</version>
</dependency>
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java
deleted file mode 100644
index a367ac8..0000000
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenshiftTest.java
+++ /dev/null
@@ -1,34 +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.karaf;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
-
-@RunWith(PaxExam.class)
-public class CamelOpenshiftTest extends BaseKarafTest {
-
- public static final String COMPONENT =
extractName(CamelOpenshiftTest.class);
-
- @Test
- public void test() throws Exception {
- testComponent(COMPONENT);
- }
-
-
-}
\ No newline at end of file
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelOpenshiftTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelOpenshiftTest.java
deleted file mode 100644
index d414715..0000000
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelOpenshiftTest.java
+++ /dev/null
@@ -1,48 +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 CamelOpenshiftTest extends AbstractSpringBootTestSupport {
-
- @Deployment
- public static Archive<?> createSpringBootPackage() throws Exception {
- return ArquillianPackager.springBootPackage(createTestConfig());
- }
-
- public static ITestConfig createTestConfig() {
- return new ITestConfigBuilder()
- .module(inferModuleName(CamelOpenshiftTest.class))
- .build();
- }
-
- @Test
- public void componentTests() throws Exception {
- this.runComponentTest(config);
- this.runModuleUnitTestsIfEnabled(config);
- }
-
-
-}
