From 1321bcc8beb1eeb2980064ad3674f156edf061d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Hu=C3=9F?= Date: Fri, 24 Nov 2017 18:48:51 +0100 Subject: [PATCH 01/10] refactor: Introduced image streams every + a new profile for only creating images (without the rest) Current workflows: * minishift start * apply openshift templates (should be done via a mvn profile or script, too) * mvn -Pimage,fast This will build & deploy automatically: - rest - verifier - ui --- connectors/pom.xml | 1 - pom.xml | 314 +++++++++++++++++++++++++++++++++++-------- rest/pom.xml | 216 ----------------------------- rest/runtime/pom.xml | 39 +----- s2i/pom.xml | 21 ++- ui/docker/Dockerfile | 20 ++- ui/pom.xml | 48 +++---- verifier/pom.xml | 32 +---- 8 files changed, 314 insertions(+), 377 deletions(-) diff --git a/connectors/pom.xml b/connectors/pom.xml index 09eb92601b8..7fa07ee3069 100644 --- a/connectors/pom.xml +++ b/connectors/pom.xml @@ -58,7 +58,6 @@ 1.5.3 1.12 - 3.2.15 2.2.2 0.7.8 3.0 diff --git a/pom.xml b/pom.xml index 3b7105d517d..7dffd3e3f66 100644 --- a/pom.xml +++ b/pom.xml @@ -35,10 +35,7 @@ - syndesis/syndesis-ui - syndesis/syndesis-s2i - - 0.22.1 + 3.5.33 1.2.1 2.4.1 1.6 @@ -46,19 +43,44 @@ v1.2.1 - - - connectors - ui - runtime - rest - s2i - tests - verifier - + + + default + + ::default + true + + + connectors + ui + runtime + rest + s2i + tests + verifier + + + + + image + + ::image + + + + rest + verifier + ui + + + + install + + + no-checks @@ -74,65 +96,239 @@ - yarn + docker + + syndesis/%a + kubernetes + + + + + openshift + + syndesis/%a + openshift + + + + + flash + + + deploy + + + + true + - com.github.eirslett - frontend-maven-plugin - ${frontend-maven-plugin-version} + maven-resources-plugin + + + default-testResources + + + + + + maven-compiler-plugin + + + default-testCompile + + + + + + org.basepom.maven + property-helper-maven-plugin + + + get-build-id + + + + + + pl.project13.maven + git-commit-id-plugin + + + default + + + + + + maven-enforcer-plugin + + + default + + + + + + org.jacoco + jacoco-maven-plugin + + + default + + + + default-it + + + + + + maven-jar-plugin + + + attach-tests + + + + + + maven-javadoc-plugin - install node and npm - - install-node-and-npm - - - ${node.version} - + attach-javadocs + + + + + maven-source-plugin + + + attach-sources + + + + + + maven-dependency-plugin + + + default + + + + + + com.ning.maven.plugins + maven-dependency-versions-check-plugin + + + default + + + + + + com.hubspot.maven.plugins + dependency-management-maven-plugin + + + default + + + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + default + + + + + + org.codehaus.mojo + findbugs-maven-plugin + + + default + + + + + + maven-pmd-plugin + + + default + + + + + + maven-checkstyle-plugin + - install yarn - - install-node-and-yarn - - - ${node.version} - ${yarn.version} - + default + + + + + com.mycila + license-maven-plugin + - angular-cli install - - npm - - - install --no-optional -g angular-cli - + default + + + + + maven-surefire-plugin + - yarn install - - yarn - - - install --no-progress - + default-test + + + + + org.codehaus.mojo + build-helper-maven-plugin + - yarn ng build - - yarn - - - ng build -- --aot --prod --progress=false - + default + - + + + org.codehaus.mojo + exec-maven-plugin + + + + + + + + maven-failsafe-plugin + + + default + + + + + @@ -163,6 +359,13 @@ + + + io.fabric8 + fabric8-maven-plugin + ${fabric8.maven.plugin.version} + + @@ -170,6 +373,7 @@ org.commonjava.maven.plugins directory-maven-plugin 0.1 + false directories diff --git a/rest/pom.xml b/rest/pom.xml index 602959e9665..a77c30f203d 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -92,7 +92,6 @@ 1.5.3 1.12 1.5.0 - 3.3.0 0.8 1.0.0 1.1.0 @@ -853,7 +852,6 @@ io.fabric8 fabric8-maven-plugin - ${fabric8-maven-plugin.version} dk.nykredit.swagger @@ -1035,220 +1033,6 @@ clean package - - flash - - - deploy - - - - - - maven-resources-plugin - - - default-testResources - - - - - - maven-compiler-plugin - - - default-testCompile - - - - - - org.basepom.maven - property-helper-maven-plugin - - - get-build-id - - - - - - pl.project13.maven - git-commit-id-plugin - - - default - - - - - - maven-enforcer-plugin - - - default - - - - - - org.jacoco - jacoco-maven-plugin - - - default - - - - default-it - - - - - - maven-jar-plugin - - - attach-tests - - - - - - maven-javadoc-plugin - - - attach-javadocs - - - - - - maven-source-plugin - - - attach-sources - - - - - - maven-dependency-plugin - - - default - - - - - - com.ning.maven.plugins - maven-dependency-versions-check-plugin - - - default - - - - - - com.hubspot.maven.plugins - dependency-management-maven-plugin - - - default - - - - - - org.basepom.maven - duplicate-finder-maven-plugin - - - default - - - - - - org.codehaus.mojo - findbugs-maven-plugin - - - default - - - - - - maven-pmd-plugin - - - default - - - - - - maven-checkstyle-plugin - - - default - - - - - - com.mycila - license-maven-plugin - - - default - - - - - - maven-surefire-plugin - - - default-test - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - default - - - - - - org.codehaus.mojo - exec-maven-plugin - - - - - - - - maven-failsafe-plugin - - - default - - - - - - - non-m2e diff --git a/rest/runtime/pom.xml b/rest/runtime/pom.xml index 9f63a1d3fd5..a7eab4dc6e8 100644 --- a/rest/runtime/pom.xml +++ b/rest/runtime/pom.xml @@ -829,41 +829,12 @@ - - deploy - - - deploy - - - - - - io.fabric8 - fabric8-maven-plugin - - - deploy - - resource - build - - package - - kubernetes - - - - - - - - build-docker-image + image - env.DOCKER_HOST + ::image @@ -871,17 +842,13 @@ io.fabric8 fabric8-maven-plugin - ${fabric8-maven-plugin.version} - build-docker-image + build build package - - kubernetes - diff --git a/s2i/pom.xml b/s2i/pom.xml index d353d316cf5..abf0a3ad0a3 100644 --- a/s2i/pom.xml +++ b/s2i/pom.xml @@ -109,18 +109,17 @@ - build-docker-image + image - env.DOCKER_HOST + ::image io.fabric8 - docker-maven-plugin - ${docker.maven.plugin.fabric8.version} + fabric8-maven-plugin exec @@ -131,9 +130,14 @@ + + false + true + + docker - ${syndesis-s2i-image-name} + syndesis/%a Dockerfile @@ -144,6 +148,13 @@ + + + flash + + false + + diff --git a/ui/docker/Dockerfile b/ui/docker/Dockerfile index 5cc0c95d77c..4dea3eddbf8 100644 --- a/ui/docker/Dockerfile +++ b/ui/docker/Dockerfile @@ -2,20 +2,26 @@ FROM docker.io/centos:7 ENV NGINX_VERSION 1.13.4-1.el7 +# This refers to the files copied by assembly configuration in pom.xml +# Change this to e.g. "dist" if running the dockerfile from top-level e.g. +# docker build --build-arg SRC_DIR=dist --build-arf CONTEXT_DIR=docker -f docker/Dockerfile +ARG SRC_DIR="maven/dist" +ARG CONTEXT_DIR="." + LABEL name="nginxinc/nginx" \ maintainer="Syndesis Authors " \ vendor="NGINX Inc." \ version="${NGINX_VERSION}" \ release="1" \ summary="NGINX" \ - description="nginx will do ....." \ + description="nginx will do ....." ### Required labels above - recommended below - url="https://www.nginx.com/" \ +LABEL url="https://www.nginx.com/" \ io.k8s.display-name="NGINX" \ io.openshift.expose-services="http:8080" \ io.openshift.tags="nginx,nginxinc" -ADD nginx.repo /etc/yum.repos.d/nginx.repo +ADD ${CONTEXT_DIR}/nginx.repo /etc/yum.repos.d/nginx.repo RUN curl -sO http://nginx.org/keys/nginx_signing.key && \ rpm --import ./nginx_signing.key && \ @@ -24,13 +30,13 @@ RUN curl -sO http://nginx.org/keys/nginx_signing.key && \ yum clean all # forward request and error logs to docker log collector +# - Change pid file location & remove nginx user & change port to 8080 +# - modify perms for non-root runtime RUN ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ -# Change pid file location & remove nginx user & change port to 8080 sed -i 's/\/var\/run\/nginx.pid/\/var\/cache\/nginx\/nginx.pid/g' /etc/nginx/nginx.conf && \ sed -i -e '/user/!b' -e '/nginx/!b' -e '/nginx/d' /etc/nginx/nginx.conf && \ rm -f /etc/nginx/conf.d/default.conf && \ -# modify perms for non-root runtime chown -R 998 /var/cache/nginx /etc/nginx && \ chmod -R g=u /var/cache/nginx /etc/nginx @@ -45,6 +51,6 @@ USER 998 CMD ["nginx", "-g", "daemon off;"] -COPY nginx-syndesis.conf /etc/nginx/conf.d -COPY dist /usr/share/nginx/html +COPY ${CONTEXT_DIR}/nginx-syndesis.conf /etc/nginx/conf.d +COPY ${SRC_DIR} /usr/share/nginx/html diff --git a/ui/pom.xml b/ui/pom.xml index 19b069badea..7f41b9baca1 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -31,7 +31,7 @@ pom Syndesis UI - syndesis :: ${project.artifactId} + Syndesis :: ${project.artifactId} @@ -104,7 +104,7 @@ yarn - ng build -- --aot --prod --progress=false + ng build --aot --prod --progress=false @@ -146,40 +146,18 @@ - + - build-docker-image + image - - env.DOCKER_HOST - + ::image - - maven-antrun-plugin - 1.8 - - - package - - run - - - - - - - - - - - io.fabric8 - docker-maven-plugin - ${docker.maven.plugin.fabric8.version} + fabric8-maven-plugin exec @@ -190,10 +168,22 @@ + + false + true + + docker - ${syndesis-ui-image-name} + syndesis/%a:latest + + + + dist + + + ${basedir}/docker/Dockerfile diff --git a/verifier/pom.xml b/verifier/pom.xml index b4f8c1ed5c8..aa697bc63e0 100644 --- a/verifier/pom.xml +++ b/verifier/pom.xml @@ -42,12 +42,8 @@ 1.5.12 2.3.0-RELEASE 2.8.7 - 3.3.0 3.0 0.5.8 - - fabric8/java-jboss-openjdk8-jdk:1.2.3 @@ -260,33 +256,16 @@ - - - io.fabric8 - fabric8-maven-plugin - ${fabric8-maven-plugin.version} - - - - - syndesis/syndesis-verifier:%l - ${java-image} - - - - - - - build-docker-image + image - env.DOCKER_HOST + ::image @@ -294,17 +273,13 @@ io.fabric8 fabric8-maven-plugin - ${fabric8-maven-plugin.version} - build-docker-image + build build package - - kubernetes - @@ -312,6 +287,7 @@ + ci From 05dcac241cac1cf7470a147f7009d094a637b331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Hu=C3=9F?= Date: Fri, 24 Nov 2017 20:42:34 +0100 Subject: [PATCH 02/10] fix: Reenable directory-maven-plugin and cleaned up some poms --- .../twitter/twitter-mention-connector/pom.xml | 16 +-- .../twitter/twitter-search-connector/pom.xml | 12 +- pom.xml | 1 - rest/pom.xml | 1 - runtime/bom/pom.xml | 118 ------------------ runtime/pom.xml | 86 ++++++++++++- runtime/runtime/pom.xml | 16 --- tests/pom.xml | 10 +- 8 files changed, 90 insertions(+), 170 deletions(-) delete mode 100644 runtime/bom/pom.xml diff --git a/connectors/connectors/twitter/twitter-mention-connector/pom.xml b/connectors/connectors/twitter/twitter-mention-connector/pom.xml index bf3b6e1e4e6..645a4efaaee 100644 --- a/connectors/connectors/twitter/twitter-mention-connector/pom.xml +++ b/connectors/connectors/twitter/twitter-mention-connector/pom.xml @@ -93,14 +93,14 @@ ${spring-boot.version} test - + install - + org.apache.maven.plugins maven-compiler-plugin @@ -110,7 +110,7 @@ 1.8 - + org.apache.maven.plugins maven-resources-plugin @@ -184,16 +184,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - default-jar - never - - - diff --git a/connectors/connectors/twitter/twitter-search-connector/pom.xml b/connectors/connectors/twitter/twitter-search-connector/pom.xml index e350b58edb4..4d30c2cbe21 100644 --- a/connectors/connectors/twitter/twitter-search-connector/pom.xml +++ b/connectors/connectors/twitter/twitter-search-connector/pom.xml @@ -25,7 +25,7 @@ ../pom.xml 4.0.0 - + twitter-search-connector Syndesis Twitter Connectors :: Twitter Search Connector Twitter Search Connector @@ -186,16 +186,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - default-jar - never - - - diff --git a/pom.xml b/pom.xml index 7dffd3e3f66..5c904c77028 100644 --- a/pom.xml +++ b/pom.xml @@ -373,7 +373,6 @@ org.commonjava.maven.plugins directory-maven-plugin 0.1 - false directories diff --git a/rest/pom.xml b/rest/pom.xml index a77c30f203d..019ecd15507 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -26,7 +26,6 @@ ../pom.xml - io.syndesis syndesis-rest-parent 1.2-SNAPSHOT pom diff --git a/runtime/bom/pom.xml b/runtime/bom/pom.xml deleted file mode 100644 index 43c7a3c1268..00000000000 --- a/runtime/bom/pom.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - 4.0.0 - - - io.syndesis - syndesis-parent - 1.2-SNAPSHOT - ../../pom.xml - - - io.syndesis - integration-runtime-bom - 1.2-SNAPSHOT - pom - - Syndesis :: Integration Runtime :: Bill of Materials - Syndesis Integration Runtime Bill of Materials POM - - - 1.8 - 1.8 - 2.20.0 - 2.8.10 - 2.4.1 - 3.0.0 - 1.5.7.RELEASE - 4.3.11 - 3.0.1 - 1.0-rc3 - 2.4.0 - UTF-8 - 180 - 180 - - - - - - - - io.syndesis.integration-runtime - model - ${project.version} - - - io.syndesis.integration-runtime - runtime - ${project.version} - - - io.syndesis.integration-runtime - runtime-api - ${project.version} - - - ${project.groupId} - integration-runtime - ${project.version} - - - - - com.fasterxml.jackson - jackson-bom - ${jackson.version} - import - pom - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - import - pom - - - org.apache.camel - camel-spring-boot-dependencies - ${camel.version} - pom - import - - - - com.google.auto.service - auto-service - ${auto-service.version} - - - com.jayway.jsonpath - json-path - ${json-path.version} - - - - - \ No newline at end of file diff --git a/runtime/pom.xml b/runtime/pom.xml index b7211f2c248..676451d5bb2 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -21,24 +21,22 @@ io.syndesis - integration-runtime-bom + syndesis-parent 1.2-SNAPSHOT - bom/pom.xml + ../pom.xml - io.syndesis integration-runtime pom Syndesis :: Integration Runtime - bom model runtime-api runtime - + @@ -76,6 +74,84 @@ + + 1.8 + 1.8 + 2.20.0 + 2.8.10 + 2.4.1 + 3.0.0 + 1.5.7.RELEASE + 4.3.11 + 3.0.1 + 1.0-rc3 + 2.4.0 + UTF-8 + 180 + 180 + + + + + + + + io.syndesis.integration-runtime + model + ${project.version} + + + io.syndesis.integration-runtime + runtime + ${project.version} + + + io.syndesis.integration-runtime + runtime-api + ${project.version} + + + ${project.groupId} + integration-runtime + ${project.version} + + + + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + import + pom + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + import + pom + + + org.apache.camel + camel-spring-boot-dependencies + ${camel.version} + pom + import + + + + com.google.auto.service + auto-service + ${auto-service.version} + + + com.jayway.jsonpath + json-path + ${json-path.version} + + + + doclint-java8-disable diff --git a/runtime/runtime/pom.xml b/runtime/runtime/pom.xml index 8a76065d124..cd592c24d90 100644 --- a/runtime/runtime/pom.xml +++ b/runtime/runtime/pom.xml @@ -165,22 +165,6 @@ - - - com.mycila - license-maven-plugin - - true - - - - org.apache.maven.plugins - maven-dependency-plugin - - true - - - diff --git a/tests/pom.xml b/tests/pom.xml index 3385b945ec3..f196fa729b6 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -20,15 +20,15 @@ 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"> 4.0.0 + - org.sonatype.oss - oss-parent - 9 + io.syndesis + integration-runtime + 1.2-SNAPSHOT + ../pom.xml - io.syndesis system-tests-project - 1.0-SNAPSHOT Syndesis System Tests :: Project 2016 From b0197e236ea007851221604e3fbc961f1133e79e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Hu=C3=9F?= Date: Fri, 24 Nov 2017 20:52:03 +0100 Subject: [PATCH 03/10] chore: fix parent in pom.xml --- tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pom.xml b/tests/pom.xml index f196fa729b6..25b932f8b7c 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -23,7 +23,7 @@ io.syndesis - integration-runtime + syndesis-parent 1.2-SNAPSHOT ../pom.xml From ac8fc997d787d27ce61513d43295f74a89cb3659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Hu=C3=9F?= Date: Fri, 24 Nov 2017 21:14:16 +0100 Subject: [PATCH 04/10] chore: fix bom dependency --- rest/pom.xml | 8 -------- rest/syndesis-annotation-processor/pom.xml | 3 +++ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/rest/pom.xml b/rest/pom.xml index 019ecd15507..fd3506f3470 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -181,14 +181,6 @@ import - - io.syndesis - integration-runtime-bom - ${syndesis-integration-runtime.version} - pom - import - - org.apache.camel camel-catalog-maven diff --git a/rest/syndesis-annotation-processor/pom.xml b/rest/syndesis-annotation-processor/pom.xml index f6a8c538f9e..3826feaac27 100644 --- a/rest/syndesis-annotation-processor/pom.xml +++ b/rest/syndesis-annotation-processor/pom.xml @@ -46,11 +46,14 @@ junit test + io.syndesis.integration-runtime runtime-api + ${project.version} test + com.google.testing.compile compile-testing From 4e83cf46ef6d78b8a4daad2e826ecbaae25214f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Hu=C3=9F?= Date: Fri, 24 Nov 2017 21:53:52 +0100 Subject: [PATCH 05/10] fix: Runtime fixes for basepom checks --- runtime/runtime/pom.xml | 7 +------ .../integration/runtime/StepHandler.java | 15 +++++++++++++++ .../runtime/stephandlers/ChoiceHandler.java | 15 +++++++++++++++ .../runtime/stephandlers/EndpointHandler.java | 15 +++++++++++++++ .../runtime/stephandlers/ExtensionHandler.java | 15 +++++++++++++++ .../runtime/stephandlers/FilterHandler.java | 15 +++++++++++++++ .../runtime/stephandlers/FunctionHandler.java | 15 +++++++++++++++ .../runtime/stephandlers/LogHandler.java | 15 +++++++++++++++ .../runtime/stephandlers/SetBodyHandler.java | 15 +++++++++++++++ .../runtime/stephandlers/SetHeadersHandler.java | 15 +++++++++++++++ .../runtime/stephandlers/SplitHandler.java | 15 +++++++++++++++ .../runtime/stephandlers/ThrottleHandler.java | 15 +++++++++++++++ .../runtime/util/JsonSimplePredicate.java | 15 +++++++++++++++ .../runtime/steps/MarshallingTest.java | 15 +++++++++++++++ .../runtime/steps/ChoiceYamlTest-testStep.yml | 16 ++++++++++++++++ .../steps/EndpointExtensionYamlTest-testStep.yml | 16 ++++++++++++++++ .../runtime/steps/ExtensionYamlTest-testStep.yml | 16 ++++++++++++++++ .../runtime/steps/FilterYamlTest-testStep.yml | 16 ++++++++++++++++ .../runtime/steps/FunctionYamlTest-testStep.yml | 16 ++++++++++++++++ .../runtime/steps/LogYamlTest-testStep.yml | 16 ++++++++++++++++ .../runtime/steps/SplitYamlTest-testStep.yml | 16 ++++++++++++++++ .../runtime/steps/ThrottleYamlTest-testStep.yml | 16 ++++++++++++++++ .../integration/runtime/syndesis-spring.yml | 16 ++++++++++++++++ 23 files changed, 340 insertions(+), 6 deletions(-) diff --git a/runtime/runtime/pom.xml b/runtime/runtime/pom.xml index cd592c24d90..a705ac157fb 100644 --- a/runtime/runtime/pom.xml +++ b/runtime/runtime/pom.xml @@ -36,6 +36,7 @@ io.syndesis.integration-runtime model + io.syndesis.integration-runtime runtime-api @@ -89,12 +90,6 @@ true - - org.springframework.boot - spring-boot-configuration-processor - true - - org.assertj diff --git a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/StepHandler.java b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/StepHandler.java index bf055e006d5..7559b56ff87 100644 --- a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/StepHandler.java +++ b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/StepHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * Licensed 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. + */ /* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/ChoiceHandler.java b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/ChoiceHandler.java index 712826e7925..722194ef742 100644 --- a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/ChoiceHandler.java +++ b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/ChoiceHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * Licensed 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. + */ /* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/EndpointHandler.java b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/EndpointHandler.java index 458a2520717..9d33baf44c3 100644 --- a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/EndpointHandler.java +++ b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/EndpointHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * Licensed 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. + */ /* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/ExtensionHandler.java b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/ExtensionHandler.java index 4f458e69870..a25c3bf83c0 100644 --- a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/ExtensionHandler.java +++ b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/ExtensionHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * Licensed 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. + */ /* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/FilterHandler.java b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/FilterHandler.java index 70d7533682d..5c97e693f30 100644 --- a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/FilterHandler.java +++ b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/FilterHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * Licensed 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. + */ /* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/FunctionHandler.java b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/FunctionHandler.java index 0a395fef2dc..394b12144c6 100644 --- a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/FunctionHandler.java +++ b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/FunctionHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * Licensed 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. + */ /* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/LogHandler.java b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/LogHandler.java index 4bc2cc54e7c..1d46b61291b 100644 --- a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/LogHandler.java +++ b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/LogHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * Licensed 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. + */ /* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/SetBodyHandler.java b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/SetBodyHandler.java index 87750aa8513..3422dcef576 100644 --- a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/SetBodyHandler.java +++ b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/SetBodyHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * Licensed 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. + */ /* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/SetHeadersHandler.java b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/SetHeadersHandler.java index 3684ce6f871..2788a4dccaf 100644 --- a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/SetHeadersHandler.java +++ b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/SetHeadersHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * Licensed 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. + */ /* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/SplitHandler.java b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/SplitHandler.java index d0466640c22..a12c4ce91cc 100644 --- a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/SplitHandler.java +++ b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/SplitHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * Licensed 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. + */ /* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/ThrottleHandler.java b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/ThrottleHandler.java index 02d14d987f2..88f31f592bb 100644 --- a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/ThrottleHandler.java +++ b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/ThrottleHandler.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * Licensed 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. + */ /* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/util/JsonSimplePredicate.java b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/util/JsonSimplePredicate.java index f48c0beb878..93cd4299153 100644 --- a/runtime/runtime/src/main/java/io/syndesis/integration/runtime/util/JsonSimplePredicate.java +++ b/runtime/runtime/src/main/java/io/syndesis/integration/runtime/util/JsonSimplePredicate.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * Licensed 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. + */ /* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/test/java/io/syndesis/integration/runtime/steps/MarshallingTest.java b/runtime/runtime/src/test/java/io/syndesis/integration/runtime/steps/MarshallingTest.java index dbf2a0c2ea6..112f4a3534e 100644 --- a/runtime/runtime/src/test/java/io/syndesis/integration/runtime/steps/MarshallingTest.java +++ b/runtime/runtime/src/test/java/io/syndesis/integration/runtime/steps/MarshallingTest.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * Licensed 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. + */ /* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/ChoiceYamlTest-testStep.yml b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/ChoiceYamlTest-testStep.yml index a98f5a8cd80..62ef710a809 100644 --- a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/ChoiceYamlTest-testStep.yml +++ b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/ChoiceYamlTest-testStep.yml @@ -1,3 +1,19 @@ +# +# Copyright (C) 2016 Red Hat, Inc. +# +# Licensed 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. +# + # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/EndpointExtensionYamlTest-testStep.yml b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/EndpointExtensionYamlTest-testStep.yml index e22a14e9e65..ca9234c0344 100644 --- a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/EndpointExtensionYamlTest-testStep.yml +++ b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/EndpointExtensionYamlTest-testStep.yml @@ -1,3 +1,19 @@ +# +# Copyright (C) 2016 Red Hat, Inc. +# +# Licensed 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. +# + # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/ExtensionYamlTest-testStep.yml b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/ExtensionYamlTest-testStep.yml index 75c2230e855..aa57b7a413a 100644 --- a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/ExtensionYamlTest-testStep.yml +++ b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/ExtensionYamlTest-testStep.yml @@ -1,3 +1,19 @@ +# +# Copyright (C) 2016 Red Hat, Inc. +# +# Licensed 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. +# + # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/FilterYamlTest-testStep.yml b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/FilterYamlTest-testStep.yml index 60084fd44f8..25487b28dd1 100644 --- a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/FilterYamlTest-testStep.yml +++ b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/FilterYamlTest-testStep.yml @@ -1,3 +1,19 @@ +# +# Copyright (C) 2016 Red Hat, Inc. +# +# Licensed 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. +# + # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/FunctionYamlTest-testStep.yml b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/FunctionYamlTest-testStep.yml index f438892e111..1094d57fd3b 100644 --- a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/FunctionYamlTest-testStep.yml +++ b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/FunctionYamlTest-testStep.yml @@ -1,3 +1,19 @@ +# +# Copyright (C) 2016 Red Hat, Inc. +# +# Licensed 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. +# + # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/LogYamlTest-testStep.yml b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/LogYamlTest-testStep.yml index 3f3a801d963..15871d7a800 100644 --- a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/LogYamlTest-testStep.yml +++ b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/LogYamlTest-testStep.yml @@ -1,3 +1,19 @@ +# +# Copyright (C) 2016 Red Hat, Inc. +# +# Licensed 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. +# + # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/SplitYamlTest-testStep.yml b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/SplitYamlTest-testStep.yml index 3fa0ae66165..4bf95bc87b4 100644 --- a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/SplitYamlTest-testStep.yml +++ b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/SplitYamlTest-testStep.yml @@ -1,3 +1,19 @@ +# +# Copyright (C) 2016 Red Hat, Inc. +# +# Licensed 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. +# + # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/ThrottleYamlTest-testStep.yml b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/ThrottleYamlTest-testStep.yml index 7636d0133bd..0aa82346cef 100644 --- a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/ThrottleYamlTest-testStep.yml +++ b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/steps/ThrottleYamlTest-testStep.yml @@ -1,3 +1,19 @@ +# +# Copyright (C) 2016 Red Hat, Inc. +# +# Licensed 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. +# + # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/syndesis-spring.yml b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/syndesis-spring.yml index 4f15830482e..a4ebf9e6f2f 100644 --- a/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/syndesis-spring.yml +++ b/runtime/runtime/src/test/resources/io/syndesis/integration/runtime/syndesis-spring.yml @@ -1,3 +1,19 @@ +# +# Copyright (C) 2016 Red Hat, Inc. +# +# Licensed 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. +# + # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From 7496b6e8edb9a963d5c2f029b408012d87f44483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Hu=C3=9F?= Date: Fri, 24 Nov 2017 22:10:50 +0100 Subject: [PATCH 06/10] chore: fix checks --- runtime/runtime-api/pom.xml | 1 - runtime/runtime/pom.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/runtime/runtime-api/pom.xml b/runtime/runtime-api/pom.xml index 63f403e1fc6..a86512aac5b 100644 --- a/runtime/runtime-api/pom.xml +++ b/runtime/runtime-api/pom.xml @@ -49,7 +49,6 @@ org.springframework:spring-context - org.springframework.boot:spring-boot-configuration-processor com.google.auto.service:auto-service diff --git a/runtime/runtime/pom.xml b/runtime/runtime/pom.xml index a705ac157fb..7302fb06a51 100644 --- a/runtime/runtime/pom.xml +++ b/runtime/runtime/pom.xml @@ -154,7 +154,6 @@ org.springframework:spring-context - org.springframework.boot:spring-boot-configuration-processor com.google.auto.service:auto-service From ff4734ca47100c5a021508ae3a940b18bae9218d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Hu=C3=9F?= Date: Fri, 24 Nov 2017 22:32:58 +0100 Subject: [PATCH 07/10] fix: Dependencies in tests --- tests/pom.xml | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/tests/pom.xml b/tests/pom.xml index 25b932f8b7c..d8024bee42e 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -112,6 +112,8 @@ 4.12 2.6.3 + 1.1.4 + 3.8.1 @@ -136,10 +138,16 @@ io.fabric8 - openshift-client + kubernetes-client ${kubernetes-client.version} + + io.fabric8 + kubernetes-model + ${kubernetes-model.version} + + org.arquillian.cube arquillian-cube-requirement @@ -167,11 +175,33 @@ test + + org.jboss.arquillian.test + arquillian-test-api + test + + + + javax.inject + javax.inject + 1 + test + + + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + + junit junit ${junit.version} + + + From cf07ead9daf62a3e8aca6531cebe08c386373bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Hu=C3=9F?= Date: Fri, 24 Nov 2017 22:57:11 +0100 Subject: [PATCH 08/10] fix: duplicate class finder checks --- tests/pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/pom.xml b/tests/pom.xml index d8024bee42e..cabbc097598 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -204,6 +204,22 @@ + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + ValidationMessages.properties + schema/kube-schema.json + log4j.properties + about.html + + + + + From 6c6e4fd01b25a7629fe2a5b0bfca13f8904de02e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Hu=C3=9F?= Date: Fri, 24 Nov 2017 23:17:21 +0100 Subject: [PATCH 09/10] fix: license headers --- .../java/io/syndesis/systests/DeploymentTest.java | 15 +++++++++++++++ .../io/syndesis/systests/SyndesisRestTest.java | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/tests/src/test/java/io/syndesis/systests/DeploymentTest.java b/tests/src/test/java/io/syndesis/systests/DeploymentTest.java index 61c5baa8ac2..dc5b593737f 100644 --- a/tests/src/test/java/io/syndesis/systests/DeploymentTest.java +++ b/tests/src/test/java/io/syndesis/systests/DeploymentTest.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * Licensed 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 io.syndesis.systests; import org.arquillian.cube.openshift.impl.requirement.RequiresOpenshift; diff --git a/tests/src/test/java/io/syndesis/systests/SyndesisRestTest.java b/tests/src/test/java/io/syndesis/systests/SyndesisRestTest.java index ad7f8b0dec8..ef57dae4f2f 100644 --- a/tests/src/test/java/io/syndesis/systests/SyndesisRestTest.java +++ b/tests/src/test/java/io/syndesis/systests/SyndesisRestTest.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * Licensed 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 io.syndesis.systests; import org.arquillian.cube.kubernetes.annotations.PortForward; From eae9c9491ff2c853b7804b758c95df8c183b4b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Hu=C3=9F?= Date: Sat, 25 Nov 2017 09:47:12 +0100 Subject: [PATCH 10/10] refactor: Inlined header.txt to avoid the usage of the directory-maven-plugin --- pom.xml | 51 +++++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 5c904c77028..4961e873aa6 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,10 @@ v6.11.5 v1.2.1 + + 1 + 1 + true @@ -328,7 +332,6 @@ - @@ -338,10 +341,23 @@ com.mycila license-maven-plugin -
${syndesis.basedir}/header.txt
- - Red Hat, Inc. - + Copyright (C) ${project.inceptionYear} Red Hat, Inc. + +Licensed 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. + true + + 1 **/node_modules/** .editorconfig @@ -368,29 +384,8 @@ - - - org.commonjava.maven.plugins - directory-maven-plugin - 0.1 - - - directories - - directory-of - - initialize - - syndesis.basedir - - io.syndesis - syndesis-parent - - - - - - + +