From f4f5d7c4cee7484462b8e5fd1c5b24372dd78779 Mon Sep 17 00:00:00 2001
From: Daniel Meyer
+ Home |
+ Documentation |
+ Forum |
+ Issues |
+ License |
+ Contribute
+ A connector response which represents an open resource (link to open resource)
+ * which must be closed. Consumers of this API are responsible to close the request.
+ * A generic connector consumer (such as the camunda process engine) should check
+ * whether A connector represents a way to interact with some system, library or technology.
+ * Examples of connectors are connectors for HTTP interaction, a connector to a
+ * third-party library like a rules engine or file system abstraction. Once an instance of a connector is created, it is thread-safe, meaning that single
+ * connector instance my be used by multiple threads concurrently. Each thread will create
+ * new {@link ConnectorRequest Requests} which are not threadsafe and must not be shared
+ * among multiple threads. Connectors support interceptors. Interceptors may be used for customizing connector
+ * behavior or for adding management aspects such as logging to a connector. A connector request. The request opens an interaction with the connector.
+ * Because a request represents a single interaction, the request is not threadsafe.
+ * Request objects should not be shared between multiple threads. The parameters of a request can be provided using the generic map of input
+ * parameters. See ({@link #setRequestParameters(Map)}):
+ *
+ * SomeConnectorRequest req = connector.createRequest();
+ * req.setRequestParameter("endpointUrl", "http://mysystem.loc/foo");
+ * req.setRequestParameter("payload", "some important payload");
+ * req.execute();
+ *
+ * This makes it possible to use the connector in a generic / configurable system like
+ * the camunda process engine.
+ *
Optionally, a connector may also extend the request interface and provide + * dedicated (typesafe) methods for configuring a request, preferably in a + * fluent API fashion: + *
+ * conntector.createRequest() + * .endpointUrl("http://mysystem.loc/foo") + * .payload("some important payload") + * .execute(); + *+ * This makes it easy to use the connector in a standalone way. + * + * + *
The request may return a value representing the output of the connector + * invocation. Requests not returning a value should be of type {@link Void}.
+ * + * @author Daniel Meyer + * + */ +public interface ConnectorRequestThe connector request as created through the API. Accessing the request from an + * interceptor may be useful for setting additional properties on the raw request + * (returned by {@link #getTarget()}) that are not supported by the connector.
+ * + *NOTE: setting parameters on the request (via) {@link ConnectorRequest#setRequestParameter(String, Object)} + * will not have any effects once the request is executed.
+ * + * @return the connector request + */ + public ConnectorRequest> getRequest(); + + /** + * Makes the request proceed through the interceptor chain. + * {@link RequestInterceptor} implementations are responsible for + * calling {@link #proceed()} on the invocation. + * + * @return the result of the invocation. + * @throws Exception + */ + public Object proceed() throws Exception; + +} diff --git a/connect/core/src/main/java/org/camunda/bpm/connect/interceptor/RequestInterceptor.java b/connect/core/src/main/java/org/camunda/bpm/connect/interceptor/RequestInterceptor.java new file mode 100644 index 00000000000..53afc06467c --- /dev/null +++ b/connect/core/src/main/java/org/camunda/bpm/connect/interceptor/RequestInterceptor.java @@ -0,0 +1,66 @@ +/* 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 org.camunda.bpm.connect.interceptor; + +/** + *A request interceptor. An interceptor allows intercepting the request created by a connector. + * See {@link #handleInvocation(ConnectorInvocation)} for more details and usage patters.
+ * + *The interceptor is invoked for every request created by a connector. As such, an + * interceptor implementation must be threadsafe.
+ * + * @author Daniel Meyer + * + */ +public interface RequestInterceptor { + + /** + *Intercept and handle the actual invocation. An implementation of this method *must*
+ * call invocation.proceed();
and return the result:
+ * public Object handleInvocation(ConnectorInvocation invocation) throws Exception { + * // do something before the request + * try { + * Object result = invocation.proceed(); + * // do something after a successful request + * return result; + * } catch(Exception e) { + * // do something after a failed request + * throw e; + * } + * } + *+ * + *
This may be useful for "management" usecases such as logging, failure tracking etc... and + * modifying the Thread context of the request thread (Security Context, Transactions, ...).
+ * + *It is also possible for an implementation to access and modify the low level "raw" request + * object before it is executed by the connector:
+ *+ * public Object handleInvocation(ConnectorInvocation invocation) throws Exception { + * Object rawRequest = invocation.getTarget(); + * // cast rawRequest to the low-level connector implementation obejct and work with it. + * + * // finally + * return invocation.proceed(); + * } + *+ * + * @param invocation the invocation + * @return the result of the invocation + * @throws Exception + */ + public Object handleInvocation(ConnectorInvocation invocation) throws Exception; + +} diff --git a/connect/pom.xml b/connect/pom.xml new file mode 100644 index 00000000000..19a6f37a531 --- /dev/null +++ b/connect/pom.xml @@ -0,0 +1,213 @@ +
, R extends ConnectorResponse> implements Connector{ + + protected String connectorId; + + /** + * The {@link ConnectorRequestInterceptor} chain + */ + protected ListrequestInterceptors = new LinkedList (); + + public AbstractConnector(String connectorId) { + this.connectorId = connectorId; + } + + public String getId() { + return connectorId; + } + + public List getRequestInterceptors() { + return requestInterceptors; + } + + public void setRequestInterceptors(List requestInterceptors) { + this.requestInterceptors = requestInterceptors; + } + + public Connector addRequestInterceptor(ConnectorRequestInterceptor interceptor) { + requestInterceptors.add(interceptor); + return this; + } + + public ConnectoraddRequestInterceptors(Collectioninterceptors) { + requestInterceptors.addAll(interceptors); + return this; + } + +} diff --git a/connect/core/src/main/java/org/camunda/bpm/connect/impl/AbstractConnectorRequest.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorRequest.java similarity index 82% rename from connect/core/src/main/java/org/camunda/bpm/connect/impl/AbstractConnectorRequest.java rename to connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorRequest.java index a02c2f08932..8de1b2f257d 100644 --- a/connect/core/src/main/java/org/camunda/bpm/connect/impl/AbstractConnectorRequest.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorRequest.java @@ -10,14 +10,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.camunda.bpm.connect.impl; +package org.camunda.connect.impl; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import org.camunda.bpm.connect.ConnectorRequest; -import org.camunda.bpm.connect.ConnectorResponse; +import org.camunda.connect.spi.Connector; +import org.camunda.connect.spi.ConnectorRequest; +import org.camunda.connect.spi.ConnectorResponse; /** * @author Daniel Meyer @@ -25,20 +26,20 @@ */ public abstract class AbstractConnectorRequest implements ConnectorRequest { - protected AbstractConnector ,R> connector; + protected Connector connector; protected Map requestParameters = new HashMap (); - @SuppressWarnings({ "rawtypes", "unchecked" }) - public AbstractConnectorRequest(AbstractConnector connector) { + public AbstractConnectorRequest(Connector connector) { this.connector = connector; } + @SuppressWarnings("unchecked") public R execute() { if(!isRequestValid()) { - throw new RuntimeException(); + throw new RuntimeException("The request is invalid"); } - return connector.execute(this); + return (R) connector.execute(this); } /** diff --git a/connect/core/src/main/java/org/camunda/bpm/connect/impl/AbstractConnectorResponse.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorResponse.java similarity index 89% rename from connect/core/src/main/java/org/camunda/bpm/connect/impl/AbstractConnectorResponse.java rename to connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorResponse.java index a12fc439002..98c4313161d 100644 --- a/connect/core/src/main/java/org/camunda/bpm/connect/impl/AbstractConnectorResponse.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorResponse.java @@ -10,12 +10,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.camunda.bpm.connect.impl; +package org.camunda.connect.impl; import java.util.HashMap; import java.util.Map; -import org.camunda.bpm.connect.ConnectorResponse; +import org.camunda.connect.spi.ConnectorResponse; /** * @author Daniel Meyer @@ -40,7 +40,7 @@ public V getResponseParameter(String name) { /** * To be implemented by subclasses for collecting the generic response parameters of a response. - * @param responseParameters + * @param responseParameters a map to save the response parameters in */ protected abstract void collectResponseParameters(Map responseParameters); diff --git a/connect/core/src/main/java/org/camunda/bpm/connect/impl/AbstractRequestInvocation.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractRequestInvocation.java similarity index 79% rename from connect/core/src/main/java/org/camunda/bpm/connect/impl/AbstractRequestInvocation.java rename to connect/core/src/main/java/org/camunda/connect/impl/AbstractRequestInvocation.java index aacc47df1be..303e3f15556 100644 --- a/connect/core/src/main/java/org/camunda/bpm/connect/impl/AbstractRequestInvocation.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractRequestInvocation.java @@ -10,17 +10,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.camunda.bpm.connect.impl; +package org.camunda.connect.impl; import java.util.List; -import org.camunda.bpm.connect.ConnectorRequest; -import org.camunda.bpm.connect.interceptor.ConnectorInvocation; -import org.camunda.bpm.connect.interceptor.RequestInterceptor; +import org.camunda.connect.spi.ConnectorRequest; +import org.camunda.connect.spi.ConnectorInvocation; +import org.camunda.connect.spi.ConnectorRequestInterceptor; /** * A simple invocation implementation routing a request through a chain of interceptors. - * Implementors must implement the {@link #invokeTarget()} method in order to implement + * Implementations must implement the {@link #invokeTarget()} method in order to implement * the actual request execution / target invocation. * * @author Daniel Meyer @@ -32,11 +32,11 @@ public abstract class AbstractRequestInvocation implements ConnectorInvocatio protected int currentIndex; - protected List interceptorChain; + protected List interceptorChain; protected ConnectorRequest> request; - public AbstractRequestInvocation(T target, ConnectorRequest> request, List interceptorChain) { + public AbstractRequestInvocation(T target, ConnectorRequest> request, List interceptorChain) { this.target = target; this.request = request; this.interceptorChain = interceptorChain; diff --git a/connect/core/src/main/java/org/camunda/connect/impl/DebugRequestInterceptor.java b/connect/core/src/main/java/org/camunda/connect/impl/DebugRequestInterceptor.java new file mode 100644 index 00000000000..8d7d9e54577 --- /dev/null +++ b/connect/core/src/main/java/org/camunda/connect/impl/DebugRequestInterceptor.java @@ -0,0 +1,93 @@ +/* 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 org.camunda.connect.impl; + +import org.camunda.connect.spi.ConnectorInvocation; +import org.camunda.connect.spi.ConnectorRequestInterceptor; +import org.camunda.connect.spi.ConnectorRequest; + +/** + * + * A dummy debug connector, which saves the {@link ConnectorRequest} ({@link #getRequest()}) + * and the raw request ({@link #getTarget()}) for debugging purpose. + *
+ * + *+ * The boolean constructor flag determines whether the request invocation should be continued + * or aborted after this interceptor. Also it is possible to add a response object which + * will returned without further passing the interceptor chain; + *
+ * + * @author Sebastian Menski + */ +public class DebugRequestInterceptor implements ConnectorRequestInterceptor { + + protected Object response; + protected boolean proceed; + + private ConnectorRequest request; + private Object target; + + public DebugRequestInterceptor() { + this(true); + } + + public DebugRequestInterceptor(boolean proceed) { + this.proceed = proceed; + } + + public DebugRequestInterceptor(Object response) { + this.response = response; + this.proceed = false; + } + + public Object handleInvocation(ConnectorInvocation invocation) throws Exception { + request = invocation.getRequest(); + target = invocation.getTarget(); + if (proceed) { + return invocation.proceed(); + } + else { + return response; + } + } + + public void setProceed(boolean proceed) { + this.proceed = proceed; + } + + public boolean isProceed() { + return proceed; + } + + public void setResponse(Object response) { + this.response = response; + } + + @SuppressWarnings("unchecked") + publicT getResponse() { + return (T) response; + } + + @SuppressWarnings("unchecked") + public T getRequest() { + return (T) request; + } + + @SuppressWarnings("unchecked") + public T getTarget() { + return (T) target; + } + +} diff --git a/connect/core/src/main/java/org/camunda/bpm/connect/CloseableConnectorResponse.java b/connect/core/src/main/java/org/camunda/connect/spi/CloseableConnectorResponse.java similarity index 69% rename from connect/core/src/main/java/org/camunda/bpm/connect/CloseableConnectorResponse.java rename to connect/core/src/main/java/org/camunda/connect/spi/CloseableConnectorResponse.java index c0590be8ec6..38cdcc6b57a 100644 --- a/connect/core/src/main/java/org/camunda/bpm/connect/CloseableConnectorResponse.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/CloseableConnectorResponse.java @@ -10,13 +10,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.camunda.bpm.connect; +package org.camunda.connect.spi; /** - * A connector response which represents an open resource (link to open resource) - * which must be closed. Consumers of this API are responsible to close the request. - * A generic connector consumer (such as the camunda process engine) should check - * whether
+ *+ * A connector response which represents an open resource (link to open resource) + * which must be closed. Consumers of this API are responsible to close the request. + *
* * @author Daniel Meyer * diff --git a/connect/core/src/main/java/org/camunda/bpm/connect/Connector.java b/connect/core/src/main/java/org/camunda/connect/spi/Connector.java similarity index 57% rename from connect/core/src/main/java/org/camunda/bpm/connect/Connector.java rename to connect/core/src/main/java/org/camunda/connect/spi/Connector.java index a15a78f3bb0..6c30df956ec 100644 --- a/connect/core/src/main/java/org/camunda/bpm/connect/Connector.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/Connector.java @@ -10,12 +10,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.camunda.bpm.connect; +package org.camunda.connect.spi; +import java.util.Collection; import java.util.List; -import org.camunda.bpm.connect.interceptor.RequestInterceptor; - /** *A connector represents a way to interact with some system, library or technology. * Examples of connectors are connectors for HTTP interaction, a connector to a @@ -23,7 +22,7 @@ * *
Once an instance of a connector is created, it is thread-safe, meaning that single * connector instance my be used by multiple threads concurrently. Each thread will create - * new {@link ConnectorRequest Requests} which are not threadsafe and must not be shared + * new {@link ConnectorRequest Requests} which are not thread-safe and must not be shared * among multiple threads.
* *Connectors support interceptors. Interceptors may be used for customizing connector @@ -32,7 +31,7 @@ * @author Daniel Meyer * */ -public interface Connector
* * @author Daniel Meyer * */ -public interface RequestInterceptor { +public interface ConnectorRequestInterceptor { /** *> { +public interface Connector > { /** * The unique Id for the connector. @@ -46,23 +45,42 @@ public interface Connector> { * * @return the connector-specific request object. */ - T createRequest(); + Q createRequest(); /** - * Adds a {@link RequestInterceptor} to this connector. The interceptor is added + * Returns the {@link ConnectorRequestInterceptor} chain for this connector. + * The implementation will return the actual list, modifications on the list will + * be reflected in the internal connector state. This means that you can use the + * returned list to modify the connector's {@link ConnectorRequestInterceptor} chain. + * + * @return the list of interceptors. + */ + List getRequestInterceptors(); + + /** + * Sets the {@link ConnectorRequestInterceptor}s of this connector. The interceptors + * are invoked for all requests created by the connector. + */ + void setRequestInterceptors(List requestInterceptors); + + /** + * Adds a {@link ConnectorRequestInterceptor} to this connector. The interceptor is added * at the end of the interceptor chain. The interceptor is invoked for all requests * created by the connector. */ - void addRequestInterceptor(RequestInterceptor interceptor); + Connector addRequestInterceptor(ConnectorRequestInterceptor interceptor); /** - * Returns the {@link RequestInterceptor} chain for this connector. - * The implementation will return the actual list, modifications on the list will - * be reflected in the internal connector state. This means that you can use the - * returned list to modify the connector's {@link RequestInterceptor} chain. - * - * @return the list of interceptors. + * Adds a collection of {@link ConnectorRequestInterceptor} to this connector. The interceptors + * are added at the end of the interceptor chain. The interceptor is invoked for all + * requests created by the connector. */ - ListgetRequestInterceptors(); + Connector addRequestInterceptors(Collectioninterceptors); + /** + * Execute the request on the connector. + * @param request the request + * @return the result. + */ + ConnectorResponse execute(Q request); } diff --git a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorConfigurator.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorConfigurator.java new file mode 100644 index 00000000000..e0504354cae --- /dev/null +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorConfigurator.java @@ -0,0 +1,38 @@ +/* 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 org.camunda.connect.spi; + +/** + * Can be used to configure connectors of a certain type. + * An implementation will be supplied with all discovered + * connectors of the specified class. {@link Connector#getId()} + * may be used for further restrict configuration to connectors + * with a specific id. + */ +public interface ConnectorConfigurator { + + /** + * @return the class of connectors this configurator can configure (including subclasses) + */ + Class getConnectorClass(); + + /** + * Configures the connector instance. This method is invoked with + * all connectors of the specified class. + * + * @param connector the connector instance to configure + */ + void configure(C connector); + +} diff --git a/connect/core/src/main/java/org/camunda/bpm/connect/interceptor/ConnectorInvocation.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorInvocation.java similarity index 82% rename from connect/core/src/main/java/org/camunda/bpm/connect/interceptor/ConnectorInvocation.java rename to connect/core/src/main/java/org/camunda/connect/spi/ConnectorInvocation.java index 3c00af2943a..d915e570751 100644 --- a/connect/core/src/main/java/org/camunda/bpm/connect/interceptor/ConnectorInvocation.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorInvocation.java @@ -10,14 +10,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.camunda.bpm.connect.interceptor; - -import org.camunda.bpm.connect.ConnectorRequest; +package org.camunda.connect.spi; /** * Represents a request invocation / request execution. * - * @see RequestInterceptor#handleInvocation(ConnectorInvocation) + * @see ConnectorRequestInterceptor#handleInvocation(ConnectorInvocation) * * @author Daniel Meyer * @@ -40,12 +38,12 @@ public interface ConnectorInvocation { * * @return the connector request */ - public ConnectorRequest> getRequest(); + public ConnectorRequest getRequest(); /** * Makes the request proceed through the interceptor chain. - * {@link RequestInterceptor} implementations are responsible for - * calling {@link #proceed()} on the invocation. + * {@link ConnectorRequestInterceptor} implementations are responsible for + * calling this method on the invocation. * * @return the result of the invocation. * @throws Exception diff --git a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorProvider.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorProvider.java new file mode 100644 index 00000000000..80a09826609 --- /dev/null +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorProvider.java @@ -0,0 +1,27 @@ +/* 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 org.camunda.connect.spi; + +/** + * Provides a {@link Connector} with a unique id. + */ +public interface ConnectorProvider { + + /** Returns the unique id of the connector created by this factory. */ + String getConnectorId(); + + /** Create a new instance of the connector created by this factory. */ + Connector createConnectorInstance(); + +} diff --git a/connect/core/src/main/java/org/camunda/bpm/connect/ConnectorRequest.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequest.java similarity index 88% rename from connect/core/src/main/java/org/camunda/bpm/connect/ConnectorRequest.java rename to connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequest.java index 8bcf453ce4b..500fdec30f8 100644 --- a/connect/core/src/main/java/org/camunda/bpm/connect/ConnectorRequest.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequest.java @@ -10,13 +10,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.camunda.bpm.connect; +package org.camunda.connect.spi; import java.util.Map; /** * A connector request. The request opens an interaction with the connector. - * Because a request represents a single interaction, the request is not threadsafe. + * Because a request represents a single interaction, the request is not thread-safe. * Request objects should not be shared between multiple threads.
* *The parameters of a request can be provided using the generic map of input @@ -32,10 +32,10 @@ *
* *Optionally, a connector may also extend the request interface and provide - * dedicated (typesafe) methods for configuring a request, preferably in a + * dedicated (type-safe) methods for configuring a request, preferably in a * fluent API fashion: *
- * conntector.createRequest() + * connector.createRequest() * .endpointUrl("http://mysystem.loc/foo") * .payload("some important payload") * .execute(); @@ -49,12 +49,12 @@ * @author Daniel Meyer * */ -public interface ConnectorRequest{ +public interface ConnectorRequest { /** * Provides the named input parameters of the request. * - * @param the named input parameters of the request. + * @param params the named input parameters of the request. */ void setRequestParameters(Map params); @@ -73,7 +73,7 @@ public interface ConnectorRequest { /** * Returns the value of a request parameter - * @param the name of the request parameter + * @param name the name of the request parameter * @return the value of the request parameter of 'null' if the parameter is not set. */ V getRequestParameter(String name); @@ -84,6 +84,6 @@ public interface ConnectorRequest { * * @return the return value of the request. */ - T execute(); + R execute(); } diff --git a/connect/core/src/main/java/org/camunda/bpm/connect/interceptor/RequestInterceptor.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequestInterceptor.java similarity index 86% rename from connect/core/src/main/java/org/camunda/bpm/connect/interceptor/RequestInterceptor.java rename to connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequestInterceptor.java index 53afc06467c..647eed35e48 100644 --- a/connect/core/src/main/java/org/camunda/bpm/connect/interceptor/RequestInterceptor.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequestInterceptor.java @@ -10,19 +10,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.camunda.bpm.connect.interceptor; +package org.camunda.connect.spi; /** * A request interceptor. An interceptor allows intercepting the request created by a connector. * See {@link #handleInvocation(ConnectorInvocation)} for more details and usage patters.
* *The interceptor is invoked for every request created by a connector. As such, an - * interceptor implementation must be threadsafe.
+ * interceptor implementation must be thread-safe.Intercept and handle the actual invocation. An implementation of this method *must* @@ -42,7 +42,7 @@ public interface RequestInterceptor { * } * * - *
This may be useful for "management" usecases such as logging, failure tracking etc... and + *
This may be useful for "management" use cases such as logging, failure tracking etc... and * modifying the Thread context of the request thread (Security Context, Transactions, ...).
* *It is also possible for an implementation to access and modify the low level "raw" request @@ -50,7 +50,7 @@ public interface RequestInterceptor { *
* public Object handleInvocation(ConnectorInvocation invocation) throws Exception { * Object rawRequest = invocation.getTarget(); - * // cast rawRequest to the low-level connector implementation obejct and work with it. + * // cast rawRequest to the low-level connector implementation object and work with it. * * // finally * return invocation.proceed(); @@ -61,6 +61,6 @@ public interface RequestInterceptor { * @return the result of the invocation * @throws Exception */ - public Object handleInvocation(ConnectorInvocation invocation) throws Exception; + Object handleInvocation(ConnectorInvocation invocation) throws Exception; } diff --git a/connect/core/src/main/java/org/camunda/bpm/connect/ConnectorResponse.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorResponse.java similarity index 97% rename from connect/core/src/main/java/org/camunda/bpm/connect/ConnectorResponse.java rename to connect/core/src/main/java/org/camunda/connect/spi/ConnectorResponse.java index a5b0e0eefad..e4bce1b888a 100644 --- a/connect/core/src/main/java/org/camunda/bpm/connect/ConnectorResponse.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorResponse.java @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.camunda.bpm.connect; +package org.camunda.connect.spi; import java.util.Map; diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnector.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnector.java new file mode 100644 index 00000000000..065c7583c89 --- /dev/null +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnector.java @@ -0,0 +1,49 @@ +/* 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 org.camunda.connect.dummy; + +import org.camunda.connect.impl.AbstractConnector; +import org.camunda.connect.spi.ConnectorResponse; + +public class DummyConnector extends AbstractConnector{ + + public static final String ID = "dummy-connector"; + + protected String configuration = "default"; + + public DummyConnector() { + super(ID); + } + + public DummyConnector(String connectorId) { + super(connectorId); + } + + public DummyRequest createRequest() { + return new DummyRequest(this); + } + + public ConnectorResponse execute(DummyRequest request) { + return new DummyResponse(); + } + + public String getConfiguration() { + return configuration; + } + + public void setConfiguration(String configuration) { + this.configuration = configuration; + } + +} diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorConfigurator.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorConfigurator.java new file mode 100644 index 00000000000..bbb8e2186c3 --- /dev/null +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorConfigurator.java @@ -0,0 +1,27 @@ +/* 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 org.camunda.connect.dummy; + +import org.camunda.connect.spi.ConnectorConfigurator; + +public class DummyConnectorConfigurator implements ConnectorConfigurator { + + public Class getConnectorClass() { + return DummyConnector.class; + } + + public void configure(DummyConnector connector) { + connector.setConfiguration("configured"); + } +} diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorProvider.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorProvider.java new file mode 100644 index 00000000000..231476774a9 --- /dev/null +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorProvider.java @@ -0,0 +1,28 @@ +/* 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 org.camunda.connect.dummy; + +import org.camunda.connect.spi.ConnectorProvider; + +public class DummyConnectorProvider implements ConnectorProvider { + + public String getConnectorId() { + return DummyConnector.ID; + } + + public DummyConnector createConnectorInstance() { + return new DummyConnector(DummyConnector.ID); + } + +} diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/DummyRequest.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyRequest.java new file mode 100644 index 00000000000..8b4f45237d2 --- /dev/null +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyRequest.java @@ -0,0 +1,25 @@ +/* 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 org.camunda.connect.dummy; + +import org.camunda.connect.impl.AbstractConnectorRequest; +import org.camunda.connect.spi.Connector; + +public class DummyRequest extends AbstractConnectorRequest { + + public DummyRequest(Connector connector) { + super(connector); + } + +} diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/DummyResponse.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyResponse.java new file mode 100644 index 00000000000..5c48a1ea0c7 --- /dev/null +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyResponse.java @@ -0,0 +1,26 @@ +/* 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 org.camunda.connect.dummy; + +import java.util.Map; + +import org.camunda.connect.impl.AbstractConnectorResponse; + +public class DummyResponse extends AbstractConnectorResponse { + + protected void collectResponseParameters(Map responseParameters) { + // do noting + } + +} diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnector.java b/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnector.java new file mode 100644 index 00000000000..c2380000e44 --- /dev/null +++ b/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnector.java @@ -0,0 +1,32 @@ +/* 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 org.camunda.connect.dummy; + +import org.camunda.connect.impl.AbstractConnector; +import org.camunda.connect.spi.ConnectorResponse; + +public class MyHttpConnector extends AbstractConnector { + + public MyHttpConnector(String connectorId) { + super(connectorId); + } + + public DummyRequest createRequest() { + return new DummyRequest(this); + } + + public ConnectorResponse execute(DummyRequest request) { + return null; + } +} diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnectorProvider.java b/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnectorProvider.java new file mode 100644 index 00000000000..49ffa2b3a83 --- /dev/null +++ b/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnectorProvider.java @@ -0,0 +1,30 @@ +/* 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 org.camunda.connect.dummy; + +import org.camunda.connect.Connectors; +import org.camunda.connect.spi.Connector; +import org.camunda.connect.spi.ConnectorProvider; + +public class MyHttpConnectorProvider implements ConnectorProvider { + + public String getConnectorId() { + return Connectors.HTTP_CONNECTOR_ID; + } + + public Connector createConnectorInstance() { + return new MyHttpConnector(Connectors.HTTP_CONNECTOR_ID); + } + +} diff --git a/connect/core/src/test/java/org/camunda/connect/spi/ConnectorsTest.java b/connect/core/src/test/java/org/camunda/connect/spi/ConnectorsTest.java new file mode 100644 index 00000000000..e9cd1b03ae2 --- /dev/null +++ b/connect/core/src/test/java/org/camunda/connect/spi/ConnectorsTest.java @@ -0,0 +1,61 @@ +/* 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 org.camunda.connect.spi; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.camunda.connect.Connectors; +import org.camunda.connect.dummy.DummyConnector; +import org.junit.Test; + +public class ConnectorsTest { + + @Test + public void shouldReturnNullForUnknownConnectorId() { + Connector unknown = Connectors.getConnector("unknown"); + assertThat(unknown).isNull(); + } + + @Test + public void shouldMyHttpConnector() { + Connector http = Connectors.http(); + assertThat(http).isNotNull(); + } + + @Test + public void shouldNotDiscoverSoapConnector() { + Connector soap = Connectors.soap(); + assertThat(soap).isNull(); + } + + @Test + public void shouldDiscoverDummyConnector() { + DummyConnector connector = Connectors.getConnector(DummyConnector.ID); + assertThat(connector).isNotNull(); + + assertThat(Connectors.getInstance().getAvailableConnectors()) + .hasSize(2) + .contains(connector); + } + + @Test + public void shouldConfigureDummyConnector() { + DummyConnector connector = new DummyConnector(); + assertThat(connector.getConfiguration()).isEqualTo("default"); + + connector = Connectors.getConnector(DummyConnector.ID); + assertThat(connector.getConfiguration()).isEqualTo("configured"); + } + +} diff --git a/connect/core/src/test/resources/META-INF/services/org.camunda.connect.spi.ConnectorConfigurator b/connect/core/src/test/resources/META-INF/services/org.camunda.connect.spi.ConnectorConfigurator new file mode 100644 index 00000000000..da68553a502 --- /dev/null +++ b/connect/core/src/test/resources/META-INF/services/org.camunda.connect.spi.ConnectorConfigurator @@ -0,0 +1 @@ +org.camunda.connect.dummy.DummyConnectorConfigurator diff --git a/connect/core/src/test/resources/META-INF/services/org.camunda.connect.spi.ConnectorProvider b/connect/core/src/test/resources/META-INF/services/org.camunda.connect.spi.ConnectorProvider new file mode 100644 index 00000000000..b5cfa519963 --- /dev/null +++ b/connect/core/src/test/resources/META-INF/services/org.camunda.connect.spi.ConnectorProvider @@ -0,0 +1,2 @@ +org.camunda.connect.dummy.DummyConnectorProvider +org.camunda.connect.dummy.MyHttpConnectorProvider diff --git a/connect/soap-httpclient/src/test/resources/logback-test.xml b/connect/core/src/test/resources/logback-test.xml similarity index 67% rename from connect/soap-httpclient/src/test/resources/logback-test.xml rename to connect/core/src/test/resources/logback-test.xml index 650a86c01c0..c8e6e5ee06a 100644 --- a/connect/soap-httpclient/src/test/resources/logback-test.xml +++ b/connect/core/src/test/resources/logback-test.xml @@ -1,11 +1,11 @@ - diff --git a/connect/dist/pom.xml b/connect/dist/pom.xml index 9f5da550efb..eb1c51f7370 100644 --- a/connect/dist/pom.xml +++ b/connect/dist/pom.xml @@ -14,14 +14,12 @@+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + org.camunda.connect -camunda-connect-soap-httpclient -${project.version} +camunda-connect-http-client @@ -53,6 +51,9 @@ org.camunda.connect -camunda-connect-rest-httpclient -${project.version} +camunda-connect-soap-http-client connectjar.org.apache ++ +
, R extends ConnectorResponse> extends ConnectorRequest{ + + String PARAM_NAME_REQUEST_URL = "url"; + String PARAM_NAME_REQUEST_HEADERS = "headers"; + String PARAM_NAME_REQUEST_METHOD = "method"; + String PARAM_NAME_REQUEST_PAYLOAD = "payload"; + String HEADER_CONTENT_TYPE = "Content-Type"; + + /** + * Set the url of this request. + * + * @param url the url to set + * @return this request + */ + Q url(String url); + + /** + * @return the url of this request or null if none is set + */ + String getUrl(); + + /** + * Set a HTTP header for this request. + * + * @param field HTTP header field + * @param value HTTP header value + * @return this request + */ + Q header(String field, String value); + + /** + * @return the HTTP header field value of this request or null if not set + */ + String getHeader(String field); + + /** + * @return the HTTP headers of this request or null if non set + */ + Map getHeaders(); + + /** + * Set the content type header for this request. + * + * @param contentType the content type + * @return this request + */ + Q contentType(String contentType); + + /** + * @return the content-type of this request or null if non set + */ + String getContentType(); + + /** + * Set the payload of this request. + * + * @param payload the payload to set + * @return this request + */ + Q payload(String payload); + + /** + * @return the payload of this request or null if non set + */ + String getPayload(); + + /** + * Sets the method of this request. + * + * @param method the method to set + * @return this request + */ + Q method(String method); + + /** + * @return the method of this request or null if not set + */ + String getMethod(); +} diff --git a/connect/rest-httpclient/src/main/java/org/camunda/bpm/connect/rest/httpclient/RestHttpLogger.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnector.java similarity index 57% rename from connect/rest-httpclient/src/main/java/org/camunda/bpm/connect/rest/httpclient/RestHttpLogger.java rename to connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnector.java index c7bc989675f..61a8866eae8 100644 --- a/connect/rest-httpclient/src/main/java/org/camunda/bpm/connect/rest/httpclient/RestHttpLogger.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnector.java @@ -10,16 +10,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.camunda.bpm.connect.rest.httpclient; +package org.camunda.connect.httpclient; -import org.camunda.commons.logging.BaseLogger; +import org.camunda.connect.Connectors; +import org.camunda.connect.spi.Connector; -/** - * @author Stefan Hentschel. - */ -public class RestHttpLogger extends BaseLogger { +public interface HttpConnector extends Connector { - public static final String PROJECT_CODE = "RESTC"; + static final String ID = Connectors.HTTP_CONNECTOR_ID; - public static RestHttpConnectorLogger REST_CONNECTOR_LOGGER = createLogger(RestHttpConnectorLogger.class, PROJECT_CODE, "org.camunda.bpm.connect.rest.httpclient.connector", "01"); } diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorLogger.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorLogger.java new file mode 100644 index 00000000000..197679113a9 --- /dev/null +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorLogger.java @@ -0,0 +1,51 @@ +/* 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 org.camunda.connect.httpclient; + +import org.camunda.connect.ConnectLogger; +import org.camunda.connect.ConnectorRequestException; +import org.camunda.connect.ConnectorResponseException; + +public class HttpConnectorLogger extends ConnectLogger { + + public void setHeader(String field, String value) { + logDebug("001", "Set header field '{}' to '{}'", field, value); + } + + public void ignoreHeader(String field, String value) { + logInfo("002", "Ignoring header with name '{}' and value '{}'", field, value); + + } + + public void payloadIgnoredForHttpMethod(String method) { + logInfo("003", "Ignoring payload for HTTP '{}' method", method); + } + + public ConnectorResponseException unableToReadResponse(Exception cause) { + return new ConnectorResponseException(exceptionMessage("004", "Unable to read connectorResponse: {}", cause.getMessage()), cause); + } + + public ConnectorRequestException requestUrlRequired() { + return new ConnectorRequestException(exceptionMessage("005", "Request url required.")); + } + + public ConnectorRequestException unknownHttpMethod(String method) { + return new ConnectorRequestException(exceptionMessage("006", "Unknown or unsupported HTTP method '{}'", method)); + } + + public ConnectorRequestException unableToExecuteRequest(Exception cause) { + return new ConnectorRequestException(exceptionMessage("007", "Unable to execute HTTP request"), cause); + } + +} diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorProvider.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorProvider.java new file mode 100644 index 00000000000..47000743bad --- /dev/null +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorProvider.java @@ -0,0 +1,20 @@ +/* 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 org.camunda.connect.httpclient; + +import org.camunda.connect.spi.ConnectorProvider; + +public interface HttpConnectorProvider extends ConnectorProvider { + +} diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpLogger.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpLogger.java new file mode 100644 index 00000000000..aed0372cb5a --- /dev/null +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpLogger.java @@ -0,0 +1,23 @@ +/* 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 org.camunda.connect.httpclient; + +import org.camunda.commons.logging.BaseLogger; + +public abstract class HttpLogger extends BaseLogger { + + public static final String PROJECT_CODE = "HTCL"; + + public static HttpConnectorLogger HTTP_LOGGER = createLogger(HttpConnectorLogger.class, PROJECT_CODE, "org.camunda.bpm.connect.httpclient.connector", "02"); +} diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpMethodRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpMethodRequest.java new file mode 100644 index 00000000000..431c29cb665 --- /dev/null +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpMethodRequest.java @@ -0,0 +1,74 @@ +/* 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 org.camunda.connect.httpclient; + +public interface HttpMethodRequest , R extends HttpResponse> extends HttpBaseRequest{ + + /** + * Set GET as request method + * + * @return this request + */ + Q get(); + + /** + * Set POST as request method + * + * @return this request + */ + Q post(); + + /** + * Set PUT as request method + * + * @return this request + */ + Q put(); + + /** + * Set DELETE as request method + * + * @return this request + */ + Q delete(); + + /** + * Set PATCH as request method + * + * @return this request + */ + Q patch(); + + /** + * Set HEAD as request method + * + * @return this request + */ + Q head(); + + /** + * Set OPTIONS as request method + * + * @return this request + */ + Q options(); + + /** + * Set TRACE as request method + * + * @return this request + */ + Q trace(); + +} diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpRequest.java new file mode 100644 index 00000000000..f6bdb4da333 --- /dev/null +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpRequest.java @@ -0,0 +1,17 @@ +/* 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 org.camunda.connect.httpclient; + +public interface HttpRequest extends HttpMethodRequest{ + +} diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpResponse.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpResponse.java new file mode 100644 index 00000000000..0b73760a3fe --- /dev/null +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpResponse.java @@ -0,0 +1,45 @@ +/* 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 org.camunda.connect.httpclient; + +import java.util.Map; + +import org.camunda.connect.spi.CloseableConnectorResponse; + +public interface HttpResponse extends CloseableConnectorResponse { + + static final String PARAM_NAME_STATUS_CODE = "statusCode"; + static final String PARAM_NAME_RESPONSE = "response"; + static final String PARAM_NAME_RESPONSE_HEADERS = "headers"; + + /** + * @return the HTTP status code of the response + */ + Integer getStatusCode(); + + /** + * @return the response body or null if non exists + */ + String getResponse(); + + /** + * @return the response headers + */ + Map getHeaders(); + + /** + * @return return the response header value for the given field or null if not set + */ + String getHeader(String field); + +} diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java new file mode 100644 index 00000000000..8aa26277293 --- /dev/null +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java @@ -0,0 +1,154 @@ +/* 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 org.camunda.connect.httpclient.impl; + +import java.io.ByteArrayInputStream; +import java.nio.charset.Charset; +import java.util.Map; + +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpDelete; +import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpHead; +import org.apache.http.client.methods.HttpOptions; +import org.apache.http.client.methods.HttpPatch; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpPut; +import org.apache.http.client.methods.HttpRequestBase; +import org.apache.http.client.methods.HttpTrace; +import org.apache.http.entity.InputStreamEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.camunda.connect.httpclient.HttpBaseRequest; +import org.camunda.connect.httpclient.HttpConnectorLogger; +import org.camunda.connect.httpclient.HttpLogger; +import org.camunda.connect.httpclient.HttpResponse; +import org.camunda.connect.impl.AbstractConnector; + +public abstract class AbstractHttpConnector , R extends HttpResponse> extends AbstractConnector{ + + protected static HttpConnectorLogger LOG = HttpLogger.HTTP_LOGGER; + + protected CloseableHttpClient httpClient; + + public AbstractHttpConnector(String connectorId) { + super(connectorId); + httpClient = createClient(); + } + + protected CloseableHttpClient createClient() { + return HttpClients.createDefault(); + } + + public CloseableHttpClient getHttpClient() { + return httpClient; + } + + public void setHttpClient(CloseableHttpClient httpClient) { + this.httpClient = httpClient; + } + + @Override + public R execute(Q request) { + HttpRequestBase httpRequest = createHttpRequest(request); + + HttpRequestInvocation invocation = new HttpRequestInvocation(httpRequest, request, requestInterceptors, httpClient); + + try { + return createResponse((CloseableHttpResponse) invocation.proceed()); + } catch (Exception e) { + throw LOG.unableToExecuteRequest(e); + } + + } + + protected abstract R createResponse(CloseableHttpResponse response); + + @Override + public abstract Q createRequest(); + + /** + * creates a apache Http* representation of the request. + * + * @param request the given request + * @return {@link HttpRequestBase} an apache representation of the request + */ + @SuppressWarnings("unchecked") + protectedT createHttpRequest(Q request) { + T httpRequest = createHttpRequestBase(request); + + applyHeaders(httpRequest, request.getHeaders()); + + applyPayload(httpRequest, request); + + return httpRequest; + } + + @SuppressWarnings("unchecked") + protected T createHttpRequestBase(Q request) { + String url = request.getUrl(); + if (url != null && !url.trim().isEmpty()) { + String method = request.getMethod(); + if (HttpGet.METHOD_NAME.equals(method)) { + return (T) new HttpGet(url); + } else if (HttpPost.METHOD_NAME.equals(method)) { + return (T) new HttpPost(url); + } else if (HttpPut.METHOD_NAME.equals(method)) { + return (T) new HttpPut(url); + } else if (HttpDelete.METHOD_NAME.equals(method)) { + return (T) new HttpDelete(url); + } else if (HttpPatch.METHOD_NAME.equals(method)) { + return (T) new HttpPatch(url); + } else if (HttpHead.METHOD_NAME.equals(method)) { + return (T) new HttpHead(url); + } else if (HttpOptions.METHOD_NAME.equals(method)) { + return (T) new HttpOptions(url); + } else if (HttpTrace.METHOD_NAME.equals(method)) { + return (T) new HttpTrace(url); + } else { + throw LOG.unknownHttpMethod(method); + } + } + else { + throw LOG.requestUrlRequired(); + } + } + + protected void applyHeaders(T httpRequest, Map headers) { + if (headers != null) { + for (Map.Entry entry : headers.entrySet()) { + httpRequest.setHeader(entry.getKey(), entry.getValue()); + LOG.setHeader(entry.getKey(), entry.getValue()); + } + } + } + + protected void applyPayload(T httpRequest, Q request) { + if (httpMethodSupportsPayload(httpRequest)) { + if (request.getPayload() != null) { + ByteArrayInputStream payload = new ByteArrayInputStream(request.getPayload().getBytes(Charset.forName("utf-8"))); + ((HttpEntityEnclosingRequestBase) httpRequest).setEntity(new InputStreamEntity(payload)); + } + } + else if (request.getPayload() != null) { + LOG.payloadIgnoredForHttpMethod(request.getMethod()); + } + } + + protected boolean httpMethodSupportsPayload(T httpRequest) { + return httpRequest instanceof HttpEntityEnclosingRequestBase; + } + +} diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java new file mode 100644 index 00000000000..b3c66f6a3a7 --- /dev/null +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java @@ -0,0 +1,144 @@ +/* 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 org.camunda.connect.httpclient.impl; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.http.client.methods.HttpDelete; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpHead; +import org.apache.http.client.methods.HttpOptions; +import org.apache.http.client.methods.HttpPatch; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpPut; +import org.apache.http.client.methods.HttpTrace; +import org.camunda.connect.httpclient.HttpBaseRequest; +import org.camunda.connect.httpclient.HttpConnectorLogger; +import org.camunda.connect.httpclient.HttpLogger; +import org.camunda.connect.httpclient.HttpResponse; +import org.camunda.connect.impl.AbstractConnectorRequest; +import org.camunda.connect.spi.Connector; + +public class AbstractHttpRequest , R extends HttpResponse> extends AbstractConnectorRequest{ + + private final HttpConnectorLogger LOG = HttpLogger.HTTP_LOGGER; + + public AbstractHttpRequest(Connector connector) { + super(connector); + } + + @SuppressWarnings("unchecked") + public Q url(String url) { + setRequestParameter(HttpBaseRequest.PARAM_NAME_REQUEST_URL, url); + return (Q) this; + } + + public String getUrl() { + return getRequestParameter(HttpBaseRequest.PARAM_NAME_REQUEST_URL); + } + + @SuppressWarnings("unchecked") + public Q method(String method) { + setRequestParameter(HttpBaseRequest.PARAM_NAME_REQUEST_METHOD, method); + return (Q) this; + } + + public String getMethod() { + return getRequestParameter(HttpBaseRequest.PARAM_NAME_REQUEST_METHOD); + } + + @SuppressWarnings("unchecked") + public Q header(String field, String value) { + if (field == null || field.isEmpty() || value == null || value.isEmpty()) { + LOG.ignoreHeader(field, value); + } + else { + Map headers = getRequestParameter(HttpBaseRequest.PARAM_NAME_REQUEST_HEADERS); + + if (headers == null) { + headers = new HashMap (); + setRequestParameter(HttpBaseRequest.PARAM_NAME_REQUEST_HEADERS, headers); + } + headers.put(field, value); + } + + return (Q) this; + } + + public String getHeader(String field) { + Map headers = getHeaders(); + if (headers != null) { + return headers.get(field); + } + else { + return null; + } + } + + public Map getHeaders() { + return getRequestParameter(HttpBaseRequest.PARAM_NAME_REQUEST_HEADERS); + } + + public Q contentType(String contentType) { + return header(HttpBaseRequest.HEADER_CONTENT_TYPE, contentType); + } + + public String getContentType() { + return getHeader(HttpBaseRequest.HEADER_CONTENT_TYPE); + } + + @SuppressWarnings("unchecked") + public Q payload(String payload) { + setRequestParameter(HttpBaseRequest.PARAM_NAME_REQUEST_PAYLOAD, payload); + return (Q) this; + } + + public String getPayload() { + return getRequestParameter(HttpBaseRequest.PARAM_NAME_REQUEST_PAYLOAD); + } + + public Q get() { + return method(HttpGet.METHOD_NAME); + } + + public Q post() { + return method(HttpPost.METHOD_NAME); + } + + public Q put() { + return method(HttpPut.METHOD_NAME); + } + + public Q delete() { + return method(HttpDelete.METHOD_NAME); + } + + public Q patch() { + return method(HttpPatch.METHOD_NAME); + } + + public Q head() { + return method(HttpHead.METHOD_NAME); + } + + public Q options() { + return method(HttpOptions.METHOD_NAME); + } + + public Q trace() { + return method(HttpTrace.METHOD_NAME); + } + +} diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorImpl.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorImpl.java new file mode 100644 index 00000000000..6048d87172e --- /dev/null +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorImpl.java @@ -0,0 +1,38 @@ +/* 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 org.camunda.connect.httpclient.impl; + +import org.apache.http.client.methods.CloseableHttpResponse; +import org.camunda.connect.httpclient.HttpConnector; +import org.camunda.connect.httpclient.HttpRequest; +import org.camunda.connect.httpclient.HttpResponse; + +public class HttpConnectorImpl extends AbstractHttpConnector implements HttpConnector { + + public HttpConnectorImpl() { + super(HttpConnector.ID); + } + + public HttpConnectorImpl(String connectorId) { + super(connectorId); + } + + public HttpRequest createRequest() { + return new HttpRequestImpl(this); + } + + protected HttpResponse createResponse(CloseableHttpResponse response) { + return new HttpResponseImpl(response); + } + +} diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorProviderImpl.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorProviderImpl.java new file mode 100644 index 00000000000..5d8b2f85f0c --- /dev/null +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorProviderImpl.java @@ -0,0 +1,29 @@ +/* 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 org.camunda.connect.httpclient.impl; + +import org.camunda.connect.httpclient.HttpConnector; +import org.camunda.connect.httpclient.HttpConnectorProvider; + +public class HttpConnectorProviderImpl implements HttpConnectorProvider { + + public String getConnectorId() { + return HttpConnector.ID; + } + + public HttpConnector createConnectorInstance() { + return new HttpConnectorImpl(HttpConnector.ID); + } + +} diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestImpl.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestImpl.java new file mode 100644 index 00000000000..e07a61cec37 --- /dev/null +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestImpl.java @@ -0,0 +1,26 @@ +/* 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 org.camunda.connect.httpclient.impl; + +import org.camunda.connect.httpclient.HttpRequest; +import org.camunda.connect.httpclient.HttpResponse; +import org.camunda.connect.spi.Connector; + +public class HttpRequestImpl extends AbstractHttpRequest implements HttpRequest { + + public HttpRequestImpl(Connector connector) { + super(connector); + } + +} diff --git a/connect/rest-httpclient/src/main/java/org/camunda/bpm/connect/rest/httpclient/HttpRequestInvocation.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestInvocation.java similarity index 58% rename from connect/rest-httpclient/src/main/java/org/camunda/bpm/connect/rest/httpclient/HttpRequestInvocation.java rename to connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestInvocation.java index 4c10cb498a4..1393b9bb44f 100644 --- a/connect/rest-httpclient/src/main/java/org/camunda/bpm/connect/rest/httpclient/HttpRequestInvocation.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestInvocation.java @@ -2,7 +2,7 @@ * 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 + * 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, @@ -10,30 +10,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.camunda.bpm.connect.rest.httpclient; + +package org.camunda.connect.httpclient.impl; import java.util.List; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpRequestBase; -import org.camunda.bpm.connect.ConnectorRequest; -import org.camunda.bpm.connect.impl.AbstractRequestInvocation; -import org.camunda.bpm.connect.interceptor.RequestInterceptor; +import org.camunda.connect.spi.ConnectorRequest; +import org.camunda.connect.impl.AbstractRequestInvocation; +import org.camunda.connect.spi.ConnectorRequestInterceptor; -/** - * @author Daniel Meyer - * - */ -public class HttpRequestInvocation extends AbstractRequestInvocation { +public class HttpRequestInvocation extends AbstractRequestInvocation { protected HttpClient client; - /** - * @param target the HttpPostRequest - * @param interceptorChain the interceptor chain - * @param client the HttpClient to execute the request on - */ - public HttpRequestInvocation(HttpRequestBase target, ConnectorRequest> request, List interceptorChain, HttpClient client) { + public HttpRequestInvocation(HttpRequestBase target, ConnectorRequest> request, List interceptorChain, HttpClient client) { super(target, request, interceptorChain); this.client = client; } diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpResponseImpl.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpResponseImpl.java new file mode 100644 index 00000000000..c0cddef578d --- /dev/null +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpResponseImpl.java @@ -0,0 +1,91 @@ +/* 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 org.camunda.connect.httpclient.impl; + +import java.io.Closeable; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import org.apache.http.Header; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.camunda.connect.httpclient.HttpConnectorLogger; +import org.camunda.connect.httpclient.HttpLogger; +import org.camunda.connect.httpclient.HttpResponse; +import org.camunda.connect.impl.AbstractCloseableConnectorResponse; +import org.camunda.commons.utils.IoUtil; + +public class HttpResponseImpl extends AbstractCloseableConnectorResponse implements HttpResponse { + + private final HttpConnectorLogger LOG = HttpLogger.HTTP_LOGGER; + + protected CloseableHttpResponse httpResponse; + + public HttpResponseImpl(CloseableHttpResponse httpResponse) { + this.httpResponse = httpResponse; + } + + public Integer getStatusCode() { + return getResponseParameter(PARAM_NAME_STATUS_CODE); + } + + public String getResponse() { + return getResponseParameter(PARAM_NAME_RESPONSE); + } + + public Map getHeaders() { + return getResponseParameter(PARAM_NAME_RESPONSE_HEADERS); + } + + public String getHeader(String field) { + Map headers = getHeaders(); + if (headers != null) { + return headers.get(field); + } + else { + return null; + } + } + + protected void collectResponseParameters(Map responseParameters) { + if (httpResponse.getStatusLine() != null) { + responseParameters.put(PARAM_NAME_STATUS_CODE, httpResponse.getStatusLine().getStatusCode()); + } + collectResponseHeaders(); + + if (httpResponse.getEntity() != null) { + try { + String response = IoUtil.inputStreamAsString(httpResponse.getEntity().getContent()); + responseParameters.put(PARAM_NAME_RESPONSE, response); + } catch (IOException e) { + throw LOG.unableToReadResponse(e); + } finally { + IoUtil.closeSilently(httpResponse); + } + } + } + + protected void collectResponseHeaders() { + Map headers = new HashMap (); + for (Header header : httpResponse.getAllHeaders()) { + headers.put(header.getName(), header.getValue()); + } + responseParameters.put(PARAM_NAME_RESPONSE_HEADERS, headers); + } + + protected Closeable getClosable() { + return httpResponse; + } + +} diff --git a/connect/http-client/src/main/resources/META-INF/services/org.camunda.connect.spi.ConnectorProvider b/connect/http-client/src/main/resources/META-INF/services/org.camunda.connect.spi.ConnectorProvider new file mode 100644 index 00000000000..244063953fe --- /dev/null +++ b/connect/http-client/src/main/resources/META-INF/services/org.camunda.connect.spi.ConnectorProvider @@ -0,0 +1 @@ +org.camunda.connect.httpclient.impl.HttpConnectorProviderImpl diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java new file mode 100644 index 00000000000..95d4e41293d --- /dev/null +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java @@ -0,0 +1,173 @@ +/* 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 org.camunda.connect.httpclient; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.fail; + +import java.io.IOException; + +import org.apache.http.Header; +import org.apache.http.client.methods.HttpDelete; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpHead; +import org.apache.http.client.methods.HttpOptions; +import org.apache.http.client.methods.HttpPatch; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpPut; +import org.apache.http.client.methods.HttpRequestBase; +import org.apache.http.client.methods.HttpTrace; +import org.camunda.commons.utils.IoUtil; +import org.camunda.connect.ConnectorRequestException; +import org.camunda.connect.Connectors; +import org.camunda.connect.httpclient.impl.HttpConnectorImpl; +import org.camunda.connect.impl.DebugRequestInterceptor; +import org.camunda.connect.spi.Connector; +import org.junit.Before; +import org.junit.Test; + +public class HttpConnectorTest { + + public static final String EXAMPLE_URL = "http://camunda.org/example"; + public static final String EXAMPLE_CONTENT_TYPE = "application/json"; + public static final String EXAMPLE_PAYLOAD = "camunda"; + + protected HttpConnector connector; + protected DebugRequestInterceptor interceptor; + + @Before + public void createConnector() { + connector = new HttpConnectorImpl(); + interceptor = new DebugRequestInterceptor(false); + connector.addRequestInterceptor(interceptor); + } + + @Test + public void shouldDiscoverConnector() { + Connector http = Connectors.getConnector(HttpConnector.ID); + assertThat(http).isNotNull(); + } + + @Test + public void shouldFailWithoutMethod() { + try { + connector.createRequest().url("localhost").execute(); + fail("No method specified"); + } + catch (ConnectorRequestException e) { + // expected + } + } + + @Test + public void shouldFailWithoutUrl() { + try { + connector.createRequest().execute(); + fail("No url specified"); + } + catch (ConnectorRequestException e) { + // expected + } + } + + @Test + public void shouldCreateHttpGetRequest() { + connector.createRequest().url(EXAMPLE_URL).get().execute(); + verifyHttpRequest(HttpGet.class); + } + + @Test + public void shouldCreateHttpPostRequest() { + connector.createRequest().url(EXAMPLE_URL).post().execute(); + verifyHttpRequest(HttpPost.class); + } + + @Test + public void shouldCreateHttpPutRequest() { + connector.createRequest().url(EXAMPLE_URL).put().execute(); + verifyHttpRequest(HttpPut.class); + } + + @Test + public void shouldCreateHttpDeleteRequest() { + connector.createRequest().url(EXAMPLE_URL).delete().execute(); + verifyHttpRequest(HttpDelete.class); + } + + @Test + public void shouldCreateHttpPatchRequest() { + connector.createRequest().url(EXAMPLE_URL).patch().execute(); + verifyHttpRequest(HttpPatch.class); + } + + @Test + public void shouldCreateHttpHeadRequest() { + connector.createRequest().url(EXAMPLE_URL).head().execute(); + verifyHttpRequest(HttpHead.class); + } + + @Test + public void shouldCreateHttpOptionsRequest() { + connector.createRequest().url(EXAMPLE_URL).options().execute(); + verifyHttpRequest(HttpOptions.class); + } + + @Test + public void shouldCreateHttpTraceRequest() { + connector.createRequest().url(EXAMPLE_URL).trace().execute(); + verifyHttpRequest(HttpTrace.class); + } + + @Test + public void shouldSetUrlOnHttpRequest() { + connector.createRequest().url(EXAMPLE_URL).get().execute(); + HttpGet request = interceptor.getTarget(); + assertThat(request.getURI().toASCIIString()).isEqualTo(EXAMPLE_URL); + } + + @Test + public void shouldSetContentTypeOnHttpRequest() { + connector.createRequest().url(EXAMPLE_URL).contentType(EXAMPLE_CONTENT_TYPE).get().execute(); + HttpGet request = interceptor.getTarget(); + Header[] headers = request.getHeaders(HttpBaseRequest.HEADER_CONTENT_TYPE); + assertThat(headers).hasSize(1); + assertThat(headers[0].getName()).isEqualTo(HttpBaseRequest.HEADER_CONTENT_TYPE); + assertThat(headers[0].getValue()).isEqualTo(EXAMPLE_CONTENT_TYPE); + } + + @Test + public void shouldSetHeadersOnHttpRequest() { + connector.createRequest().url(EXAMPLE_URL).header("foo", "bar").header("hello", "world").get().execute(); + HttpGet request = interceptor.getTarget(); + Header[] headers = request.getAllHeaders(); + assertThat(headers).hasSize(2); + } + + @Test + public void shouldSetPayloadOnHttpRequest() throws IOException { + connector.createRequest().url(EXAMPLE_URL).payload(EXAMPLE_PAYLOAD).post().execute(); + HttpPost request = interceptor.getTarget(); + String content = IoUtil.inputStreamAsString(request.getEntity().getContent()); + assertThat(content).isEqualTo(EXAMPLE_PAYLOAD); + } + + protected void verifyHttpRequest(Class extends HttpRequestBase> requestClass) { + Object target = interceptor.getTarget(); + assertThat(target).isInstanceOf(requestClass); + + HttpRequest request = interceptor.getRequest(); + HttpRequestBase requestBase = (HttpRequestBase) target; + assertThat(requestBase.getMethod()).isEqualTo(request.getMethod()); + } + +} diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java new file mode 100644 index 00000000000..bfa73dd1061 --- /dev/null +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java @@ -0,0 +1,160 @@ +/* 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 org.camunda.connect.httpclient; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.http.client.methods.HttpDelete; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpHead; +import org.apache.http.client.methods.HttpOptions; +import org.apache.http.client.methods.HttpPatch; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpPut; +import org.apache.http.client.methods.HttpTrace; +import org.camunda.connect.Connectors; +import org.junit.Before; +import org.junit.Test; + +public class HttpRequestTest { + + public static final String EXAMPLE_URL = "http://camunda.org"; + public static final String EXAMPLE_CONTENT_TYPE = "text/plain"; + public static final String EXAMPLE_PAYLOAD = "test"; + + protected HttpConnector connector; + + @Before + public void createRequest() { + connector = Connectors.getConnector(HttpConnector.ID); + } + + @Test + public void createAnEmptyRequest() { + HttpRequest request = connector.createRequest(); + + assertThat(request.getMethod()).isNull(); + assertThat(request.getUrl()).isNull(); + assertThat(request.getContentType()).isNull(); + assertThat(request.getHeaders()).isNull(); + assertThat(request.getPayload()).isNull(); + assertThat(request.getRequestParameters()).isEmpty(); + } + + @Test + public void setHttpMethod() { + HttpRequest request = connector.createRequest().get(); + assertThat(request.getMethod()).isEqualTo(HttpGet.METHOD_NAME); + + request = connector.createRequest().post(); + assertThat(request.getMethod()).isEqualTo(HttpPost.METHOD_NAME); + + request = connector.createRequest().put(); + assertThat(request.getMethod()).isEqualTo(HttpPut.METHOD_NAME); + + request = connector.createRequest().delete(); + assertThat(request.getMethod()).isEqualTo(HttpDelete.METHOD_NAME); + + request = connector.createRequest().patch(); + assertThat(request.getMethod()).isEqualTo(HttpPatch.METHOD_NAME); + + request = connector.createRequest().head(); + assertThat(request.getMethod()).isEqualTo(HttpHead.METHOD_NAME); + + request = connector.createRequest().options(); + assertThat(request.getMethod()).isEqualTo(HttpOptions.METHOD_NAME); + + request = connector.createRequest().trace(); + assertThat(request.getMethod()).isEqualTo(HttpTrace.METHOD_NAME); + } + + @Test + public void setUrl() { + HttpRequest request = connector.createRequest().url(EXAMPLE_URL); + assertThat(request.getUrl()).isEqualTo(EXAMPLE_URL); + } + + @Test + public void setContentType() { + HttpRequest request = connector.createRequest().contentType(EXAMPLE_CONTENT_TYPE); + assertThat(request.getContentType()).isEqualTo(EXAMPLE_CONTENT_TYPE); + assertThat(request.getHeaders()) + .hasSize(1) + .containsEntry(HttpBaseRequest.HEADER_CONTENT_TYPE, EXAMPLE_CONTENT_TYPE); + } + + @Test + public void shouldIgnoreNullOrEmptyContentType() { + HttpRequest request = connector.createRequest().contentType(null); + assertThat(request.getContentType()).isNull(); + + request.contentType(""); + assertThat(request.getContentType()).isNull(); + } + + @Test + public void setHeaders() { + HttpRequest request = connector.createRequest().header("hello", "world").header("foo", "bar"); + assertThat(request.getHeaders()) + .hasSize(2) + .containsEntry("hello", "world") + .containsEntry("foo", "bar"); + + assertThat(request.getHeader("hello")).isEqualTo("world"); + assertThat(request.getHeader("unknown")).isNull(); + } + + @Test + public void shouldIgnoreHeadersWithNullOrEmptyNameOrValue() { + HttpRequest request = connector.createRequest().header(null, "test"); + assertThat(request.getHeaders()).isNull(); + + request.header("", "test"); + assertThat(request.getHeaders()).isNull(); + + request.header("test", null); + assertThat(request.getHeaders()).isNull(); + + request.header("test", ""); + assertThat(request.getHeaders()).isNull(); + } + + @Test + public void setPayLoad() { + HttpRequest request = connector.createRequest().payload(EXAMPLE_PAYLOAD); + assertThat(request.getPayload()).isEqualTo(EXAMPLE_PAYLOAD); + } + + @Test + public void setRequestParameters() { + HttpRequest request = connector.createRequest(); + + request.setRequestParameter("hello", "world"); + + Map params = new HashMap (); + params.put("foo", "bar"); + params.put("number", 42); + request.setRequestParameters(params); + + assertThat(request.getRequestParameters()) + .hasSize(3) + .containsEntry("hello", "world") + .containsEntry("foo", "bar") + .containsEntry("number", 42); + } + +} diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java new file mode 100644 index 00000000000..deb056b2e24 --- /dev/null +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java @@ -0,0 +1,89 @@ +/* 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 org.camunda.connect.httpclient; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.camunda.connect.httpclient.impl.HttpConnectorImpl; +import org.camunda.connect.impl.DebugRequestInterceptor; +import org.junit.Before; +import org.junit.Test; + +public class HttpResponseTest { + + protected HttpConnector connector; + protected TestResponse testResponse; + + @Before + public void getConnector() { + testResponse = new TestResponse(); + connector = new HttpConnectorImpl(); + connector.addRequestInterceptor(new DebugRequestInterceptor(testResponse)); + } + + @Test + public void testResponseCode() { + testResponse.statusCode(123); + HttpResponse response = getResponse(); + assertThat(response.getStatusCode()).isEqualTo(123); + } + + @Test + public void testResponseBody() { + testResponse.payload("test"); + HttpResponse response = getResponse(); + assertThat(response.getResponse()).isEqualTo("test"); + } + + @Test + public void testEmptyResponseBody() { + testResponse.payload(""); + HttpResponse response = getResponse(); + assertThat(response.getResponse()).isEmpty(); + } + + @Test + public void testNullResponseBody() { + HttpResponse response = getResponse(); + assertThat(response.getResponse()).isNull(); + } + + @Test + public void testEmptyHeaders() { + HttpResponse response = getResponse(); + assertThat(response.getHeaders()).isEmpty(); + } + + @Test + public void testHeaders() { + testResponse + .header("foo", "bar") + .header("hello", "world"); + HttpResponse response = getResponse(); + assertThat(response.getHeaders()) + .hasSize(2) + .containsEntry("foo", "bar") + .containsEntry("hello", "world") + .doesNotContainKey("unknown"); + + assertThat(response.getHeader("foo")).isEqualTo("bar"); + assertThat(response.getHeader("hello")).isEqualTo("world"); + assertThat(response.getHeader("unknown")).isNull(); + } + + protected HttpResponse getResponse() { + return connector.createRequest().url("http://camunda.com").get().execute(); + } + +} diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/TestResponse.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/TestResponse.java new file mode 100644 index 00000000000..ea21fc49c0c --- /dev/null +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/TestResponse.java @@ -0,0 +1,63 @@ +/* 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 org.camunda.connect.httpclient; + +import java.io.IOException; + +import org.apache.http.HttpVersion; +import org.apache.http.ProtocolVersion; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.StringEntity; +import org.apache.http.message.BasicHttpResponse; + +public class TestResponse extends BasicHttpResponse implements CloseableHttpResponse { + + public TestResponse() { + this(HttpVersion.HTTP_1_1, 200, "OK"); + } + + public TestResponse(ProtocolVersion ver, int code, String reason) { + super(ver, code, reason); + } + + public TestResponse statusCode(int statusCode) { + setStatusCode(statusCode); + return this; + } + + public TestResponse header(String field, String value) { + setHeader(field, value); + return this; + } + + public TestResponse payload(String payload) { + return payload(payload, ContentType.TEXT_PLAIN); + } + + public TestResponse payload(String payload, ContentType contentType) { + if (payload != null) { + setEntity(new StringEntity(payload, contentType)); + } + else { + setEntity(null); + } + return this; + } + + public void close() throws IOException { + + } + +} diff --git a/connect/http-client/src/test/resources/logback-test.xml b/connect/http-client/src/test/resources/logback-test.xml new file mode 100644 index 00000000000..c8e6e5ee06a --- /dev/null +++ b/connect/http-client/src/test/resources/logback-test.xml @@ -0,0 +1,11 @@ + + diff --git a/connect/pom.xml b/connect/pom.xml index 6121c985f3e..297b042bbb3 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -1,26 +1,23 @@+ + ++ +%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n ++ ++ 4.0.0 -- -org.camunda -camunda-release-parent -2.5 - -+ org.camunda.connect +camunda-connect-bom +1.0.0-SNAPSHOT +bom org.camunda.connect camunda-connect-root -1.0.0-SNAPSHOT camunda BPM - connect - parent pom + bom core -soap-httpclient dist -rest-httpclient +http-client +soap-http-client @@ -52,12 +49,6 @@ 1.5.0
, R e protected static HttpConnectorLogger LOG = HttpLogger.HTTP_LOGGER; protected CloseableHttpClient httpClient; + protected final Charset charset; public AbstractHttpConnector(String connectorId) { super(connectorId); httpClient = createClient(); + charset = Charset.forName("utf-8"); } protected CloseableHttpClient createClient() { @@ -135,8 +137,10 @@ protectedvoid applyHeaders(T httpRequest, Map void applyPayload(T httpRequest, Q request) { if (httpMethodSupportsPayload(httpRequest)) { if (request.getPayload() != null) { - ByteArrayInputStream payload = new ByteArrayInputStream(request.getPayload().getBytes(Charset.forName("utf-8"))); - ((HttpEntityEnclosingRequestBase) httpRequest).setEntity(new InputStreamEntity(payload)); + byte[] bytes = request.getPayload().getBytes(charset); + ByteArrayInputStream payload = new ByteArrayInputStream(bytes); + InputStreamEntity entity = new InputStreamEntity(payload, bytes.length); + ((HttpEntityEnclosingRequestBase) httpRequest).setEntity(entity); } } else if (request.getPayload() != null) { diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java index 95d4e41293d..5f082f8dd4f 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java @@ -161,6 +161,15 @@ public void shouldSetPayloadOnHttpRequest() throws IOException { assertThat(content).isEqualTo(EXAMPLE_PAYLOAD); } + @Test + public void shouldSetContentLength() { + connector.createRequest().url(EXAMPLE_URL).payload(EXAMPLE_PAYLOAD).post().execute(); + HttpPost request = interceptor.getTarget(); + long contentLength = request.getEntity().getContentLength(); + + assertThat(contentLength).isEqualTo(EXAMPLE_PAYLOAD.length()); + } + protected void verifyHttpRequest(Class extends HttpRequestBase> requestClass) { Object target = interceptor.getTarget(); assertThat(target).isInstanceOf(requestClass); From 7d70bcf9eed7544c0e1c10be8c39ca7a92ecb5aa Mon Sep 17 00:00:00 2001 From: camunda-jenkins Date: Thu, 28 Sep 2017 13:15:48 +0200 Subject: [PATCH 078/200] [maven-release-plugin] prepare release 1.0.5 --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 5bde69e5522..33ab1bee60c 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.0.5-SNAPSHOT +1.0.5 camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.0.5 diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index abd156831ce..9221ed7e93c 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.0.5-SNAPSHOT +1.0.5 camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index cc7a3d8384e..482bbf5b2a5 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.0.5-SNAPSHOT +1.0.5 camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index cf642762037..5cc497df375 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.0.5-SNAPSHOT +1.0.5 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index e29c70c1767..793e4e7168f 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -92,7 +92,7 @@ org.camunda.connect camunda-connect-bom -1.0.5-SNAPSHOT +1.0.5 bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.0.5 diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 34e33084cf5..d3145ea88f1 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.0.5-SNAPSHOT +1.0.5 camunda-connect-soap-http-client From ece58dbfab8d9f6ff3b6f1b7945b87c0b7d959fe Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Thu, 28 Sep 2017 13:15:55 +0200 Subject: [PATCH 079/200] [maven-release-plugin] prepare for next development iteration --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 33ab1bee60c..89dcc350bda 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.0.5 +1.1.0-SNAPSHOT camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.0.5 +HEAD diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 9221ed7e93c..265be816edc 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.0.5 +1.1.0-SNAPSHOT camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 482bbf5b2a5..c0b33e67766 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.0.5 +1.1.0-SNAPSHOT camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 5cc497df375..b983285da77 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.0.5 +1.1.0-SNAPSHOT 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index 793e4e7168f..980d8564488 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -92,7 +92,7 @@ org.camunda.connect camunda-connect-bom -1.0.5 +1.1.0-SNAPSHOT bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.0.5 +HEAD diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index d3145ea88f1..12fd8c54f90 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.0.5 +1.1.0-SNAPSHOT camunda-connect-soap-http-client From 5557ba64a21f41aae5c315fafa825577a4c71274 Mon Sep 17 00:00:00 2001 From: Christian LipphardtDate: Mon, 30 Oct 2017 15:23:02 +0100 Subject: [PATCH 080/200] chore(ci): add camunda ci file related to #CAM-6681 --- connect/.ci.cambpm | 1 + 1 file changed, 1 insertion(+) create mode 100644 connect/.ci.cambpm diff --git a/connect/.ci.cambpm b/connect/.ci.cambpm new file mode 100644 index 00000000000..f202e89eea9 --- /dev/null +++ b/connect/.ci.cambpm @@ -0,0 +1 @@ +buildMavenAndDeployToMavenCentral([jdk:7]) From 867e74e1330f8b9a920221186e49f9830541a4ff Mon Sep 17 00:00:00 2001 From: Svetlana Dorokhova Date: Wed, 31 Jan 2018 13:50:56 +0100 Subject: [PATCH 081/200] chore(pom): update commons dependency version --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 980d8564488..548341aacb8 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -30,7 +30,7 @@ From 08f56102cdd503bbc994cbbe93d738d57ff9fb27 Mon Sep 17 00:00:00 2001 From: camunda-jenkins org.camunda.commons camunda-commons-bom -1.4.0 +1.5.0 import pom Date: Wed, 31 Jan 2018 13:55:45 +0100 Subject: [PATCH 082/200] [maven-release-plugin] prepare release 1.0.6 --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 89dcc350bda..6e080d60e6e 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.1.0-SNAPSHOT +1.0.6 camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.0.6 diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 265be816edc..1f55cebc3f7 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.0-SNAPSHOT +1.0.6 camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index c0b33e67766..3da7c4550a1 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.0-SNAPSHOT +1.0.6 camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index b983285da77..45e1acdac21 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.1.0-SNAPSHOT +1.0.6 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index 548341aacb8..801dfeaf64c 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -92,7 +92,7 @@ org.camunda.connect camunda-connect-bom -1.1.0-SNAPSHOT +1.0.6 bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.0.6 diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 12fd8c54f90..f5d4d02e8f0 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.0-SNAPSHOT +1.0.6 camunda-connect-soap-http-client From 31bc26db5eed9e542a1a473c323640d8778a1a69 Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Wed, 31 Jan 2018 13:55:51 +0100 Subject: [PATCH 083/200] [maven-release-plugin] prepare for next development iteration --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 6e080d60e6e..89dcc350bda 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.0.6 +1.1.0-SNAPSHOT camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.0.6 +HEAD diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 1f55cebc3f7..265be816edc 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.0.6 +1.1.0-SNAPSHOT camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 3da7c4550a1..c0b33e67766 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.0.6 +1.1.0-SNAPSHOT camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 45e1acdac21..b983285da77 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.0.6 +1.1.0-SNAPSHOT 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index 801dfeaf64c..548341aacb8 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -92,7 +92,7 @@ org.camunda.connect camunda-connect-bom -1.0.6 +1.1.0-SNAPSHOT bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.0.6 +HEAD diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index f5d4d02e8f0..12fd8c54f90 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.0.6 +1.1.0-SNAPSHOT camunda-connect-soap-http-client From 0c51af53982a2c41120d4842b0c6eb73f95eea3c Mon Sep 17 00:00:00 2001 From: Svetlana DorokhovaDate: Wed, 31 Jan 2018 14:00:42 +0100 Subject: [PATCH 084/200] chore(pom): update old version --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 548341aacb8..cb1b0d80e96 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -13,7 +13,7 @@ pom - 1.0.0 +1.0.5 From 25f15eea6ea527ef0617b40d4015401adf9c40b8 Mon Sep 17 00:00:00 2001 From: Roman Date: Thu, 15 Mar 2018 14:10:37 +0100 Subject: [PATCH 085/200] chore(license): use license maven plugin to collect third-party deps related to CAM-8699 --- connect/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/connect/pom.xml b/connect/pom.xml index cb1b0d80e96..5f60806e5e9 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -14,6 +14,7 @@ 1.0.5 +false @@ -86,6 +87,17 @@ + + + +org.codehaus.mojo +license-maven-plugin +1.14 ++ +true +test +From 19cf3ce5791596a3f950f43c94c982528ef22c0c Mon Sep 17 00:00:00 2001 From: Yana Vasileva diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 265be816edc..6c493115187 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@Date: Mon, 4 Jun 2018 14:47:34 +0200 Subject: [PATCH 086/200] chore(pom): bump to 1.6.0-snapshot commons version --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 5f60806e5e9..94aab654461 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -31,7 +31,7 @@ From ca3c73f2f46c578f9f573fda06f099dd87f0a4bc Mon Sep 17 00:00:00 2001 From: Yana Vasileva org.camunda.commons camunda-commons-bom -1.5.0 +1.6.0-SNAPSHOT import pom Date: Wed, 6 Jun 2018 11:51:57 +0200 Subject: [PATCH 087/200] chore(pom): bump to 1.5.1 commons version --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 94aab654461..e2cfe4d94d8 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -31,7 +31,7 @@ From f7d647e5fa6c0ea953840352941013058ca82b75 Mon Sep 17 00:00:00 2001 From: camunda-jenkins org.camunda.commons camunda-commons-bom -1.6.0-SNAPSHOT +1.5.1 import pom Date: Wed, 6 Jun 2018 13:32:49 +0200 Subject: [PATCH 088/200] [maven-release-plugin] prepare release 1.0.7 --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 89dcc350bda..d6b1e9a20eb 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.1.0-SNAPSHOT +1.0.7 camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.0.7 org.camunda.connect camunda-connect-root -1.1.0-SNAPSHOT +1.0.7 camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index c0b33e67766..ef02aacad5e 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.0-SNAPSHOT +1.0.7 camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index b983285da77..be1ca77c3d1 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.1.0-SNAPSHOT +1.0.7 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index e2cfe4d94d8..f9f6e855234 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -104,7 +104,7 @@ org.camunda.connect camunda-connect-bom -1.1.0-SNAPSHOT +1.0.7 bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.0.7 diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 12fd8c54f90..99b128a0481 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.0-SNAPSHOT +1.0.7 camunda-connect-soap-http-client From 91f62c78dc37d3b9e0ee97c14a706ea1d9eef241 Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Wed, 6 Jun 2018 13:32:56 +0200 Subject: [PATCH 089/200] [maven-release-plugin] prepare for next development iteration --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index d6b1e9a20eb..89dcc350bda 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.0.7 +1.1.0-SNAPSHOT camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.0.7 +HEAD diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 6c493115187..265be816edc 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.0.7 +1.1.0-SNAPSHOT camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index ef02aacad5e..c0b33e67766 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.0.7 +1.1.0-SNAPSHOT camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index be1ca77c3d1..b983285da77 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.0.7 +1.1.0-SNAPSHOT 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index f9f6e855234..e2cfe4d94d8 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -104,7 +104,7 @@ org.camunda.connect camunda-connect-bom -1.0.7 +1.1.0-SNAPSHOT bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.0.7 +HEAD diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 99b128a0481..12fd8c54f90 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.0.7 +1.1.0-SNAPSHOT camunda-connect-soap-http-client From e80fcaa1d2bb6c6adf3befbd8ccf1b0bca4e7158 Mon Sep 17 00:00:00 2001 From: yanavasilevaDate: Wed, 6 Jun 2018 13:36:39 +0200 Subject: [PATCH 090/200] chore(pom): update old version to 1.0.6 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index e2cfe4d94d8..f15b3679dec 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -13,7 +13,7 @@ pom - From 2a705d920648cfcec0af31fa51618abddf224223 Mon Sep 17 00:00:00 2001 From: yanavasileva1.0.5 +1.0.6 false Date: Fri, 7 Sep 2018 11:43:09 +0200 Subject: [PATCH 091/200] chore(pom): update commons dependency version --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index f15b3679dec..74f0dccec55 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -31,7 +31,7 @@ From 85cc6e6bab34873568bbb5dd1611e10e396680cb Mon Sep 17 00:00:00 2001 From: Yana Vasileva org.camunda.commons camunda-commons-bom -1.5.1 +1.6.0-SNAPSHOT import pom Date: Fri, 7 Sep 2018 14:55:34 +0200 Subject: [PATCH 092/200] chore(pom): update release parent version to 3.0 Related to CAM-9299 --- connect/bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 89dcc350bda..547d4289219 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -4,7 +4,7 @@ From 060f92cd727c6ac3b63a264edeba6032ab88c209 Mon Sep 17 00:00:00 2001 From: Yana Vasileva org.camunda camunda-release-parent -2.5 +3.0 Date: Thu, 13 Sep 2018 11:57:52 +0200 Subject: [PATCH 093/200] chore(pom): update commons to 1.6.0 version --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 74f0dccec55..5515e30379e 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -31,7 +31,7 @@ From 135431b0b23f970203da1075a69955e51df4921c Mon Sep 17 00:00:00 2001 From: camunda-jenkins org.camunda.commons camunda-commons-bom -1.6.0-SNAPSHOT +1.6.0 import pom Date: Thu, 13 Sep 2018 12:43:11 +0200 Subject: [PATCH 094/200] [maven-release-plugin] prepare release 1.1.0 --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 547d4289219..06fa6315326 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.1.0-SNAPSHOT +1.1.0 camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.1.0 diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 265be816edc..e13333b0e87 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.0-SNAPSHOT +1.1.0 camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index c0b33e67766..44c6ee7a2b1 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.0-SNAPSHOT +1.1.0 camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index b983285da77..80e790443be 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.1.0-SNAPSHOT +1.1.0 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index 5515e30379e..d0357be5bae 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -104,7 +104,7 @@ org.camunda.connect camunda-connect-bom -1.1.0-SNAPSHOT +1.1.0 bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.1.0 diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 12fd8c54f90..f9a639cbb6f 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.0-SNAPSHOT +1.1.0 camunda-connect-soap-http-client From f69e1c102c93ec7ffb0e9b13ee867ffcdc596969 Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Thu, 13 Sep 2018 12:43:18 +0200 Subject: [PATCH 095/200] [maven-release-plugin] prepare for next development iteration --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 06fa6315326..f50d588635c 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.1.0 +1.2.0-SNAPSHOT camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.1.0 +HEAD diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index e13333b0e87..a3c04154927 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.0 +1.2.0-SNAPSHOT camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 44c6ee7a2b1..9ca25728960 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.0 +1.2.0-SNAPSHOT camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 80e790443be..85eac81b671 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.1.0 +1.2.0-SNAPSHOT 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index d0357be5bae..3c813dd8ce1 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -104,7 +104,7 @@ org.camunda.connect camunda-connect-bom -1.1.0 +1.2.0-SNAPSHOT bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.1.0 +HEAD diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index f9a639cbb6f..19e7b76184a 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.0 +1.2.0-SNAPSHOT camunda-connect-soap-http-client From e1ff2850cdbdecf7ca604b3f8c3485f77188c7ed Mon Sep 17 00:00:00 2001 From: Yana VasilevaDate: Thu, 13 Sep 2018 12:52:05 +0200 Subject: [PATCH 096/200] chore(pom): update old version to 1.0.7 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 3c813dd8ce1..31a45ec97e3 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -13,7 +13,7 @@ pom - From 8cdbf0de432e938d414284880932176dfddcc4bc Mon Sep 17 00:00:00 2001 From: Christian Lipphardt1.0.6 +1.0.7 false Date: Mon, 24 Sep 2018 17:24:02 +0200 Subject: [PATCH 097/200] chore(pom): update release parent version to 3.1 - only use nexus-staging-plugin for deploy Related to SRE-257 --- connect/bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index f50d588635c..67d145f25fc 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -4,7 +4,7 @@ From 7a73eb88d65d5c3f0ce01d816b487dfaaea1a354 Mon Sep 17 00:00:00 2001 From: Nikola Koevski org.camunda camunda-release-parent -3.0 +3.1 Date: Thu, 15 Nov 2018 21:08:16 +0100 Subject: [PATCH 098/200] chore(engine): add & reformat license headers to files * Add missing license headers to java source files; * Format existing license headers in java source files to get a consitent pattern. Related to CAM-9524 --- .../main/java/org/camunda/connect/ConnectorException.java | 7 +++++-- .../org/camunda/connect/ConnectorRequestException.java | 6 ++++-- .../org/camunda/connect/ConnectorResponseException.java | 6 ++++-- .../src/main/java/org/camunda/connect/Connectors.java | 6 ++++-- .../connect/impl/AbstractCloseableConnectorResponse.java | 7 +++++-- .../java/org/camunda/connect/impl/AbstractConnector.java | 7 +++++-- .../camunda/connect/impl/AbstractConnectorRequest.java | 7 +++++-- .../camunda/connect/impl/AbstractConnectorResponse.java | 7 +++++-- .../camunda/connect/impl/AbstractRequestInvocation.java | 7 +++++-- .../java/org/camunda/connect/impl/ConnectCoreLogger.java | 7 +++++-- .../main/java/org/camunda/connect/impl/ConnectLogger.java | 7 +++++-- .../org/camunda/connect/impl/DebugRequestInterceptor.java | 6 ++++-- .../camunda/connect/spi/CloseableConnectorResponse.java | 7 +++++-- .../src/main/java/org/camunda/connect/spi/Connector.java | 7 +++++-- .../org/camunda/connect/spi/ConnectorConfigurator.java | 6 ++++-- .../java/org/camunda/connect/spi/ConnectorInvocation.java | 7 +++++-- .../java/org/camunda/connect/spi/ConnectorProvider.java | 6 ++++-- .../java/org/camunda/connect/spi/ConnectorRequest.java | 7 +++++-- .../camunda/connect/spi/ConnectorRequestInterceptor.java | 7 +++++-- .../java/org/camunda/connect/spi/ConnectorResponse.java | 7 +++++-- .../java/org/camunda/connect/dummy/DummyConnector.java | 6 ++++-- .../camunda/connect/dummy/DummyConnectorConfigurator.java | 6 ++++-- .../org/camunda/connect/dummy/DummyConnectorProvider.java | 6 ++++-- .../test/java/org/camunda/connect/dummy/DummyRequest.java | 6 ++++-- .../java/org/camunda/connect/dummy/DummyResponse.java | 6 ++++-- .../java/org/camunda/connect/dummy/MyHttpConnector.java | 6 ++++-- .../camunda/connect/dummy/MyHttpConnectorProvider.java | 6 ++++-- .../test/java/org/camunda/connect/spi/ConnectorsTest.java | 6 ++++-- .../org/camunda/connect/httpclient/HttpBaseRequest.java | 6 ++++-- .../org/camunda/connect/httpclient/HttpConnector.java | 7 +++++-- .../camunda/connect/httpclient/HttpConnectorProvider.java | 6 ++++-- .../org/camunda/connect/httpclient/HttpMethodRequest.java | 6 ++++-- .../java/org/camunda/connect/httpclient/HttpRequest.java | 7 +++++-- .../java/org/camunda/connect/httpclient/HttpResponse.java | 7 +++++-- .../connect/httpclient/impl/AbstractHttpConnector.java | 6 ++++-- .../connect/httpclient/impl/AbstractHttpRequest.java | 6 ++++-- .../connect/httpclient/impl/HttpConnectorImpl.java | 7 +++++-- .../connect/httpclient/impl/HttpConnectorLogger.java | 6 ++++-- .../httpclient/impl/HttpConnectorProviderImpl.java | 6 ++++-- .../org/camunda/connect/httpclient/impl/HttpLogger.java | 6 ++++-- .../camunda/connect/httpclient/impl/HttpRequestImpl.java | 6 ++++-- .../connect/httpclient/impl/HttpRequestInvocation.java | 6 ++++-- .../camunda/connect/httpclient/impl/HttpResponseImpl.java | 6 ++++-- .../httpclient/HttpConnectorSystemPropertiesTest.java | 7 +++++-- .../org/camunda/connect/httpclient/HttpConnectorTest.java | 7 +++++-- .../org/camunda/connect/httpclient/HttpRequestTest.java | 8 +++++--- .../org/camunda/connect/httpclient/HttpResponseTest.java | 6 ++++-- .../java/org/camunda/connect/httpclient/TestResponse.java | 6 ++++-- .../connect/httpclient/soap/SoapHttpConnector.java | 7 +++++-- .../httpclient/soap/SoapHttpConnectorProvider.java | 6 ++++-- .../camunda/connect/httpclient/soap/SoapHttpRequest.java | 6 ++++-- .../camunda/connect/httpclient/soap/SoapHttpResponse.java | 7 +++++-- .../httpclient/soap/impl/SoapHttpConnectorImpl.java | 7 +++++-- .../httpclient/soap/impl/SoapHttpConnectorLogger.java | 6 ++++-- .../soap/impl/SoapHttpConnectorProviderImpl.java | 6 ++++-- .../connect/httpclient/soap/impl/SoapHttpLogger.java | 6 ++++-- .../connect/httpclient/soap/impl/SoapHttpRequestImpl.java | 7 +++++-- .../httpclient/soap/impl/SoapHttpResponseImpl.java | 7 +++++-- .../httpclient/SoapHttpConnectorSystemPropertiesTest.java | 7 +++++-- .../connect/soap/httpclient/SoapHttpConnectorTest.java | 6 ++++-- .../connect/soap/httpclient/SoapHttpRequestTest.java | 7 +++++-- 61 files changed, 272 insertions(+), 123 deletions(-) diff --git a/connect/core/src/main/java/org/camunda/connect/ConnectorException.java b/connect/core/src/main/java/org/camunda/connect/ConnectorException.java index 30171f64854..f90a569c17f 100644 --- a/connect/core/src/main/java/org/camunda/connect/ConnectorException.java +++ b/connect/core/src/main/java/org/camunda/connect/ConnectorException.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/core/src/main/java/org/camunda/connect/ConnectorRequestException.java b/connect/core/src/main/java/org/camunda/connect/ConnectorRequestException.java index c84c167f89f..7140f847de1 100644 --- a/connect/core/src/main/java/org/camunda/connect/ConnectorRequestException.java +++ b/connect/core/src/main/java/org/camunda/connect/ConnectorRequestException.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect; /** diff --git a/connect/core/src/main/java/org/camunda/connect/ConnectorResponseException.java b/connect/core/src/main/java/org/camunda/connect/ConnectorResponseException.java index 95850600eb1..c7896dc6a32 100644 --- a/connect/core/src/main/java/org/camunda/connect/ConnectorResponseException.java +++ b/connect/core/src/main/java/org/camunda/connect/ConnectorResponseException.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect; /** diff --git a/connect/core/src/main/java/org/camunda/connect/Connectors.java b/connect/core/src/main/java/org/camunda/connect/Connectors.java index 4986a3882d3..ca7fff09812 100644 --- a/connect/core/src/main/java/org/camunda/connect/Connectors.java +++ b/connect/core/src/main/java/org/camunda/connect/Connectors.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect; import java.util.HashMap; diff --git a/connect/core/src/main/java/org/camunda/connect/impl/AbstractCloseableConnectorResponse.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractCloseableConnectorResponse.java index 7a4e7e1752a..daeb31c88d7 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/AbstractCloseableConnectorResponse.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractCloseableConnectorResponse.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnector.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnector.java index 094d0c9151a..247985f695a 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnector.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnector.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorRequest.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorRequest.java index 8de1b2f257d..e759e2ddcad 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorRequest.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorRequest.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorResponse.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorResponse.java index 98c4313161d..973f173f140 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorResponse.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorResponse.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/core/src/main/java/org/camunda/connect/impl/AbstractRequestInvocation.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractRequestInvocation.java index 303e3f15556..bc798487e9d 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/AbstractRequestInvocation.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractRequestInvocation.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/core/src/main/java/org/camunda/connect/impl/ConnectCoreLogger.java b/connect/core/src/main/java/org/camunda/connect/impl/ConnectCoreLogger.java index ba9c7f8feed..4d47c2ea9bd 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/ConnectCoreLogger.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/ConnectCoreLogger.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/core/src/main/java/org/camunda/connect/impl/ConnectLogger.java b/connect/core/src/main/java/org/camunda/connect/impl/ConnectLogger.java index 8ad34aa54aa..88e7d75f8dc 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/ConnectLogger.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/ConnectLogger.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/core/src/main/java/org/camunda/connect/impl/DebugRequestInterceptor.java b/connect/core/src/main/java/org/camunda/connect/impl/DebugRequestInterceptor.java index c255b78e4b8..6fc626eebfa 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/DebugRequestInterceptor.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/DebugRequestInterceptor.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.impl; import org.camunda.connect.spi.ConnectorInvocation; diff --git a/connect/core/src/main/java/org/camunda/connect/spi/CloseableConnectorResponse.java b/connect/core/src/main/java/org/camunda/connect/spi/CloseableConnectorResponse.java index 38cdcc6b57a..ff2fba1ca70 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/CloseableConnectorResponse.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/CloseableConnectorResponse.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/core/src/main/java/org/camunda/connect/spi/Connector.java b/connect/core/src/main/java/org/camunda/connect/spi/Connector.java index 6c30df956ec..7cb7c41e87e 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/Connector.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/Connector.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorConfigurator.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorConfigurator.java index 80dd039696f..6790ce9a114 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorConfigurator.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorConfigurator.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.spi; /** diff --git a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorInvocation.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorInvocation.java index 8559344b667..dc5f6eec352 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorInvocation.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorInvocation.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorProvider.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorProvider.java index 801c232004f..5793c9d3d7f 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorProvider.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorProvider.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.spi; /** diff --git a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequest.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequest.java index 528201e8d4e..d59846b625d 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequest.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequest.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequestInterceptor.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequestInterceptor.java index 647eed35e48..ee8cc1d3617 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequestInterceptor.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequestInterceptor.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorResponse.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorResponse.java index e4bce1b888a..ef6522605ed 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorResponse.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorResponse.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnector.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnector.java index 065c7583c89..2c01ea2f9ba 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnector.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnector.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.dummy; import org.camunda.connect.impl.AbstractConnector; diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorConfigurator.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorConfigurator.java index bbb8e2186c3..73e80e328fb 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorConfigurator.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorConfigurator.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.dummy; import org.camunda.connect.spi.ConnectorConfigurator; diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorProvider.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorProvider.java index 231476774a9..ad7f07250f7 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorProvider.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorProvider.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.dummy; import org.camunda.connect.spi.ConnectorProvider; diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/DummyRequest.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyRequest.java index 8b4f45237d2..09034f6d566 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/DummyRequest.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyRequest.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.dummy; import org.camunda.connect.impl.AbstractConnectorRequest; diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/DummyResponse.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyResponse.java index 5c48a1ea0c7..bb959b22b2d 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/DummyResponse.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyResponse.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.dummy; import java.util.Map; diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnector.java b/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnector.java index c2380000e44..b40c121a7de 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnector.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnector.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.dummy; import org.camunda.connect.impl.AbstractConnector; diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnectorProvider.java b/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnectorProvider.java index 24883e11792..c8298289c59 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnectorProvider.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnectorProvider.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.dummy; import org.camunda.connect.Connectors; diff --git a/connect/core/src/test/java/org/camunda/connect/spi/ConnectorsTest.java b/connect/core/src/test/java/org/camunda/connect/spi/ConnectorsTest.java index 84569ed6fee..fc76e2fed60 100644 --- a/connect/core/src/test/java/org/camunda/connect/spi/ConnectorsTest.java +++ b/connect/core/src/test/java/org/camunda/connect/spi/ConnectorsTest.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.spi; import static org.assertj.core.api.Assertions.assertThat; diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpBaseRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpBaseRequest.java index 8ceed78a40e..26122e7d085 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpBaseRequest.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpBaseRequest.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient; import java.util.Map; diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnector.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnector.java index 61a8866eae8..dc64ff5d894 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnector.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnector.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorProvider.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorProvider.java index 47000743bad..82746a4c851 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorProvider.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorProvider.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient; import org.camunda.connect.spi.ConnectorProvider; diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpMethodRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpMethodRequest.java index 431c29cb665..eda2725e590 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpMethodRequest.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpMethodRequest.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient; public interface HttpMethodRequest , R extends HttpResponse> extends HttpBaseRequest{ diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpRequest.java index f6bdb4da333..bc6e1025194 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpRequest.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpRequest.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpResponse.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpResponse.java index 0b73760a3fe..4ab51c6d972 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpResponse.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpResponse.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java index db8f52c4de9..b1c91308959 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient.impl; import java.io.ByteArrayInputStream; diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java index 42b57642c94..f0db89ddcfa 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient.impl; import java.util.HashMap; diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorImpl.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorImpl.java index 6048d87172e..b8bd138d06e 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorImpl.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorImpl.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java index ec687eac444..f6a6f0c2813 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient.impl; import org.camunda.connect.ConnectorRequestException; diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorProviderImpl.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorProviderImpl.java index 5d8b2f85f0c..304fc1bccef 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorProviderImpl.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorProviderImpl.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient.impl; import org.camunda.connect.httpclient.HttpConnector; diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpLogger.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpLogger.java index 9973e05b780..97ab9ecfe19 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpLogger.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpLogger.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient.impl; import org.camunda.commons.logging.BaseLogger; diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestImpl.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestImpl.java index e07a61cec37..806e5da973f 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestImpl.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestImpl.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient.impl; import org.camunda.connect.httpclient.HttpRequest; diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestInvocation.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestInvocation.java index 1393b9bb44f..506ac8df387 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestInvocation.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestInvocation.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient.impl; import java.util.List; diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpResponseImpl.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpResponseImpl.java index 88d028fb790..d86557ea0d2 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpResponseImpl.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpResponseImpl.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient.impl; import java.io.Closeable; diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorSystemPropertiesTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorSystemPropertiesTest.java index d66147386d3..10db58d48d7 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorSystemPropertiesTest.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorSystemPropertiesTest.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java index 5f082f8dd4f..fa5671e521a 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java index bfa73dd1061..f5c5907ab1b 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java index deb056b2e24..3ab155913b6 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/TestResponse.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/TestResponse.java index ea21fc49c0c..d491155f08d 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/TestResponse.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/TestResponse.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient; import java.io.IOException; diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnector.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnector.java index b2c5ac77ff9..11a5c0cc7a1 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnector.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnector.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnectorProvider.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnectorProvider.java index c100e78d234..14fa181a8d2 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnectorProvider.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnectorProvider.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient.soap; import org.camunda.connect.spi.ConnectorProvider; diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpRequest.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpRequest.java index 691147122b2..6002f968aca 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpRequest.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpRequest.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient.soap; import org.camunda.connect.httpclient.HttpBaseRequest; diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpResponse.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpResponse.java index 7ec5f583a13..b9b71737c59 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpResponse.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpResponse.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorImpl.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorImpl.java index 96712a6a0ea..9d349b9864a 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorImpl.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorImpl.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorLogger.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorLogger.java index a8d6c5069bf..477334f7ec7 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorLogger.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorLogger.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient.soap.impl; import org.camunda.connect.ConnectorRequestException; diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorProviderImpl.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorProviderImpl.java index 1baaa46a072..5282b05e90b 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorProviderImpl.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorProviderImpl.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient.soap.impl; import org.camunda.connect.httpclient.soap.SoapHttpConnector; diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpLogger.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpLogger.java index d3dd20f00e1..5748ad1ba66 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpLogger.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpLogger.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.httpclient.soap.impl; import org.camunda.commons.logging.BaseLogger; diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpRequestImpl.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpRequestImpl.java index be46c0979cf..4df524bb742 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpRequestImpl.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpRequestImpl.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpResponseImpl.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpResponseImpl.java index 800ab1c723f..fa61f9abb9c 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpResponseImpl.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpResponseImpl.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorSystemPropertiesTest.java b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorSystemPropertiesTest.java index 6c15b058391..1508c6a592f 100644 --- a/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorSystemPropertiesTest.java +++ b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorSystemPropertiesTest.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, diff --git a/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorTest.java b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorTest.java index fd1c66748d4..1b432c8a1ab 100644 --- a/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorTest.java +++ b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorTest.java @@ -1,4 +1,7 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 * @@ -10,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.camunda.connect.soap.httpclient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpRequestTest.java b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpRequestTest.java index 7e3ff46a10f..3e8a7a6e409 100644 --- a/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpRequestTest.java +++ b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpRequestTest.java @@ -1,8 +1,11 @@ -/* Licensed under the Apache License, Version 2.0 (the "License"); +/* + * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * + * 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 + * 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, From cd0a0141da968bffcfba5509ef0a5856eac3739c Mon Sep 17 00:00:00 2001 From: Yana VasilevaDate: Tue, 4 Dec 2018 16:06:30 +0100 Subject: [PATCH 099/200] chore(pom): update commons version Related to CAM-9569 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 31a45ec97e3..30f0d208f34 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -31,7 +31,7 @@ From a53ae867fbc340087b9293ee38d61e2768ff0a3e Mon Sep 17 00:00:00 2001 From: camunda-jenkins org.camunda.commons camunda-commons-bom -1.6.0 +1.6.1 import pom Date: Wed, 5 Dec 2018 08:11:20 +0100 Subject: [PATCH 100/200] [maven-release-plugin] prepare release 1.1.1 --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 67d145f25fc..67d158422fe 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.2.0-SNAPSHOT +1.1.1 camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.1.1 diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index a3c04154927..7e0c2c23f0c 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.2.0-SNAPSHOT +1.1.1 camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 9ca25728960..8036ac268e2 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.2.0-SNAPSHOT +1.1.1 camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 85eac81b671..78e91923fa2 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.2.0-SNAPSHOT +1.1.1 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index 30f0d208f34..fc91173aec1 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -104,7 +104,7 @@ org.camunda.connect camunda-connect-bom -1.2.0-SNAPSHOT +1.1.1 bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.1.1 diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 19e7b76184a..25115b366e0 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.2.0-SNAPSHOT +1.1.1 camunda-connect-soap-http-client From 11c80abfa9aec49c681bcd36426171284d7f1c74 Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Wed, 5 Dec 2018 08:11:27 +0100 Subject: [PATCH 101/200] [maven-release-plugin] prepare for next development iteration --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 67d158422fe..67d145f25fc 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.1.1 +1.2.0-SNAPSHOT camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.1.1 +HEAD diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 7e0c2c23f0c..a3c04154927 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.1 +1.2.0-SNAPSHOT camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 8036ac268e2..9ca25728960 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.1 +1.2.0-SNAPSHOT camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 78e91923fa2..85eac81b671 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.1.1 +1.2.0-SNAPSHOT 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index fc91173aec1..30f0d208f34 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -104,7 +104,7 @@ org.camunda.connect camunda-connect-bom -1.1.1 +1.2.0-SNAPSHOT bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.1.1 +HEAD diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 25115b366e0..19e7b76184a 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.1 +1.2.0-SNAPSHOT camunda-connect-soap-http-client From e2efb50c255b1c7cac63202a081568adaf39eac4 Mon Sep 17 00:00:00 2001 From: Yana VasilevaDate: Wed, 5 Dec 2018 08:24:49 +0100 Subject: [PATCH 102/200] chore(pom): update old version to 1.1.0 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 30f0d208f34..1d4e8cba38e 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -13,7 +13,7 @@ pom - From f2744f4e312b6c8c9979a4e3dfc0f74be5370eb8 Mon Sep 17 00:00:00 2001 From: Nikola Koevski1.0.7 +1.1.0 false Date: Tue, 11 Dec 2018 16:42:17 +0100 Subject: [PATCH 103/200] chore(license): add license header plugin * Update license headers with plugin * Update release-parent version Related to CAM-9536 --- connect/.ci.cambpm | 2 +- connect/bom/pom.xml | 2 +- .../main/java/org/camunda/connect/ConnectorException.java | 2 +- .../java/org/camunda/connect/ConnectorRequestException.java | 2 +- .../java/org/camunda/connect/ConnectorResponseException.java | 2 +- .../core/src/main/java/org/camunda/connect/Connectors.java | 2 +- .../connect/impl/AbstractCloseableConnectorResponse.java | 2 +- .../java/org/camunda/connect/impl/AbstractConnector.java | 2 +- .../org/camunda/connect/impl/AbstractConnectorRequest.java | 2 +- .../org/camunda/connect/impl/AbstractConnectorResponse.java | 2 +- .../org/camunda/connect/impl/AbstractRequestInvocation.java | 2 +- .../java/org/camunda/connect/impl/ConnectCoreLogger.java | 2 +- .../main/java/org/camunda/connect/impl/ConnectLogger.java | 2 +- .../org/camunda/connect/impl/DebugRequestInterceptor.java | 2 +- .../org/camunda/connect/spi/CloseableConnectorResponse.java | 2 +- .../src/main/java/org/camunda/connect/spi/Connector.java | 2 +- .../java/org/camunda/connect/spi/ConnectorConfigurator.java | 2 +- .../java/org/camunda/connect/spi/ConnectorInvocation.java | 2 +- .../main/java/org/camunda/connect/spi/ConnectorProvider.java | 2 +- .../main/java/org/camunda/connect/spi/ConnectorRequest.java | 2 +- .../org/camunda/connect/spi/ConnectorRequestInterceptor.java | 2 +- .../main/java/org/camunda/connect/spi/ConnectorResponse.java | 2 +- .../test/java/org/camunda/connect/dummy/DummyConnector.java | 2 +- .../camunda/connect/dummy/DummyConnectorConfigurator.java | 2 +- .../org/camunda/connect/dummy/DummyConnectorProvider.java | 2 +- .../test/java/org/camunda/connect/dummy/DummyRequest.java | 2 +- .../test/java/org/camunda/connect/dummy/DummyResponse.java | 2 +- .../test/java/org/camunda/connect/dummy/MyHttpConnector.java | 2 +- .../org/camunda/connect/dummy/MyHttpConnectorProvider.java | 2 +- .../test/java/org/camunda/connect/spi/ConnectorsTest.java | 2 +- .../java/org/camunda/connect/httpclient/HttpBaseRequest.java | 2 +- .../java/org/camunda/connect/httpclient/HttpConnector.java | 2 +- .../camunda/connect/httpclient/HttpConnectorProvider.java | 2 +- .../org/camunda/connect/httpclient/HttpMethodRequest.java | 2 +- .../java/org/camunda/connect/httpclient/HttpRequest.java | 2 +- .../java/org/camunda/connect/httpclient/HttpResponse.java | 2 +- .../connect/httpclient/impl/AbstractHttpConnector.java | 2 +- .../camunda/connect/httpclient/impl/AbstractHttpRequest.java | 2 +- .../camunda/connect/httpclient/impl/HttpConnectorImpl.java | 2 +- .../camunda/connect/httpclient/impl/HttpConnectorLogger.java | 2 +- .../connect/httpclient/impl/HttpConnectorProviderImpl.java | 2 +- .../java/org/camunda/connect/httpclient/impl/HttpLogger.java | 2 +- .../org/camunda/connect/httpclient/impl/HttpRequestImpl.java | 2 +- .../connect/httpclient/impl/HttpRequestInvocation.java | 2 +- .../camunda/connect/httpclient/impl/HttpResponseImpl.java | 2 +- .../httpclient/HttpConnectorSystemPropertiesTest.java | 2 +- .../org/camunda/connect/httpclient/HttpConnectorTest.java | 2 +- .../java/org/camunda/connect/httpclient/HttpRequestTest.java | 2 +- .../org/camunda/connect/httpclient/HttpResponseTest.java | 2 +- .../java/org/camunda/connect/httpclient/TestResponse.java | 2 +- connect/pom.xml | 5 +++++ .../camunda/connect/httpclient/soap/SoapHttpConnector.java | 2 +- .../connect/httpclient/soap/SoapHttpConnectorProvider.java | 2 +- .../org/camunda/connect/httpclient/soap/SoapHttpRequest.java | 2 +- .../camunda/connect/httpclient/soap/SoapHttpResponse.java | 2 +- .../connect/httpclient/soap/impl/SoapHttpConnectorImpl.java | 2 +- .../httpclient/soap/impl/SoapHttpConnectorLogger.java | 2 +- .../httpclient/soap/impl/SoapHttpConnectorProviderImpl.java | 2 +- .../camunda/connect/httpclient/soap/impl/SoapHttpLogger.java | 2 +- .../connect/httpclient/soap/impl/SoapHttpRequestImpl.java | 2 +- .../connect/httpclient/soap/impl/SoapHttpResponseImpl.java | 2 +- .../httpclient/SoapHttpConnectorSystemPropertiesTest.java | 2 +- .../connect/soap/httpclient/SoapHttpConnectorTest.java | 2 +- .../camunda/connect/soap/httpclient/SoapHttpRequestTest.java | 2 +- 64 files changed, 68 insertions(+), 63 deletions(-) diff --git a/connect/.ci.cambpm b/connect/.ci.cambpm index f202e89eea9..8ca6fc65a02 100644 --- a/connect/.ci.cambpm +++ b/connect/.ci.cambpm @@ -1 +1 @@ -buildMavenAndDeployToMavenCentral([jdk:7]) +buildMavenAndDeployToMavenCentral([jdk:7, licenseCheck:true]) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 67d145f25fc..bd1ee2305f4 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -4,7 +4,7 @@ diff --git a/connect/core/src/main/java/org/camunda/connect/ConnectorException.java b/connect/core/src/main/java/org/camunda/connect/ConnectorException.java index f90a569c17f..0ac3f5f5929 100644 --- a/connect/core/src/main/java/org/camunda/connect/ConnectorException.java +++ b/connect/core/src/main/java/org/camunda/connect/ConnectorException.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/ConnectorRequestException.java b/connect/core/src/main/java/org/camunda/connect/ConnectorRequestException.java index 7140f847de1..a3a47ff164a 100644 --- a/connect/core/src/main/java/org/camunda/connect/ConnectorRequestException.java +++ b/connect/core/src/main/java/org/camunda/connect/ConnectorRequestException.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/ConnectorResponseException.java b/connect/core/src/main/java/org/camunda/connect/ConnectorResponseException.java index c7896dc6a32..a8e92037055 100644 --- a/connect/core/src/main/java/org/camunda/connect/ConnectorResponseException.java +++ b/connect/core/src/main/java/org/camunda/connect/ConnectorResponseException.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/Connectors.java b/connect/core/src/main/java/org/camunda/connect/Connectors.java index ca7fff09812..dfcaeab9d13 100644 --- a/connect/core/src/main/java/org/camunda/connect/Connectors.java +++ b/connect/core/src/main/java/org/camunda/connect/Connectors.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/impl/AbstractCloseableConnectorResponse.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractCloseableConnectorResponse.java index daeb31c88d7..ecdccd4351c 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/AbstractCloseableConnectorResponse.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractCloseableConnectorResponse.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnector.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnector.java index 247985f695a..5c463306e19 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnector.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnector.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorRequest.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorRequest.java index e759e2ddcad..c81c4236d44 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorRequest.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorRequest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorResponse.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorResponse.java index 973f173f140..3edef418c11 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorResponse.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorResponse.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/impl/AbstractRequestInvocation.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractRequestInvocation.java index bc798487e9d..4cc32c74b67 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/AbstractRequestInvocation.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractRequestInvocation.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/impl/ConnectCoreLogger.java b/connect/core/src/main/java/org/camunda/connect/impl/ConnectCoreLogger.java index 4d47c2ea9bd..cf0f9518225 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/ConnectCoreLogger.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/ConnectCoreLogger.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/impl/ConnectLogger.java b/connect/core/src/main/java/org/camunda/connect/impl/ConnectLogger.java index 88e7d75f8dc..1fef234ff2c 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/ConnectLogger.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/ConnectLogger.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/impl/DebugRequestInterceptor.java b/connect/core/src/main/java/org/camunda/connect/impl/DebugRequestInterceptor.java index 6fc626eebfa..d26b1f237f7 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/DebugRequestInterceptor.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/DebugRequestInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/spi/CloseableConnectorResponse.java b/connect/core/src/main/java/org/camunda/connect/spi/CloseableConnectorResponse.java index ff2fba1ca70..fb84f4923c6 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/CloseableConnectorResponse.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/CloseableConnectorResponse.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/spi/Connector.java b/connect/core/src/main/java/org/camunda/connect/spi/Connector.java index 7cb7c41e87e..da81baaa138 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/Connector.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/Connector.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/spi/ConnectorConfigurator.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorConfigurator.java index 6790ce9a114..cc0f911c3b5 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorConfigurator.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorConfigurator.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/spi/ConnectorInvocation.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorInvocation.java index dc5f6eec352..65610468d7e 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorInvocation.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorInvocation.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/spi/ConnectorProvider.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorProvider.java index 5793c9d3d7f..4b0019003d8 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorProvider.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorProvider.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequest.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequest.java index d59846b625d..f16df7c39fe 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequest.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequestInterceptor.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequestInterceptor.java index ee8cc1d3617..4f0d3f09933 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequestInterceptor.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequestInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/main/java/org/camunda/connect/spi/ConnectorResponse.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorResponse.java index ef6522605ed..49d004be331 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorResponse.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorResponse.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnector.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnector.java index 2c01ea2f9ba..19aef66423d 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnector.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnector.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorConfigurator.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorConfigurator.java index 73e80e328fb..e5035114a21 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorConfigurator.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorConfigurator.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorProvider.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorProvider.java index ad7f07250f7..7d5a057191c 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorProvider.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorProvider.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/test/java/org/camunda/connect/dummy/DummyRequest.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyRequest.java index 09034f6d566..51cceb68ef2 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/DummyRequest.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyRequest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/test/java/org/camunda/connect/dummy/DummyResponse.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyResponse.java index bb959b22b2d..df85e99c0d2 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/DummyResponse.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyResponse.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnector.java b/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnector.java index b40c121a7de..e6be0b18960 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnector.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnector.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnectorProvider.java b/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnectorProvider.java index c8298289c59..05d999a61dd 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnectorProvider.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnectorProvider.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/core/src/test/java/org/camunda/connect/spi/ConnectorsTest.java b/connect/core/src/test/java/org/camunda/connect/spi/ConnectorsTest.java index fc76e2fed60..312fb974678 100644 --- a/connect/core/src/test/java/org/camunda/connect/spi/ConnectorsTest.java +++ b/connect/core/src/test/java/org/camunda/connect/spi/ConnectorsTest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpBaseRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpBaseRequest.java index 26122e7d085..bd57f0e82f9 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpBaseRequest.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpBaseRequest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnector.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnector.java index dc64ff5d894..a3d2f15f65d 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnector.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnector.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorProvider.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorProvider.java index 82746a4c851..7febc9253a1 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorProvider.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorProvider.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpMethodRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpMethodRequest.java index eda2725e590..1fbd6d91c09 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpMethodRequest.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpMethodRequest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpRequest.java index bc6e1025194..4abe1c30594 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpRequest.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpRequest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpResponse.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpResponse.java index 4ab51c6d972..fdd761591a6 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpResponse.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpResponse.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java index b1c91308959..5a85e1e8c93 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java index f0db89ddcfa..b02fb8aee43 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorImpl.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorImpl.java index b8bd138d06e..16d8822ee25 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorImpl.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java index f6a6f0c2813..37dca3dd80a 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorProviderImpl.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorProviderImpl.java index 304fc1bccef..8a050ade6ed 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorProviderImpl.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorProviderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpLogger.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpLogger.java index 97ab9ecfe19..158ca7095f4 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpLogger.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpLogger.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestImpl.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestImpl.java index 806e5da973f..3a2ee088a7b 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestImpl.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestImpl.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestInvocation.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestInvocation.java index 506ac8df387..ac18f285cb7 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestInvocation.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestInvocation.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpResponseImpl.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpResponseImpl.java index d86557ea0d2..b94e270eaf9 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpResponseImpl.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpResponseImpl.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorSystemPropertiesTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorSystemPropertiesTest.java index 10db58d48d7..49d0551d0c5 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorSystemPropertiesTest.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorSystemPropertiesTest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java index fa5671e521a..f35cbe1ae5e 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java index f5c5907ab1b..bfb4f9c062b 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java index 3ab155913b6..acc9f128ee8 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/http-client/src/test/java/org/camunda/connect/httpclient/TestResponse.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/TestResponse.java index d491155f08d..7e086d0b2a6 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/TestResponse.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/TestResponse.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/pom.xml b/connect/pom.xml index 1d4e8cba38e..e8819deeffa 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -10,6 +10,7 @@ org.camunda camunda-release-parent -3.1 +3.2 camunda-connect-root camunda BPM - connect - root +2014 pom @@ -97,6 +98,10 @@ test ++ diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnector.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnector.java index 11a5c0cc7a1..df187a0e99c 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnector.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnector.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnectorProvider.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnectorProvider.java index 14fa181a8d2..6711845946d 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnectorProvider.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnectorProvider.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpRequest.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpRequest.java index 6002f968aca..a4e98a2b429 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpRequest.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpRequest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpResponse.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpResponse.java index b9b71737c59..3a182b90e54 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpResponse.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpResponse.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorImpl.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorImpl.java index 9d349b9864a..9f0e5351e7a 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorImpl.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorLogger.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorLogger.java index 477334f7ec7..2341670c08d 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorLogger.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorLogger.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorProviderImpl.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorProviderImpl.java index 5282b05e90b..f16a8b87135 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorProviderImpl.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorProviderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpLogger.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpLogger.java index 5748ad1ba66..82b936bed45 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpLogger.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpLogger.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpRequestImpl.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpRequestImpl.java index 4df524bb742..47dbf77e8d8 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpRequestImpl.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpRequestImpl.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpResponseImpl.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpResponseImpl.java index fa61f9abb9c..3fff4af390c 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpResponseImpl.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpResponseImpl.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorSystemPropertiesTest.java b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorSystemPropertiesTest.java index 1508c6a592f..b9ae1f46232 100644 --- a/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorSystemPropertiesTest.java +++ b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorSystemPropertiesTest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorTest.java b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorTest.java index 1b432c8a1ab..e71176ad614 100644 --- a/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorTest.java +++ b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorTest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * 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/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpRequestTest.java b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpRequestTest.java index 3e8a7a6e409..2b7ae134fed 100644 --- a/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpRequestTest.java +++ b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpRequestTest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2014 - 2018 camunda services GmbH and various authors (info@camunda.com) + * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From a65dc5f51228497aa120937f3c6ba55d14a4eced Mon Sep 17 00:00:00 2001 From: Nikola Koevskicom.mycila +license-maven-plugin +Date: Fri, 14 Dec 2018 11:59:45 +0100 Subject: [PATCH 104/200] chore(license): add profile for license header plugin Related to CAM-9536 --- connect/pom.xml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/connect/pom.xml b/connect/pom.xml index e8819deeffa..24a97636206 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -98,13 +98,23 @@ test -- +com.mycila -license-maven-plugin -+ ++ +license-header-check ++ ++ ++ +com.mycila +license-maven-plugin +diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index a3c04154927..79a51815dfe 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@ https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git From cae5b859101a4a25cbfe298675ad2a639b48e2dd Mon Sep 17 00:00:00 2001 From: Nikola KoevskiDate: Fri, 14 Dec 2018 12:32:07 +0100 Subject: [PATCH 105/200] chore(license): remove default license check Related to CAM-9536 --- connect/.ci.cambpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/.ci.cambpm b/connect/.ci.cambpm index 8ca6fc65a02..f202e89eea9 100644 --- a/connect/.ci.cambpm +++ b/connect/.ci.cambpm @@ -1 +1 @@ -buildMavenAndDeployToMavenCentral([jdk:7, licenseCheck:true]) +buildMavenAndDeployToMavenCentral([jdk:7]) From f31d06c649d00194c1de6541b0bb73e951ea9c29 Mon Sep 17 00:00:00 2001 From: Nikola Koevski Date: Wed, 9 Jan 2019 15:26:53 +0100 Subject: [PATCH 106/200] chore(license): re-enable license check Related to CAM-9536 --- connect/.ci.cambpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/.ci.cambpm b/connect/.ci.cambpm index f202e89eea9..8ca6fc65a02 100644 --- a/connect/.ci.cambpm +++ b/connect/.ci.cambpm @@ -1 +1 @@ -buildMavenAndDeployToMavenCentral([jdk:7]) +buildMavenAndDeployToMavenCentral([jdk:7, licenseCheck:true]) From 0732bce504b377078836feecd78a909eb11dccf9 Mon Sep 17 00:00:00 2001 From: Thorben Lindhauer Date: Mon, 28 Jan 2019 11:01:18 +0100 Subject: [PATCH 107/200] chore(project): bump commons version related to CAM-9640 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 24a97636206..fe5df694f7d 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -32,7 +32,7 @@ From 4852b9928b56b735a7fda22e132864a513138ed8 Mon Sep 17 00:00:00 2001 From: camunda-jenkins org.camunda.commons camunda-commons-bom -1.6.1 +1.7.0 import pom Date: Mon, 28 Jan 2019 11:10:36 +0100 Subject: [PATCH 108/200] [maven-release-plugin] prepare release 1.1.2 --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index bd1ee2305f4..4f2a677ad44 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.2.0-SNAPSHOT +1.1.2 camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.1.2 org.camunda.connect camunda-connect-root -1.2.0-SNAPSHOT +1.1.2 camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 9ca25728960..9791f3e2628 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.2.0-SNAPSHOT +1.1.2 camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 85eac81b671..1ac25571215 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.2.0-SNAPSHOT +1.1.2 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index fe5df694f7d..18bc6dbd268 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -119,7 +119,7 @@ org.camunda.connect camunda-connect-bom -1.2.0-SNAPSHOT +1.1.2 bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.1.2 diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 19e7b76184a..6fb64276173 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.2.0-SNAPSHOT +1.1.2 camunda-connect-soap-http-client From 892fdec2e8ce4305641698b02bb093a72b4f5426 Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Mon, 28 Jan 2019 11:10:43 +0100 Subject: [PATCH 109/200] [maven-release-plugin] prepare for next development iteration --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 4f2a677ad44..bd1ee2305f4 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.1.2 +1.2.0-SNAPSHOT camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.1.2 +HEAD diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 79a51815dfe..a3c04154927 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.2 +1.2.0-SNAPSHOT camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 9791f3e2628..9ca25728960 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.2 +1.2.0-SNAPSHOT camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 1ac25571215..85eac81b671 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.1.2 +1.2.0-SNAPSHOT 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index 18bc6dbd268..fe5df694f7d 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -119,7 +119,7 @@ org.camunda.connect camunda-connect-bom -1.1.2 +1.2.0-SNAPSHOT bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.1.2 +HEAD diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 6fb64276173..19e7b76184a 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.2 +1.2.0-SNAPSHOT camunda-connect-soap-http-client From 036c8664670c064c0a845b84681f2cfc6bddb896 Mon Sep 17 00:00:00 2001 From: Thorben LindhauerDate: Mon, 28 Jan 2019 11:15:48 +0100 Subject: [PATCH 110/200] chore(project): bump old connect version to 1.1.2 related to CAM-9640 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index fe5df694f7d..40df5809e88 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -14,7 +14,7 @@ pom - From 7f4a1fe768c4f8fc5deca8f6ba9107230aa213fd Mon Sep 17 00:00:00 2001 From: Nikola Koevski1.1.0 +1.1.2 false Date: Tue, 19 Feb 2019 12:46:35 +0100 Subject: [PATCH 111/200] chore(project): bump httpclient to 4.5.7 Related to CAM-9696 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 40df5809e88..17c4bbe6410 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -40,7 +40,7 @@ org.apache.httpcomponents httpclient -4.3.3 +4.5.7 From b5f6ecee07ca59855689794c66436d2652c4da16 Mon Sep 17 00:00:00 2001 From: Christian Lipphardt Date: Thu, 21 Feb 2019 13:04:50 +0100 Subject: [PATCH 112/200] chore(ci): use maven 3.5 cos of missing bom artifact during upload --- connect/.ci.cambpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/.ci.cambpm b/connect/.ci.cambpm index 8ca6fc65a02..67611a51cbe 100644 --- a/connect/.ci.cambpm +++ b/connect/.ci.cambpm @@ -1 +1 @@ -buildMavenAndDeployToMavenCentral([jdk:7, licenseCheck:true]) +buildMavenAndDeployToMavenCentral([jdk:7, mvn:3.5, licenseCheck:true]) From 96e1d7a48c448db73b6c967f653742a62ca713cc Mon Sep 17 00:00:00 2001 From: Nikola Koevski Date: Fri, 22 Feb 2019 14:12:06 +0100 Subject: [PATCH 113/200] chore(project): set next connect version to 1.1.3 Related to CAM-9614 --- connect/bom/pom.xml | 2 +- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 2 +- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index bd1ee2305f4..5889a43ffa4 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.2.0-SNAPSHOT +1.1.3-SNAPSHOT camunda BPM - connect - bom pom diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index a3c04154927..4288a40cbac 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.2.0-SNAPSHOT +1.1.3-SNAPSHOT camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 9ca25728960..cacea18cdc8 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.2.0-SNAPSHOT +1.1.3-SNAPSHOT camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 85eac81b671..5c8ffd5ae20 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.2.0-SNAPSHOT +1.1.3-SNAPSHOT 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index 17c4bbe6410..31da290d1ad 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 19e7b76184a..2f40d79d1de 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@ org.camunda.connect camunda-connect-bom -1.2.0-SNAPSHOT +1.1.3-SNAPSHOT bom org.camunda.connect camunda-connect-root -1.2.0-SNAPSHOT +1.1.3-SNAPSHOT camunda-connect-soap-http-client From 7ee03e4eb62fb2ffffce8d6160d4a1a465d1154f Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Tue, 26 Feb 2019 17:22:32 +0100 Subject: [PATCH 114/200] [maven-release-plugin] prepare release 1.1.3 --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 5889a43ffa4..2023ef1a6ea 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.1.3-SNAPSHOT +1.1.3 camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.1.3 diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 4288a40cbac..5443f03d8c7 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.3-SNAPSHOT +1.1.3 camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index cacea18cdc8..8d31ed6eaa6 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.3-SNAPSHOT +1.1.3 camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 5c8ffd5ae20..0ed9f5726aa 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.1.3-SNAPSHOT +1.1.3 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index 31da290d1ad..e3704fb8879 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -119,7 +119,7 @@ org.camunda.connect camunda-connect-bom -1.1.3-SNAPSHOT +1.1.3 bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.1.3 diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 2f40d79d1de..39c1975aa12 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.3-SNAPSHOT +1.1.3 camunda-connect-soap-http-client From 6c6dbfe5de0015935d82adba949516829c10b220 Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Tue, 26 Feb 2019 17:22:39 +0100 Subject: [PATCH 115/200] [maven-release-plugin] prepare for next development iteration --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 2023ef1a6ea..c31ee6ed26b 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.1.3 +1.1.4-SNAPSHOT camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.1.3 +HEAD diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 5443f03d8c7..6d935c9e944 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.3 +1.1.4-SNAPSHOT camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 8d31ed6eaa6..252e11e4bf3 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.3 +1.1.4-SNAPSHOT camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 0ed9f5726aa..8706e79f929 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.1.3 +1.1.4-SNAPSHOT 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index e3704fb8879..bdb937eaf36 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -119,7 +119,7 @@ org.camunda.connect camunda-connect-bom -1.1.3 +1.1.4-SNAPSHOT bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.1.3 +HEAD diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 39c1975aa12..dfb1ebf7038 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.3 +1.1.4-SNAPSHOT camunda-connect-soap-http-client From 74ebecbb9902a3d07e6842b4ea0b844e6b031e50 Mon Sep 17 00:00:00 2001 From: Nikola KoevskiDate: Tue, 26 Feb 2019 17:29:58 +0100 Subject: [PATCH 116/200] chore(project): set old version to 1.1.3 Related to CAM-9614 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index bdb937eaf36..37cce8c61b5 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -14,7 +14,7 @@ pom - From 582d1333927fa23bba4d6f602ff02279f7f8fdfa Mon Sep 17 00:00:00 2001 From: Christian Lipphardt1.1.2 +1.1.3 false Date: Thu, 28 Feb 2019 19:09:10 +0100 Subject: [PATCH 117/200] chore(ci): explicitly call jenkins shared library related to #SRE-415 --- connect/.ci.cambpm | 1 + 1 file changed, 1 insertion(+) diff --git a/connect/.ci.cambpm b/connect/.ci.cambpm index 67611a51cbe..33c9d880bd3 100644 --- a/connect/.ci.cambpm +++ b/connect/.ci.cambpm @@ -1 +1,2 @@ +@Library("camunda-ci") _ buildMavenAndDeployToMavenCentral([jdk:7, mvn:3.5, licenseCheck:true]) From 071953501e64a24b3d373db9aa55badcbddf8abf Mon Sep 17 00:00:00 2001 From: Yana Vasileva Date: Mon, 8 Apr 2019 10:50:10 +0200 Subject: [PATCH 118/200] chore(connect): update license headers * update license mention in README * add NOTICE file Related to CAM-10096 --- connect/NOTICE | 3 +++ connect/README.md | 4 ++++ connect/bom/pom.xml | 2 +- .../java/org/camunda/connect/ConnectorException.java | 9 +++++---- .../org/camunda/connect/ConnectorRequestException.java | 9 +++++---- .../org/camunda/connect/ConnectorResponseException.java | 9 +++++---- .../src/main/java/org/camunda/connect/Connectors.java | 9 +++++---- .../connect/impl/AbstractCloseableConnectorResponse.java | 9 +++++---- .../java/org/camunda/connect/impl/AbstractConnector.java | 9 +++++---- .../camunda/connect/impl/AbstractConnectorRequest.java | 9 +++++---- .../camunda/connect/impl/AbstractConnectorResponse.java | 9 +++++---- .../camunda/connect/impl/AbstractRequestInvocation.java | 9 +++++---- .../java/org/camunda/connect/impl/ConnectCoreLogger.java | 9 +++++---- .../java/org/camunda/connect/impl/ConnectLogger.java | 9 +++++---- .../camunda/connect/impl/DebugRequestInterceptor.java | 9 +++++---- .../camunda/connect/spi/CloseableConnectorResponse.java | 9 +++++---- .../src/main/java/org/camunda/connect/spi/Connector.java | 9 +++++---- .../org/camunda/connect/spi/ConnectorConfigurator.java | 9 +++++---- .../org/camunda/connect/spi/ConnectorInvocation.java | 9 +++++---- .../java/org/camunda/connect/spi/ConnectorProvider.java | 9 +++++---- .../java/org/camunda/connect/spi/ConnectorRequest.java | 9 +++++---- .../camunda/connect/spi/ConnectorRequestInterceptor.java | 9 +++++---- .../java/org/camunda/connect/spi/ConnectorResponse.java | 9 +++++---- .../java/org/camunda/connect/dummy/DummyConnector.java | 9 +++++---- .../connect/dummy/DummyConnectorConfigurator.java | 9 +++++---- .../camunda/connect/dummy/DummyConnectorProvider.java | 9 +++++---- .../java/org/camunda/connect/dummy/DummyRequest.java | 9 +++++---- .../java/org/camunda/connect/dummy/DummyResponse.java | 9 +++++---- .../java/org/camunda/connect/dummy/MyHttpConnector.java | 9 +++++---- .../camunda/connect/dummy/MyHttpConnectorProvider.java | 9 +++++---- .../java/org/camunda/connect/spi/ConnectorsTest.java | 9 +++++---- .../org/camunda/connect/httpclient/HttpBaseRequest.java | 9 +++++---- .../org/camunda/connect/httpclient/HttpConnector.java | 9 +++++---- .../connect/httpclient/HttpConnectorProvider.java | 9 +++++---- .../camunda/connect/httpclient/HttpMethodRequest.java | 9 +++++---- .../java/org/camunda/connect/httpclient/HttpRequest.java | 9 +++++---- .../org/camunda/connect/httpclient/HttpResponse.java | 9 +++++---- .../connect/httpclient/impl/AbstractHttpConnector.java | 9 +++++---- .../connect/httpclient/impl/AbstractHttpRequest.java | 9 +++++---- .../connect/httpclient/impl/HttpConnectorImpl.java | 9 +++++---- .../connect/httpclient/impl/HttpConnectorLogger.java | 9 +++++---- .../httpclient/impl/HttpConnectorProviderImpl.java | 9 +++++---- .../org/camunda/connect/httpclient/impl/HttpLogger.java | 9 +++++---- .../camunda/connect/httpclient/impl/HttpRequestImpl.java | 9 +++++---- .../connect/httpclient/impl/HttpRequestInvocation.java | 9 +++++---- .../connect/httpclient/impl/HttpResponseImpl.java | 9 +++++---- .../httpclient/HttpConnectorSystemPropertiesTest.java | 9 +++++---- .../camunda/connect/httpclient/HttpConnectorTest.java | 9 +++++---- .../org/camunda/connect/httpclient/HttpRequestTest.java | 9 +++++---- .../org/camunda/connect/httpclient/HttpResponseTest.java | 9 +++++---- .../org/camunda/connect/httpclient/TestResponse.java | 9 +++++---- .../connect/httpclient/soap/SoapHttpConnector.java | 9 +++++---- .../httpclient/soap/SoapHttpConnectorProvider.java | 9 +++++---- .../camunda/connect/httpclient/soap/SoapHttpRequest.java | 9 +++++---- .../connect/httpclient/soap/SoapHttpResponse.java | 9 +++++---- .../httpclient/soap/impl/SoapHttpConnectorImpl.java | 9 +++++---- .../httpclient/soap/impl/SoapHttpConnectorLogger.java | 9 +++++---- .../soap/impl/SoapHttpConnectorProviderImpl.java | 9 +++++---- .../connect/httpclient/soap/impl/SoapHttpLogger.java | 9 +++++---- .../httpclient/soap/impl/SoapHttpRequestImpl.java | 9 +++++---- .../httpclient/soap/impl/SoapHttpResponseImpl.java | 9 +++++---- .../SoapHttpConnectorSystemPropertiesTest.java | 9 +++++---- .../connect/soap/httpclient/SoapHttpConnectorTest.java | 9 +++++---- .../connect/soap/httpclient/SoapHttpRequestTest.java | 9 +++++---- 64 files changed, 313 insertions(+), 245 deletions(-) create mode 100644 connect/NOTICE diff --git a/connect/NOTICE b/connect/NOTICE new file mode 100644 index 00000000000..a2935ed7f36 --- /dev/null +++ b/connect/NOTICE @@ -0,0 +1,3 @@ +Camunda +Copyright 2014-2019 Camunda Services GmbH + diff --git a/connect/README.md b/connect/README.md index 68f203affe0..1977fcbbb16 100644 --- a/connect/README.md +++ b/connect/README.md @@ -27,6 +27,10 @@ process engine and standalone usage via API. Please see the [official documentat camunda Connect is licensed under the Apache 2.0 License. Check [CONTRIBUTING.md][] for guidelines about how to contribute. +# License: + +The source files in this repository are made available under the Apache License, Version 2.0. + [CONTRIBUTING.md]: https://github.com/camunda/camunda-bpm-platform/blob/master/CONTRIBUTING.md diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index c31ee6ed26b..fa2446df290 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -4,7 +4,7 @@ diff --git a/connect/core/src/main/java/org/camunda/connect/ConnectorException.java b/connect/core/src/main/java/org/camunda/connect/ConnectorException.java index 0ac3f5f5929..400a3ab7bcb 100644 --- a/connect/core/src/main/java/org/camunda/connect/ConnectorException.java +++ b/connect/core/src/main/java/org/camunda/connect/ConnectorException.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/ConnectorRequestException.java b/connect/core/src/main/java/org/camunda/connect/ConnectorRequestException.java index a3a47ff164a..f1609604946 100644 --- a/connect/core/src/main/java/org/camunda/connect/ConnectorRequestException.java +++ b/connect/core/src/main/java/org/camunda/connect/ConnectorRequestException.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/ConnectorResponseException.java b/connect/core/src/main/java/org/camunda/connect/ConnectorResponseException.java index a8e92037055..beba0392b4e 100644 --- a/connect/core/src/main/java/org/camunda/connect/ConnectorResponseException.java +++ b/connect/core/src/main/java/org/camunda/connect/ConnectorResponseException.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/Connectors.java b/connect/core/src/main/java/org/camunda/connect/Connectors.java index dfcaeab9d13..e458fca7907 100644 --- a/connect/core/src/main/java/org/camunda/connect/Connectors.java +++ b/connect/core/src/main/java/org/camunda/connect/Connectors.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/impl/AbstractCloseableConnectorResponse.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractCloseableConnectorResponse.java index ecdccd4351c..63824151496 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/AbstractCloseableConnectorResponse.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractCloseableConnectorResponse.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnector.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnector.java index 5c463306e19..920e8693c77 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnector.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnector.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorRequest.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorRequest.java index c81c4236d44..ccbd6e288b4 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorRequest.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorRequest.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorResponse.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorResponse.java index 3edef418c11..7171a8beccd 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorResponse.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractConnectorResponse.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/impl/AbstractRequestInvocation.java b/connect/core/src/main/java/org/camunda/connect/impl/AbstractRequestInvocation.java index 4cc32c74b67..215ccdc2154 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/AbstractRequestInvocation.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/AbstractRequestInvocation.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/impl/ConnectCoreLogger.java b/connect/core/src/main/java/org/camunda/connect/impl/ConnectCoreLogger.java index cf0f9518225..5ed2ce094c1 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/ConnectCoreLogger.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/ConnectCoreLogger.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/impl/ConnectLogger.java b/connect/core/src/main/java/org/camunda/connect/impl/ConnectLogger.java index 1fef234ff2c..de6cf0be427 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/ConnectLogger.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/ConnectLogger.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/impl/DebugRequestInterceptor.java b/connect/core/src/main/java/org/camunda/connect/impl/DebugRequestInterceptor.java index d26b1f237f7..3a536611058 100644 --- a/connect/core/src/main/java/org/camunda/connect/impl/DebugRequestInterceptor.java +++ b/connect/core/src/main/java/org/camunda/connect/impl/DebugRequestInterceptor.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/spi/CloseableConnectorResponse.java b/connect/core/src/main/java/org/camunda/connect/spi/CloseableConnectorResponse.java index fb84f4923c6..35131b9a252 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/CloseableConnectorResponse.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/CloseableConnectorResponse.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/spi/Connector.java b/connect/core/src/main/java/org/camunda/connect/spi/Connector.java index da81baaa138..e46ea9ca07a 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/Connector.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/Connector.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorConfigurator.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorConfigurator.java index cc0f911c3b5..f81e18db409 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorConfigurator.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorConfigurator.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorInvocation.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorInvocation.java index 65610468d7e..84492f537e2 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorInvocation.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorInvocation.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorProvider.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorProvider.java index 4b0019003d8..0c759639a2c 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorProvider.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorProvider.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequest.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequest.java index f16df7c39fe..63130e48599 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequest.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequest.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequestInterceptor.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequestInterceptor.java index 4f0d3f09933..9bb08180573 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequestInterceptor.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorRequestInterceptor.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorResponse.java b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorResponse.java index 49d004be331..9dec7e15d10 100644 --- a/connect/core/src/main/java/org/camunda/connect/spi/ConnectorResponse.java +++ b/connect/core/src/main/java/org/camunda/connect/spi/ConnectorResponse.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnector.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnector.java index 19aef66423d..bf7ad90a430 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnector.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnector.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorConfigurator.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorConfigurator.java index e5035114a21..47756572205 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorConfigurator.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorConfigurator.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorProvider.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorProvider.java index 7d5a057191c..7205a467cc6 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorProvider.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyConnectorProvider.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/DummyRequest.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyRequest.java index 51cceb68ef2..247baea7489 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/DummyRequest.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyRequest.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/DummyResponse.java b/connect/core/src/test/java/org/camunda/connect/dummy/DummyResponse.java index df85e99c0d2..57dbfa61002 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/DummyResponse.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/DummyResponse.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnector.java b/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnector.java index e6be0b18960..e799b9432d9 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnector.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnector.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnectorProvider.java b/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnectorProvider.java index 05d999a61dd..a1b775536ba 100644 --- a/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnectorProvider.java +++ b/connect/core/src/test/java/org/camunda/connect/dummy/MyHttpConnectorProvider.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/core/src/test/java/org/camunda/connect/spi/ConnectorsTest.java b/connect/core/src/test/java/org/camunda/connect/spi/ConnectorsTest.java index 312fb974678..6853218191d 100644 --- a/connect/core/src/test/java/org/camunda/connect/spi/ConnectorsTest.java +++ b/connect/core/src/test/java/org/camunda/connect/spi/ConnectorsTest.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpBaseRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpBaseRequest.java index bd57f0e82f9..45c545f1441 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpBaseRequest.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpBaseRequest.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnector.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnector.java index a3d2f15f65d..54ef03c1084 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnector.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnector.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorProvider.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorProvider.java index 7febc9253a1..fc0a0e0d20f 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorProvider.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpConnectorProvider.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpMethodRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpMethodRequest.java index 1fbd6d91c09..c50f30eba52 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpMethodRequest.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpMethodRequest.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpRequest.java index 4abe1c30594..6f564fbc928 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpRequest.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpRequest.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpResponse.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpResponse.java index fdd761591a6..d4772364912 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpResponse.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpResponse.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java index 5a85e1e8c93..3b0a78a5e5c 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java index b02fb8aee43..a7c0a3a5089 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorImpl.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorImpl.java index 16d8822ee25..f5774a1988d 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorImpl.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorImpl.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java index 37dca3dd80a..f02e25c45a9 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorProviderImpl.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorProviderImpl.java index 8a050ade6ed..23e88f9ff1e 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorProviderImpl.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorProviderImpl.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpLogger.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpLogger.java index 158ca7095f4..e6e5ccfaefa 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpLogger.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpLogger.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestImpl.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestImpl.java index 3a2ee088a7b..23bf80e3f24 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestImpl.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestImpl.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestInvocation.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestInvocation.java index ac18f285cb7..dbd82938ce6 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestInvocation.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpRequestInvocation.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpResponseImpl.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpResponseImpl.java index b94e270eaf9..cfa50aa562a 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpResponseImpl.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpResponseImpl.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorSystemPropertiesTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorSystemPropertiesTest.java index 49d0551d0c5..6511f94fdae 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorSystemPropertiesTest.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorSystemPropertiesTest.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java index f35cbe1ae5e..79040343a64 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpConnectorTest.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java index bfb4f9c062b..63f46c09e40 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java index acc9f128ee8..a9664e62066 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/TestResponse.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/TestResponse.java index 7e086d0b2a6..07641d0cec0 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/TestResponse.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/TestResponse.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnector.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnector.java index df187a0e99c..8394f90e2d3 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnector.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnector.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnectorProvider.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnectorProvider.java index 6711845946d..5ea87a54770 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnectorProvider.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpConnectorProvider.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpRequest.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpRequest.java index a4e98a2b429..c4587dec7ab 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpRequest.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpRequest.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpResponse.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpResponse.java index 3a182b90e54..db3d7c054a9 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpResponse.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/SoapHttpResponse.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorImpl.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorImpl.java index 9f0e5351e7a..446dfaea1aa 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorImpl.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorImpl.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorLogger.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorLogger.java index 2341670c08d..d158cf6f0d0 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorLogger.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorLogger.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorProviderImpl.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorProviderImpl.java index f16a8b87135..9d44c583c9c 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorProviderImpl.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpConnectorProviderImpl.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpLogger.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpLogger.java index 82b936bed45..d28018b56d4 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpLogger.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpLogger.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpRequestImpl.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpRequestImpl.java index 47dbf77e8d8..9ccf32e1a32 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpRequestImpl.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpRequestImpl.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpResponseImpl.java b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpResponseImpl.java index 3fff4af390c..8067f000f95 100644 --- a/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpResponseImpl.java +++ b/connect/soap-http-client/src/main/java/org/camunda/connect/httpclient/soap/impl/SoapHttpResponseImpl.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorSystemPropertiesTest.java b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorSystemPropertiesTest.java index b9ae1f46232..4981b09fcbb 100644 --- a/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorSystemPropertiesTest.java +++ b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorSystemPropertiesTest.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorTest.java b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorTest.java index e71176ad614..bcde688fd18 100644 --- a/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorTest.java +++ b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpConnectorTest.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 diff --git a/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpRequestTest.java b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpRequestTest.java index 2b7ae134fed..e1ef43e77fa 100644 --- a/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpRequestTest.java +++ b/connect/soap-http-client/src/test/java/org/camunda/connect/soap/httpclient/SoapHttpRequestTest.java @@ -1,8 +1,9 @@ /* - * Copyright © 2014-2018 camunda services GmbH and various authors (info@camunda.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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 From 6b7d6d481ada3ee857aad087d67ed21fd9827973 Mon Sep 17 00:00:00 2001 From: yanavasileva org.camunda camunda-release-parent -3.2 +3.3 Date: Wed, 10 Apr 2019 14:41:33 +0200 Subject: [PATCH 119/200] chore(license): remove APPENDIX Related to CAM-10110 --- connect/LICENSE | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/connect/LICENSE b/connect/LICENSE index ad410e11302..d0381d6d04c 100644 --- a/connect/LICENSE +++ b/connect/LICENSE @@ -174,28 +174,3 @@ Apache License of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - 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. \ No newline at end of file From c190d770c066c3285b6e506075e8c99157191935 Mon Sep 17 00:00:00 2001 From: Thorben Lindhauer Date: Fri, 26 Apr 2019 11:37:50 +0200 Subject: [PATCH 120/200] chore(project): bump commons dependency to 1.7.1 related to CAM-9615 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 37cce8c61b5..fdd6e0c6849 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -32,7 +32,7 @@ From e16ffcdd98846dc47a2d0607aae4761973ab68e8 Mon Sep 17 00:00:00 2001 From: camunda-jenkins org.camunda.commons camunda-commons-bom -1.7.0 +1.7.1 import pom Date: Fri, 26 Apr 2019 11:47:38 +0200 Subject: [PATCH 121/200] [maven-release-plugin] prepare release 1.1.4 --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index fa2446df290..6d6e8ea5e14 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.1.4-SNAPSHOT +1.1.4 camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.1.4 diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 6d935c9e944..2e7cfa5f318 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.4-SNAPSHOT +1.1.4 camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 252e11e4bf3..1e5472b82d9 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.4-SNAPSHOT +1.1.4 camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 8706e79f929..14ed2582d8a 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.1.4-SNAPSHOT +1.1.4 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index fdd6e0c6849..1370606e3f8 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -119,7 +119,7 @@ org.camunda.connect camunda-connect-bom -1.1.4-SNAPSHOT +1.1.4 bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.1.4 diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index dfb1ebf7038..e62af11ba49 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.4-SNAPSHOT +1.1.4 camunda-connect-soap-http-client From e674d1b7cb6f528d74faf3b427e39a6fb2a017db Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Fri, 26 Apr 2019 11:47:44 +0200 Subject: [PATCH 122/200] [maven-release-plugin] prepare for next development iteration --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 6d6e8ea5e14..465bd2352d6 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.1.4 +1.1.5-SNAPSHOT camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.1.4 +HEAD diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 2e7cfa5f318..d4f37470fc5 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.4 +1.1.5-SNAPSHOT camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 1e5472b82d9..119939b54ba 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.4 +1.1.5-SNAPSHOT camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 14ed2582d8a..74da0064302 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.1.4 +1.1.5-SNAPSHOT 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index 1370606e3f8..b89d787472b 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -119,7 +119,7 @@ org.camunda.connect camunda-connect-bom -1.1.4 +1.1.5-SNAPSHOT bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.1.4 +HEAD diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index e62af11ba49..05894993e26 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.4 +1.1.5-SNAPSHOT camunda-connect-soap-http-client From 17739486cf24fb0767f541f35950942fe565a516 Mon Sep 17 00:00:00 2001 From: Thorben LindhauerDate: Fri, 26 Apr 2019 11:49:41 +0200 Subject: [PATCH 123/200] chore(project): set old version to 1.1.4 related to CAM-9615 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index b89d787472b..564dcf9181d 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -14,7 +14,7 @@ pom - From 5e824708df54a3250f25c5caa5abea9521c4b4a9 Mon Sep 17 00:00:00 2001 From: Yana Vasileva1.1.3 +1.1.4 false Date: Fri, 19 Jul 2019 08:04:13 +0200 Subject: [PATCH 124/200] chore(pom): switch to bpm-release-parent Related to CAM-10528 --- connect/bom/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 465bd2352d6..5e98ad7d095 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -3,8 +3,8 @@ From 6c81b733a66194f82553adca3060b4dad5ac4651 Mon Sep 17 00:00:00 2001 From: Yana Vasileva org.camunda -camunda-release-parent -3.3 +camunda-bpm-release-parent +0.2 Date: Fri, 19 Jul 2019 08:05:33 +0200 Subject: [PATCH 125/200] chore(pom): bump commons to 1.8.0 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 564dcf9181d..73a7d85db8f 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -32,7 +32,7 @@ From de68e7b5c4d0f6ab37a6434d0db0c5eaad030f9a Mon Sep 17 00:00:00 2001 From: camunda-jenkins org.camunda.commons camunda-commons-bom -1.7.1 +1.8.0 import pom Date: Thu, 25 Jul 2019 11:05:29 +0200 Subject: [PATCH 126/200] [maven-release-plugin] prepare release 1.2.0 --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 5e98ad7d095..2cd0e5c5caf 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.1.5-SNAPSHOT +1.2.0 camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.2.0 diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index d4f37470fc5..ae93d5dccbd 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.5-SNAPSHOT +1.2.0 camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 119939b54ba..173563590f6 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.5-SNAPSHOT +1.2.0 camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 74da0064302..e8101b11f56 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.1.5-SNAPSHOT +1.2.0 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index 73a7d85db8f..a6261e37469 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -119,7 +119,7 @@ org.camunda.connect camunda-connect-bom -1.1.5-SNAPSHOT +1.2.0 bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.2.0 diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 05894993e26..2e39dcfa4b1 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.1.5-SNAPSHOT +1.2.0 camunda-connect-soap-http-client From 2ddc8abd248cf744ee3c10fdac6ca76ed7d90bc3 Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Thu, 25 Jul 2019 11:05:36 +0200 Subject: [PATCH 127/200] [maven-release-plugin] prepare for next development iteration --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 2cd0e5c5caf..f518cf2e38b 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.2.0 +1.3.0-SNAPSHOT camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.2.0 +HEAD diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index ae93d5dccbd..03096e00abf 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.2.0 +1.3.0-SNAPSHOT camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 173563590f6..7c7b81d608f 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.2.0 +1.3.0-SNAPSHOT camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index e8101b11f56..480ff43aa5b 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.2.0 +1.3.0-SNAPSHOT 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index a6261e37469..ac6f152047d 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -119,7 +119,7 @@ org.camunda.connect camunda-connect-bom -1.2.0 +1.3.0-SNAPSHOT bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.2.0 +HEAD diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 2e39dcfa4b1..bbf9601d76e 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.2.0 +1.3.0-SNAPSHOT camunda-connect-soap-http-client From 1be5c518b54dca6cd017673bacf2f396a827b9e1 Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Thu, 25 Jul 2019 11:10:32 +0200 Subject: [PATCH 128/200] chore(test): adjust old version for backward compatibility test after release --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index ac6f152047d..369b648c1fb 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -14,7 +14,7 @@ pom - From 86515823ddbe4a92e5ad3cd7a2aa13ed4e5ae438 Mon Sep 17 00:00:00 2001 From: Miklas Boskamp1.1.4 +1.2.0 false Date: Tue, 6 Aug 2019 09:09:15 +0200 Subject: [PATCH 129/200] chore(dependency): Bump httpclient dependency to 4.5.9 Related to CAM-10711 PR (#19) --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 369b648c1fb..fe59d0afd76 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -40,7 +40,7 @@ org.apache.httpcomponents httpclient -4.5.7 +4.5.9 From 650b780e7bb0b367fd953c4700162eb57b4ba8ac Mon Sep 17 00:00:00 2001 From: camunda-jenkins Date: Thu, 15 Aug 2019 08:22:10 +0200 Subject: [PATCH 130/200] [maven-release-plugin] prepare release 1.2.1 --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index f518cf2e38b..144c6e50e5d 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.3.0-SNAPSHOT +1.2.1 camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.2.1 diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 03096e00abf..5ee4574124f 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.3.0-SNAPSHOT +1.2.1 camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 7c7b81d608f..35de38cf76e 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.3.0-SNAPSHOT +1.2.1 camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 480ff43aa5b..1b6b9009929 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.3.0-SNAPSHOT +1.2.1 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index fe59d0afd76..442145feedd 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -119,7 +119,7 @@ org.camunda.connect camunda-connect-bom -1.3.0-SNAPSHOT +1.2.1 bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.2.1 diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index bbf9601d76e..855fb4d6398 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.3.0-SNAPSHOT +1.2.1 camunda-connect-soap-http-client From 1e53fcb8749d2e660cc324d8a221da37af50f854 Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Thu, 15 Aug 2019 08:22:16 +0200 Subject: [PATCH 131/200] [maven-release-plugin] prepare for next development iteration --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 144c6e50e5d..f518cf2e38b 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.2.1 +1.3.0-SNAPSHOT camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.2.1 +HEAD diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 5ee4574124f..03096e00abf 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.2.1 +1.3.0-SNAPSHOT camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 35de38cf76e..7c7b81d608f 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.2.1 +1.3.0-SNAPSHOT camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 1b6b9009929..480ff43aa5b 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.2.1 +1.3.0-SNAPSHOT 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index 442145feedd..fe59d0afd76 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -119,7 +119,7 @@ org.camunda.connect camunda-connect-bom -1.2.1 +1.3.0-SNAPSHOT bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.2.1 +HEAD diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 855fb4d6398..bbf9601d76e 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.2.1 +1.3.0-SNAPSHOT camunda-connect-soap-http-client From ba2ab217fab9ea0540cc078420a2dfc40acef511 Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Thu, 15 Aug 2019 08:24:21 +0200 Subject: [PATCH 132/200] chore(test): adjust old version for backward compatibility test after release --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index fe59d0afd76..9cd333ed90d 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -14,7 +14,7 @@ pom - From dac29cf164eeecb072017a3788e0f8afcee1276b Mon Sep 17 00:00:00 2001 From: Yana Vasileva1.2.0 +1.2.1 false Date: Tue, 10 Sep 2019 14:48:08 +0200 Subject: [PATCH 133/200] chore(build): enable publishZipArtifactToCamundaOrg Related to CAM-10776 --- connect/.ci.cambpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/.ci.cambpm b/connect/.ci.cambpm index 33c9d880bd3..b9c4c7e4fd3 100644 --- a/connect/.ci.cambpm +++ b/connect/.ci.cambpm @@ -1,2 +1,2 @@ @Library("camunda-ci") _ -buildMavenAndDeployToMavenCentral([jdk:7, mvn:3.5, licenseCheck:true]) +buildMavenAndDeployToMavenCentral([jdk:7, mvn:3.5, licenseCheck:true, publishZipArtifactToCamundaOrg:true]) From ea7f6ff3128e83074742babab8b922befc0928cd Mon Sep 17 00:00:00 2001 From: Tassilo Weidner Date: Thu, 17 Oct 2019 09:56:34 +0200 Subject: [PATCH 134/200] chore(bom): update release-parent version to 1.0.0 related to CAM-10891 --- connect/bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index f518cf2e38b..36d5fc53102 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -4,7 +4,7 @@ From bb8baf48dded1c84d8245c5d9540cb586da5ef88 Mon Sep 17 00:00:00 2001 From: Tobias Metzke org.camunda camunda-bpm-release-parent -0.2 +1.0.0 Date: Tue, 29 Oct 2019 09:26:56 +0100 Subject: [PATCH 135/200] chore(pom): bump commons to 1.8.2 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 9cd333ed90d..cc57e108867 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -32,7 +32,7 @@ From f8fdcc477aa896e9cd2b48df2b773fe7f0d17a72 Mon Sep 17 00:00:00 2001 From: camunda-jenkins org.camunda.commons camunda-commons-bom -1.8.0 +1.8.2 import pom Date: Tue, 29 Oct 2019 12:48:15 +0100 Subject: [PATCH 136/200] [maven-release-plugin] prepare release 1.2.2 --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 36d5fc53102..37f3d121c02 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.3.0-SNAPSHOT +1.2.2 camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.2.2 diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 03096e00abf..122fd094606 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.3.0-SNAPSHOT +1.2.2 camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 7c7b81d608f..5608cf16cf3 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.3.0-SNAPSHOT +1.2.2 camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 480ff43aa5b..11816f0a244 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.3.0-SNAPSHOT +1.2.2 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index cc57e108867..5ec886654f1 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -119,7 +119,7 @@ org.camunda.connect camunda-connect-bom -1.3.0-SNAPSHOT +1.2.2 bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.2.2 diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index bbf9601d76e..d61346aa709 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.3.0-SNAPSHOT +1.2.2 camunda-connect-soap-http-client From 9115d0b5ba84aa27d48fde796f095de568442e79 Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Tue, 29 Oct 2019 12:48:22 +0100 Subject: [PATCH 137/200] [maven-release-plugin] prepare for next development iteration --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 37f3d121c02..36d5fc53102 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.2.2 +1.3.0-SNAPSHOT camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.2.2 +HEAD diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 122fd094606..03096e00abf 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.2.2 +1.3.0-SNAPSHOT camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 5608cf16cf3..7c7b81d608f 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.2.2 +1.3.0-SNAPSHOT camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 11816f0a244..480ff43aa5b 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.2.2 +1.3.0-SNAPSHOT 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index 5ec886654f1..cc57e108867 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -119,7 +119,7 @@ org.camunda.connect camunda-connect-bom -1.2.2 +1.3.0-SNAPSHOT bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.2.2 +HEAD diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index d61346aa709..bbf9601d76e 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.2.2 +1.3.0-SNAPSHOT camunda-connect-soap-http-client From 0fead6c9b70d5b2ad5e1708131fdee0645a07e23 Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Tue, 29 Oct 2019 12:50:28 +0100 Subject: [PATCH 138/200] chore(test): adjust old version for backward compatibility test after release --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index cc57e108867..7005dd892ee 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -14,7 +14,7 @@ pom - From 60a78c8d3201ba963f73dac95843fe2b965e719d Mon Sep 17 00:00:00 2001 From: Thorben Lindhauer1.2.1 +1.2.2 false Date: Wed, 6 Nov 2019 16:38:44 +0100 Subject: [PATCH 139/200] chore(project): add jira link to PRs related to CAM-11002 --- connect/.github/pr-badge.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 connect/.github/pr-badge.yml diff --git a/connect/.github/pr-badge.yml b/connect/.github/pr-badge.yml new file mode 100644 index 00000000000..b8778fe08c8 --- /dev/null +++ b/connect/.github/pr-badge.yml @@ -0,0 +1,4 @@ +label: "JIRA" +url: "https://app.camunda.com/jira/browse/$issuePrefix" +message: "$issuePrefix" +color: "0052CC" From cbce5e95d45d6470cfce0d293aeda4d6238d1b57 Mon Sep 17 00:00:00 2001 From: Yana Vasileva Date: Mon, 9 Dec 2019 11:37:39 +0100 Subject: [PATCH 140/200] chore(project): move source code level to Java 8 * bump release parent * bump assertj and junit * adjust ci build file Related to CAM-11105 --- connect/.ci.cambpm | 2 +- connect/bom/pom.xml | 2 +- connect/pom.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/connect/.ci.cambpm b/connect/.ci.cambpm index b9c4c7e4fd3..51506eb6a00 100644 --- a/connect/.ci.cambpm +++ b/connect/.ci.cambpm @@ -1,2 +1,2 @@ @Library("camunda-ci") _ -buildMavenAndDeployToMavenCentral([jdk:7, mvn:3.5, licenseCheck:true, publishZipArtifactToCamundaOrg:true]) +buildMavenAndDeployToMavenCentral([jdk:8, mvn:3.5, licenseCheck:true, publishZipArtifactToCamundaOrg:true]) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 36d5fc53102..b19ac45c1ba 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -4,7 +4,7 @@ diff --git a/connect/pom.xml b/connect/pom.xml index 7005dd892ee..07a8efef33f 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -32,7 +32,7 @@ org.camunda camunda-bpm-release-parent -1.0.0 +1.1.0-SNAPSHOT @@ -46,13 +46,13 @@ org.camunda.commons camunda-commons-bom -1.8.2 +1.9.0-SNAPSHOT import pom junit junit -4.11 +4.12 org.assertj assertj-core -1.5.0 +2.9.1 From 0e45e3aac1068ca7f264df4d3ddbc124efd00c41 Mon Sep 17 00:00:00 2001 From: yanavasileva Date: Fri, 20 Dec 2019 11:00:54 +0100 Subject: [PATCH 141/200] chore(platform): bump release parent to 2.0.0 Related to CAM-11105 --- connect/bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index b19ac45c1ba..84eacdcb782 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -4,7 +4,7 @@ From 822711895d119648a51de197dac14eb90d1eccc6 Mon Sep 17 00:00:00 2001 From: yanavasileva org.camunda camunda-bpm-release-parent -1.1.0-SNAPSHOT +2.0.0 Date: Tue, 7 Jan 2020 09:43:35 +0100 Subject: [PATCH 142/200] chore(project): bump commons to 1.9.0 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 07a8efef33f..f8960b6da40 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -32,7 +32,7 @@ From 1fcc5f4c16dc83e60b2b7419ab9c85d465a228f9 Mon Sep 17 00:00:00 2001 From: Yana Vasileva org.camunda.commons camunda-commons-bom -1.9.0-SNAPSHOT +1.9.0 import pom Date: Tue, 7 Jan 2020 10:05:25 +0100 Subject: [PATCH 143/200] chore(project): disable the Java 8 doclint --- connect/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/connect/pom.xml b/connect/pom.xml index f8960b6da40..a70e3778a48 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -16,6 +16,7 @@ 1.2.2 false +-Xdoclint:none From 15f2da626c086ac19c3b32727b7c4caa1afdafbf Mon Sep 17 00:00:00 2001 From: camunda-jenkins Date: Tue, 7 Jan 2020 10:12:39 +0100 Subject: [PATCH 144/200] [maven-release-plugin] prepare release 1.3.0 --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 84eacdcb782..e36f94b4776 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.3.0-SNAPSHOT +1.3.0 camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.3.0 diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 03096e00abf..eb3aebbb503 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.3.0-SNAPSHOT +1.3.0 camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 7c7b81d608f..9b311d89a2f 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.3.0-SNAPSHOT +1.3.0 camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 480ff43aa5b..a0678d7d299 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.3.0-SNAPSHOT +1.3.0 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index a70e3778a48..b6ea6220df0 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -120,7 +120,7 @@ org.camunda.connect camunda-connect-bom -1.3.0-SNAPSHOT +1.3.0 bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.3.0 diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index bbf9601d76e..cefd5773f60 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.3.0-SNAPSHOT +1.3.0 camunda-connect-soap-http-client From b56cf51d6cec9d45be154fa5cf3fbbb9076c65ee Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Tue, 7 Jan 2020 10:12:45 +0100 Subject: [PATCH 145/200] [maven-release-plugin] prepare for next development iteration --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index e36f94b4776..9589c6f67b2 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.3.0 +1.4.0-SNAPSHOT camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.3.0 +HEAD diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index eb3aebbb503..59bfb872ae8 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.3.0 +1.4.0-SNAPSHOT camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 9b311d89a2f..513d456db4a 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.3.0 +1.4.0-SNAPSHOT camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index a0678d7d299..b521187356e 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.3.0 +1.4.0-SNAPSHOT 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index b6ea6220df0..52458c17978 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -120,7 +120,7 @@ org.camunda.connect camunda-connect-bom -1.3.0 +1.4.0-SNAPSHOT bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.3.0 +HEAD diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index cefd5773f60..a37f7acb3c6 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.3.0 +1.4.0-SNAPSHOT camunda-connect-soap-http-client From b1c468fc0b3d6e907f107a9ce275dfd733473f4e Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Tue, 7 Jan 2020 10:15:16 +0100 Subject: [PATCH 146/200] chore(test): adjust old version for backward compatibility test after release --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 52458c17978..babb1369edf 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -14,7 +14,7 @@ pom - From 34a78f13f755c3f00deba5dd6582be36ec0e6e99 Mon Sep 17 00:00:00 2001 From: Thorben Lindhauer1.2.2 +1.3.0 false -Xdoclint:none Date: Thu, 23 Jan 2020 10:59:04 +0100 Subject: [PATCH 147/200] Update NOTICE to 2020 --- connect/NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/NOTICE b/connect/NOTICE index a2935ed7f36..8aa0b8e02e1 100644 --- a/connect/NOTICE +++ b/connect/NOTICE @@ -1,3 +1,3 @@ Camunda -Copyright 2014-2019 Camunda Services GmbH +Copyright 2014-2020 Camunda Services GmbH From 73eba7ce9d85739ce00f63ecf28d3f78bb470887 Mon Sep 17 00:00:00 2001 From: Yana Vasileva Date: Fri, 7 Feb 2020 12:44:49 +0100 Subject: [PATCH 148/200] chore(ci): add javadoc to maven run Related to CAM-11159 --- connect/.ci.cambpm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/connect/.ci.cambpm b/connect/.ci.cambpm index 51506eb6a00..2ba22af26f8 100644 --- a/connect/.ci.cambpm +++ b/connect/.ci.cambpm @@ -1,2 +1,8 @@ @Library("camunda-ci") _ -buildMavenAndDeployToMavenCentral([jdk:8, mvn:3.5, licenseCheck:true, publishZipArtifactToCamundaOrg:true]) +buildMavenAndDeployToMavenCentral([ + jdk:8, + mvn:3.5, + additionalMvnGoals:'javadoc:javadoc', + licenseCheck:true, + publishZipArtifactToCamundaOrg:true +]) From db4be4c23ef1fb62ac6cdb5a9cbe8587d482d165 Mon Sep 17 00:00:00 2001 From: Thorben Lindhauer Date: Wed, 1 Apr 2020 14:51:37 +0200 Subject: [PATCH 149/200] chore(project): delete pr badge file --- connect/.github/pr-badge.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 connect/.github/pr-badge.yml diff --git a/connect/.github/pr-badge.yml b/connect/.github/pr-badge.yml deleted file mode 100644 index b8778fe08c8..00000000000 --- a/connect/.github/pr-badge.yml +++ /dev/null @@ -1,4 +0,0 @@ -label: "JIRA" -url: "https://app.camunda.com/jira/browse/$issuePrefix" -message: "$issuePrefix" -color: "0052CC" From 7c1ce94795c4feb77825c390c8022a394019926d Mon Sep 17 00:00:00 2001 From: Thorben Lindhauer Date: Thu, 23 Apr 2020 10:02:51 +0200 Subject: [PATCH 150/200] chore(project): generate dependency BOM for connectors-all - needed for license book as we shade JARs into this artifact related to CAM-10419 --- connect/bom/pom.xml | 2 +- connect/connectors-all/pom.xml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 9589c6f67b2..04465847025 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -4,7 +4,7 @@ diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 59bfb872ae8..f95af63dd67 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -10,6 +10,12 @@ org.camunda camunda-bpm-release-parent -2.0.0 +2.1.0-SNAPSHOT camunda-connect-connectors-all camunda BPM - connect - all connectors in one ++ + +false +From 5a56ef0019e40e4f36d38239e7ec3610b2953b28 Mon Sep 17 00:00:00 2001 From: Thorben Lindhauer +Date: Thu, 30 Apr 2020 10:07:52 +0200 Subject: [PATCH 151/200] chore(project): update to latest release parent related to CAM-10419 --- connect/bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 04465847025..db26b82210c 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -4,7 +4,7 @@ From 1beaf5f2dcb1d85b18a69fe0544437d49646d8e8 Mon Sep 17 00:00:00 2001 From: camunda-jenkins org.camunda camunda-bpm-release-parent -2.1.0-SNAPSHOT +2.1.0 Date: Thu, 30 Apr 2020 10:23:30 +0200 Subject: [PATCH 152/200] [maven-release-plugin] prepare release 1.4.0 --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index db26b82210c..1151d995c5e 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.4.0-SNAPSHOT +1.4.0 camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.4.0 diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index f95af63dd67..b4e17512c62 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.4.0-SNAPSHOT +1.4.0 camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 513d456db4a..5cb6a7840e3 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.4.0-SNAPSHOT +1.4.0 camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index b521187356e..ddfc0322b2d 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.4.0-SNAPSHOT +1.4.0 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index babb1369edf..7bc212472e9 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -120,7 +120,7 @@ org.camunda.connect camunda-connect-bom -1.4.0-SNAPSHOT +1.4.0 bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.4.0 diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index a37f7acb3c6..c63b496aa73 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.4.0-SNAPSHOT +1.4.0 camunda-connect-soap-http-client From a2523ea954439b83a3afd7f7f4dc11fbedae3739 Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Thu, 30 Apr 2020 10:23:40 +0200 Subject: [PATCH 153/200] [maven-release-plugin] prepare for next development iteration --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 1151d995c5e..1be47cfb445 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.4.0 +1.5.0-SNAPSHOT camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.4.0 +HEAD diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index b4e17512c62..4e1167aae62 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.4.0 +1.5.0-SNAPSHOT camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 5cb6a7840e3..3aa19b79cfe 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.4.0 +1.5.0-SNAPSHOT camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index ddfc0322b2d..4eb1299a6f1 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.4.0 +1.5.0-SNAPSHOT 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index 7bc212472e9..0af2f0f8fb1 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -120,7 +120,7 @@ org.camunda.connect camunda-connect-bom -1.4.0 +1.5.0-SNAPSHOT bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.4.0 +HEAD diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index c63b496aa73..c2e9f6463fa 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.4.0 +1.5.0-SNAPSHOT camunda-connect-soap-http-client From 0c39f87858581d72da9fff526a15db91a7e03093 Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Thu, 30 Apr 2020 10:29:48 +0200 Subject: [PATCH 154/200] chore(test): adjust old version for backward compatibility test after release --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 0af2f0f8fb1..24c1fa36ca2 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -14,7 +14,7 @@ pom - From 03bd872d4d2eafe9469da82bc8fcbc57403b4e8f Mon Sep 17 00:00:00 2001 From: Martin Stamm1.3.0 +1.4.0 false -Xdoclint:none Date: Mon, 13 Jul 2020 15:04:25 +0200 Subject: [PATCH 155/200] chore(community): add github action related to CAMTEAM-82 --- connect/.github/workflows/main.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 connect/.github/workflows/main.yml diff --git a/connect/.github/workflows/main.yml b/connect/.github/workflows/main.yml new file mode 100644 index 00000000000..6c6799a025f --- /dev/null +++ b/connect/.github/workflows/main.yml @@ -0,0 +1,13 @@ +on: + pull_request: + types: [opened] + +jobs: + comment_job: + runs-on: ubuntu-latest + name: Label Pull requests + steps: + - name: Comment + uses: camunda/camunda-comment-action@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From c24486f3422349b10f458af7bea065d2cae9018e Mon Sep 17 00:00:00 2001 From: Thorben Lindhauer Date: Tue, 4 Aug 2020 14:11:15 +0200 Subject: [PATCH 156/200] chore(project): bump release parent 2.2.0 - consumes updated maven-shade-plugin configuration so that third-party NOTICE files are concatenated related to CAM-12182 --- connect/bom/pom.xml | 2 +- connect/connectors-all/pom.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 1be47cfb445..020bd637b71 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -4,7 +4,7 @@ diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 4e1167aae62..c66e85acb26 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -35,7 +35,6 @@ org.camunda camunda-bpm-release-parent -2.1.0 +2.2.0 org.apache.maven.plugins maven-shade-plugin -2.3 package From 78c8f1cb2f0029ae12d1a6563100ce5089d80e55 Mon Sep 17 00:00:00 2001 From: Thorben LindhauerDate: Fri, 14 Aug 2020 16:53:56 +0200 Subject: [PATCH 157/200] chore(readme): reference platform contribution guide related to CAM-12288 --- connect/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connect/README.md b/connect/README.md index 1977fcbbb16..d9977d3a9a8 100644 --- a/connect/README.md +++ b/connect/README.md @@ -24,8 +24,8 @@ process engine and standalone usage via API. Please see the [official documentat # Contributing -camunda Connect is licensed under the Apache 2.0 License. Check [CONTRIBUTING.md][] -for guidelines about how to contribute. +Have a look at our [contribution guide](https://github.com/camunda/camunda-bpm-platform/blob/master/CONTRIBUTING.md) for how to contribute to this repository. + # License: From ec7f63fecfa6b6765c8a438c40688c2b064d5e0f Mon Sep 17 00:00:00 2001 From: Thorben Lindhauer Date: Thu, 20 Aug 2020 18:01:39 +0200 Subject: [PATCH 158/200] chore(project): bump release parent to 2.2.1 related to CAM-12182 --- connect/bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 020bd637b71..dfbe8ee945b 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -4,7 +4,7 @@ From 5dae49ccb45d64caac5f0109fcd805cd554b1c7e Mon Sep 17 00:00:00 2001 From: Yana Vasileva org.camunda camunda-bpm-release-parent -2.2.0 +2.2.1 Date: Thu, 17 Sep 2020 17:00:48 +0200 Subject: [PATCH 159/200] feat(connect): extend request with configuration options Related to CAM-12458 --- connect/README.md | 8 +- connect/http-client/pom.xml | 7 + .../connect/httpclient/HttpBaseRequest.java | 21 + .../impl/AbstractHttpConnector.java | 15 + .../httpclient/impl/AbstractHttpRequest.java | 29 ++ .../httpclient/impl/HttpConnectorLogger.java | 8 + .../httpclient/impl/RequestConfigOption.java | 147 ++++++ .../httpclient/impl/util/ParseUtil.java | 42 ++ .../httpclient/HttpRequestConfigTest.java | 473 ++++++++++++++++++ .../connect/httpclient/HttpRequestTest.java | 31 ++ 10 files changed, 777 insertions(+), 4 deletions(-) create mode 100644 connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/RequestConfigOption.java create mode 100644 connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/util/ParseUtil.java create mode 100644 connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestConfigTest.java diff --git a/connect/README.md b/connect/README.md index d9977d3a9a8..dbacf64223d 100644 --- a/connect/README.md +++ b/connect/README.md @@ -2,10 +2,10 @@ camunda-connect =============== - Home | - Documentation | - Forum | - Issues | + Home | + Documentation | + Forum | + Issues | License | Contribute
diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 4eb1299a6f1..6983c54edc0 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -49,6 +49,13 @@test + +org.mockito +mockito-core +1.9.5 +test +diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpBaseRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpBaseRequest.java index 45c545f1441..945572987f0 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpBaseRequest.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/HttpBaseRequest.java @@ -29,6 +29,8 @@ public interface HttpBaseRequest , R extends Conn String PARAM_NAME_REQUEST_PAYLOAD = "payload"; String HEADER_CONTENT_TYPE = "Content-Type"; + String PARAM_NAME_REQUEST_CONFIG = "request-config"; + /** * Set the url of this request. * @@ -99,4 +101,23 @@ public interface HttpBaseRequest, R extends Conn * @return the method of this request or null if not set */ String getMethod(); + + /** + * @return the HTTP configuration options of this request or null if non set + */ + MapgetConfigOptions(); + + /** + * @return the HTTP configuration option value of this request or null if non set + */ + Object getConfigOption(String field); + + /** + * Set a HTTP request configuration option for this request. + * + * @param field HTTP request configuration name + * @param value HTTP request configuration value + * @return this request + */ + Q configOption(String field, Object value); } diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java index 3b0a78a5e5c..7b1f7ae276c 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java @@ -20,6 +20,8 @@ import java.nio.charset.Charset; import java.util.Map; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.config.RequestConfig.Builder; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpDelete; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; @@ -36,6 +38,7 @@ import org.apache.http.impl.client.HttpClients; import org.camunda.connect.httpclient.HttpBaseRequest; import org.camunda.connect.httpclient.HttpResponse; +import org.camunda.connect.httpclient.impl.util.ParseUtil; import org.camunda.connect.impl.AbstractConnector; public abstract class AbstractHttpConnector , R extends HttpResponse> extends AbstractConnector{ @@ -91,6 +94,8 @@ public R execute(Q request) { protectedT createHttpRequest(Q request) { T httpRequest = createHttpRequestBase(request); + applyConfig(httpRequest, request.getConfigOptions()); + applyHeaders(httpRequest, request.getHeaders()); applyPayload(httpRequest, request); @@ -155,4 +160,14 @@ protected boolean httpMethodSupportsPayload(T httpRe return httpRequest instanceof HttpEntityEnclosingRequestBase; } + protected void applyConfig(T httpRequest, Map configOptions) { + Builder configBuilder = RequestConfig.custom(); + if (configOptions != null && !configOptions.isEmpty()) { + ParseUtil.parseConfigOptions(configOptions, configBuilder); + } + RequestConfig requestConfig = configBuilder.build(); + httpRequest.setConfig(requestConfig); + } + + } diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java index a7c0a3a5089..51db6c762cb 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpRequest.java @@ -142,4 +142,33 @@ public Q trace() { return method(HttpTrace.METHOD_NAME); } + + public Map getConfigOptions() { + return getRequestParameter(HttpBaseRequest.PARAM_NAME_REQUEST_CONFIG); + } + + public Object getConfigOption(String field) { + Map config = getConfigOptions(); + if (config != null) { + return config.get(field); + } + return null; + } + + @SuppressWarnings("unchecked") + public Q configOption(String field, Object value) { + if (field == null || field.isEmpty() || value == null) { + LOG.ignoreConfig(field, value); + } else { + Map config = getConfigOptions(); + + if (config == null) { + config = new HashMap (); + setRequestParameter(HttpBaseRequest.PARAM_NAME_REQUEST_CONFIG, config); + } + config.put(field, value); + } + + return (Q) this; + } } diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java index f02e25c45a9..8cd9a75e6d2 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java @@ -51,4 +51,12 @@ public ConnectorRequestException unableToExecuteRequest(Exception cause) { return new ConnectorRequestException(exceptionMessage("007", "Unable to execute HTTP request"), cause); } + public ConnectorRequestException invalidConfigurationOption(String optionName, Exception cause) { + return new ConnectorRequestException(exceptionMessage("008", "Invalid value for request configuration option: {}", optionName), cause); + } + + public void ignoreConfig(String field, Object value) { + logInfo("009", "Ignoring request configuration option with name '{}' and value '{}'", field, value); + } + } diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/RequestConfigOption.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/RequestConfigOption.java new file mode 100644 index 00000000000..ad813ffd2ae --- /dev/null +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/RequestConfigOption.java @@ -0,0 +1,147 @@ +/* + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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.camunda.connect.httpclient.impl; + +import java.net.InetAddress; +import java.util.Collection; + +import org.apache.http.HttpHost; +import org.apache.http.client.config.RequestConfig.Builder; + +public enum RequestConfigOption { + + AUTHENTICATION_ENABLED("authentication-enabled") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setAuthenticationEnabled((boolean) value); + } + }, + CIRCULAR_REDIRECTS_ALLOWED("circular-redirects-allowed") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setCircularRedirectsAllowed((boolean) value); + } + }, + CONNECTION_TIMEOUT("connection-timeout") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setConnectTimeout((int) value); + } + }, + CONNECTION_REQUEST_TIMEOUT("connection-request-timeout") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setConnectionRequestTimeout((int) value); + } + }, + CONTENT_COMPRESSION_ENABLED("content-compression-enabled") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setContentCompressionEnabled((boolean) value); + } + }, + COOKIE_SPEC("cookie-spec") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setCookieSpec((String) value); + } + }, + DECOMPRESSION_ENABLED("decompression-enabled") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setDecompressionEnabled((boolean) value); + } + }, + EXPECT_CONTINUE_ENABLED("expect-continue-enabled") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setExpectContinueEnabled((boolean) value); + } + }, + LOCAL_ADDRESS("local-address") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setLocalAddress((InetAddress) value); + } + }, + MAX_REDIRECTS("max-redirects") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setMaxRedirects((int) value); + } + }, + NORMALIZE_URI("normalize-uri") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setNormalizeUri((boolean) value); + } + }, + PROXY("proxy") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setProxy((HttpHost) value); + } + }, + PROXY_PREFERRED_AUTH_SCHEMES("proxy-preferred-auth-scheme") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setProxyPreferredAuthSchemes((Collection ) value); + } + }, + REDIRECTS_ENABLED("relative-redirects-allowed") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setRedirectsEnabled((boolean) value); + } + }, + RELATIVE_REDIRECTS_ALLOWED("relative-redirects-allowed") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setRelativeRedirectsAllowed((boolean) value); + } + }, + SOCKET_TIMEOUT("socket-timeout") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setSocketTimeout((int) value); + } + }, + STALE_CONNECTION_CHECK_ENABLED("stale-connection-check-enabled") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setStaleConnectionCheckEnabled((boolean) value); + } + }, + TARGET_PREFERRED_AUTH_SCHEMES("target-preferred-auth-schemes") { + @Override + public void apply(Builder configBuilder, Object value) { + configBuilder.setTargetPreferredAuthSchemes((Collection ) value); + } + }; + + private String name; + + private RequestConfigOption(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public abstract void apply(Builder configBuilder, Object value); +} diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/util/ParseUtil.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/util/ParseUtil.java new file mode 100644 index 00000000000..9cd0293de55 --- /dev/null +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/util/ParseUtil.java @@ -0,0 +1,42 @@ +/* + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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.camunda.connect.httpclient.impl.util; + +import java.util.Map; + +import org.apache.http.client.config.RequestConfig.Builder; +import org.camunda.connect.httpclient.impl.RequestConfigOption; +import org.camunda.connect.httpclient.impl.HttpConnectorLogger; +import org.camunda.connect.httpclient.impl.HttpLogger; + +public class ParseUtil { + + protected static HttpConnectorLogger LOG = HttpLogger.HTTP_LOGGER; + + public static void parseConfigOptions(Map configOptions, Builder configBuilder) { + for (RequestConfigOption option : RequestConfigOption.values()) { + try { + if (configOptions.containsKey(option.getName())) { + option.apply(configBuilder, configOptions.get(option.getName())); + } + } catch (ClassCastException e) { + throw LOG.invalidConfigurationOption(option.getName(), e); + } + } + } + +} diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestConfigTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestConfigTest.java new file mode 100644 index 00000000000..fb9607b6040 --- /dev/null +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestConfigTest.java @@ -0,0 +1,473 @@ +/* + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; 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.camunda.connect.httpclient; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.AUTHENTICATION_ENABLED; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.CIRCULAR_REDIRECTS_ALLOWED; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.CONNECTION_REQUEST_TIMEOUT; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.CONNECTION_TIMEOUT; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.CONTENT_COMPRESSION_ENABLED; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.COOKIE_SPEC; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.DECOMPRESSION_ENABLED; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.EXPECT_CONTINUE_ENABLED; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.LOCAL_ADDRESS; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.MAX_REDIRECTS; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.NORMALIZE_URI; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.PROXY; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.PROXY_PREFERRED_AUTH_SCHEMES; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.REDIRECTS_ENABLED; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.RELATIVE_REDIRECTS_ALLOWED; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.SOCKET_TIMEOUT; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.STALE_CONNECTION_CHECK_ENABLED; +import static org.camunda.connect.httpclient.impl.RequestConfigOption.TARGET_PREFERRED_AUTH_SCHEMES; + +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Map; + +import org.apache.http.HttpHost; +import org.apache.http.client.HttpClient; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.config.RequestConfig.Builder; +import org.apache.http.conn.ConnectTimeoutException; +import org.camunda.connect.ConnectorRequestException; +import org.camunda.connect.httpclient.impl.HttpConnectorImpl; +import org.camunda.connect.httpclient.impl.util.ParseUtil; +import org.junit.Before; +import org.junit.Test; +import org.mockito.internal.util.reflection.Whitebox; + +public class HttpRequestConfigTest { + + public static final String EXAMPLE_URL = "http://camunda.org/example"; + public static final String EXAMPLE_CONTENT_TYPE = "application/json"; + public static final String EXAMPLE_PAYLOAD = "camunda"; + + protected HttpConnector connector; + + @Before + public void createConnector() { + connector = new HttpConnectorImpl(); + } + + @Test + public void shouldParseAuthenticationEnabled() { + // given + HttpRequest request = connector.createRequest() + .configOption(AUTHENTICATION_ENABLED.getName(), false); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.isAuthenticationEnabled()).isFalse(); + } + + @Test + public void shouldParseCircularRedirectsAllowed() { + // given + HttpRequest request = connector.createRequest() + .configOption(CIRCULAR_REDIRECTS_ALLOWED.getName(), true); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.isCircularRedirectsAllowed()).isTrue(); + } + + @Test + public void shouldParseConnectionTimeout() { + // given + HttpRequest request = connector.createRequest() + .configOption(CONNECTION_TIMEOUT.getName(), -2); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.getConnectTimeout()).isEqualTo(-2); + } + + @Test + public void shouldParseConnectionRequestTimeout() { + // given + HttpRequest request = connector.createRequest() + .configOption(CONNECTION_REQUEST_TIMEOUT.getName(), -2); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.getConnectionRequestTimeout()).isEqualTo(-2); + } + + @Test + public void shouldParseContentCompressionEnabled() { + // given + HttpRequest request = connector.createRequest() + .configOption(CONTENT_COMPRESSION_ENABLED.getName(), false); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.isContentCompressionEnabled()).isFalse(); + } + + @Test + public void shouldParseCookieSpec() { + // given + HttpRequest request = connector.createRequest() + .configOption(COOKIE_SPEC.getName(), "test"); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.getCookieSpec()).isEqualTo("test"); + } + + @Test + public void shouldParseDecompressionEnabled() { + // given + HttpRequest request = connector.createRequest() + .configOption(DECOMPRESSION_ENABLED.getName(), false); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.isDecompressionEnabled()).isFalse(); + } + + @Test + public void shouldParseExpectContinueEnabled() { + // given + HttpRequest request = connector.createRequest() + .configOption(EXPECT_CONTINUE_ENABLED.getName(), true); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.isExpectContinueEnabled()).isTrue(); + } + + @Test + public void shouldParseLocalAddress() throws UnknownHostException { + // given + InetAddress testAddress = InetAddress.getByName("127.0.0.1"); + HttpRequest request = connector.createRequest() + .configOption(LOCAL_ADDRESS.getName(), testAddress); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.getLocalAddress()).isEqualTo(testAddress); + } + + @Test + public void shouldParseMaxRedirects() { + // given + HttpRequest request = connector.createRequest() + .configOption(MAX_REDIRECTS.getName(), -2); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.getMaxRedirects()).isEqualTo(-2); + } + + @Test + public void shouldParseNormalizeUri() { + // given + HttpRequest request = connector.createRequest() + .configOption(NORMALIZE_URI.getName(), false); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.isNormalizeUri()).isFalse(); + } + + @Test + public void shouldParseProxy() { + // given + HttpHost testHost = new HttpHost("test"); + HttpRequest request = connector.createRequest() + .configOption(PROXY.getName(), testHost); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.getProxy()).isEqualTo(testHost); + } + + @Test + public void shouldParseProxyPreferredAuthSchemes() { + // given + ArrayList testArray = new ArrayList (); + HttpRequest request = connector.createRequest() + .configOption(PROXY_PREFERRED_AUTH_SCHEMES.getName(), testArray); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.getProxyPreferredAuthSchemes()).isEqualTo(testArray); + } + + @Test + public void shouldParseRedirectsEnabled() { + // given + HttpRequest request = connector.createRequest() + .configOption(REDIRECTS_ENABLED.getName(), false); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.isRedirectsEnabled()).isFalse(); + } + + @Test + public void shouldParseRelativeRedirectsAllowed() { + // given + HttpRequest request = connector.createRequest() + .configOption(RELATIVE_REDIRECTS_ALLOWED.getName(), false); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.isRelativeRedirectsAllowed()).isFalse(); + } + + + @Test + public void shouldParseSocketTimeout() { + // given + HttpRequest request = connector.createRequest() + .configOption(SOCKET_TIMEOUT.getName(), -2); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.getSocketTimeout()).isEqualTo(-2); + } + + + @Test + public void shouldParseStaleConnectionCheckEnabled() { + // given + HttpRequest request = connector.createRequest() + .configOption(STALE_CONNECTION_CHECK_ENABLED.getName(), true); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.isStaleConnectionCheckEnabled()).isTrue(); + } + + + @Test + public void shouldParseTargetPreferredAuthSchemes() { + // given + ArrayList testArray = new ArrayList (); + HttpRequest request = connector.createRequest() + .configOption(TARGET_PREFERRED_AUTH_SCHEMES.getName(), testArray); + Map configOptions = request.getConfigOptions(); + + Builder configBuilder = RequestConfig.custom(); + ParseUtil.parseConfigOptions(configOptions, configBuilder); + + // when + RequestConfig config = configBuilder.build(); + + // then + assertThat(config.getTargetPreferredAuthSchemes()).isEqualTo(testArray); + } + + @Test + public void shouldNotChangeDefaultConfig() { + // given + HttpClient client = (HttpClient) Whitebox.getInternalState(connector, "httpClient"); + connector.createRequest().url(EXAMPLE_URL).get() + .configOption(CONNECTION_TIMEOUT.getName(), -2) + .configOption(SOCKET_TIMEOUT.getName(), -2) + .configOption(CONNECTION_REQUEST_TIMEOUT.getName(), -2) + .configOption(MAX_REDIRECTS.getName(), 0) + .execute(); + + // when + RequestConfig config = (RequestConfig) Whitebox.getInternalState(client, "defaultConfig"); + + // then + assertThat(config.getMaxRedirects()).isEqualTo(50); + assertThat(config.getConnectTimeout()).isEqualTo(-1); + assertThat(config.getConnectionRequestTimeout()).isEqualTo(-1); + assertThat(config.getSocketTimeout()).isEqualTo(-1); + } + + @Test + public void shouldThrowTimeoutException() { + try { + // when + connector.createRequest().url(EXAMPLE_URL).get() + .configOption(CONNECTION_TIMEOUT.getName(), 1) + .execute(); + } catch (ConnectorRequestException e) { + // then + assertThat(e).hasMessageContaining("Unable to execute HTTP request"); + assertThat(e).hasCauseExactlyInstanceOf(ConnectTimeoutException.class); + } + } + + @Test + public void shouldThrowClassCastExceptionStringToInt() { + try { + // when + connector.createRequest().url(EXAMPLE_URL).get() + .configOption(CONNECTION_TIMEOUT.getName(), "-1") + .execute(); + } catch (ConnectorRequestException e) { + // then + assertThat(e).hasMessageContaining("Invalid value for request configuration option: " + CONNECTION_TIMEOUT.getName()); + assertThat(e).hasCause(new ClassCastException("java.lang.String cannot be cast to java.lang.Integer")); + } + } + + @Test + public void shouldThrowClassCastExceptionStringToBoolean() { + try { + // when + connector.createRequest().url(EXAMPLE_URL).get() + .configOption(AUTHENTICATION_ENABLED.getName(), "true") + .execute(); + } catch (ConnectorRequestException e) { + // then + assertThat(e).hasMessageContaining("Invalid value for request configuration option: " + AUTHENTICATION_ENABLED.getName()); + assertThat(e).hasCause(new ClassCastException("java.lang.String cannot be cast to java.lang.Boolean")); + } + } + + @Test + public void shouldThrowClassCastExceptionStringToHttpHost() { + try { + // when + connector.createRequest().url(EXAMPLE_URL).get() + .configOption(PROXY.getName(), "proxy") + .execute(); + } catch (ConnectorRequestException e) { + // then + assertThat(e).hasMessageContaining("Invalid value for request configuration option: " + PROXY.getName()); + assertThat(e).hasCause(new ClassCastException("java.lang.String cannot be cast to org.apache.http.HttpHost")); + } + } + + @Test + public void shouldThrowClassCastExceptionIntToHttpHost() { + try { + // when + connector.createRequest().url(EXAMPLE_URL).get() + .configOption(PROXY_PREFERRED_AUTH_SCHEMES.getName(), 0) + .execute(); + } catch (ConnectorRequestException e) { + // then + assertThat(e).hasMessageContaining("Invalid value for request configuration option: " + PROXY_PREFERRED_AUTH_SCHEMES.getName()); + assertThat(e).hasCause(new ClassCastException("java.lang.Integer cannot be cast to java.util.Collection")); + } + } + +} diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java index 63f46c09e40..08cc564f320 100644 --- a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java +++ b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java @@ -160,4 +160,35 @@ public void setRequestParameters() { .containsEntry("number", 42); } + @Test + public void setConfigOption() { + Object value = new Object(); + HttpRequest request = connector.createRequest() + .configOption("object-field", value) + .configOption("int-field", 15) + .configOption("long-field", 15l) + .configOption("boolean-field", true) + .configOption("string-field", "string-value"); + + assertThat(request.getConfigOption("object-field")).isEqualTo(value); + assertThat(request.getConfigOption("int-field")).isEqualTo(15); + assertThat(request.getConfigOption("long-field")).isEqualTo(15l); + assertThat(request.getConfigOption("boolean-field")).isEqualTo(true); + assertThat(request.getConfigOption("string-field")).isEqualTo("string-value"); + } + + @Test + public void shouldIgnoreConfigWithNullOrEmptyNameOrNullValue() { + HttpRequest request = connector.createRequest(); + + request.configOption(null, "test"); + assertThat(request.getConfigOptions()).isNull(); + + request.configOption("", "test"); + assertThat(request.getConfigOptions()).isNull(); + + request.configOption("test", null); + assertThat(request.getConfigOptions()).isNull(); + } + } From 84cbf8c3ccb3f1225eefca67806c990efb0acc5a Mon Sep 17 00:00:00 2001 From: Yana Vasileva Date: Mon, 21 Sep 2020 09:54:59 +0200 Subject: [PATCH 160/200] chore(connect): update clirr-maven-plugin version Related to CAM-12458 --- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/soap-http-client/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/connect/core/pom.xml b/connect/core/pom.xml index 3aa19b79cfe..d1e0aae6529 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -72,7 +72,7 @@ org.codehaus.mojo clirr-maven-plugin -2.7 +2.8 ${connect.version.old} true diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index 6983c54edc0..b1c6c36f2d0 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -88,7 +88,7 @@org.codehaus.mojo clirr-maven-plugin -2.7 +2.8 ${connect.version.old} true diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index c2e9f6463fa..a167c7f9e65 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -74,7 +74,7 @@org.codehaus.mojo clirr-maven-plugin -2.7 +2.8 ${connect.version.old} true From 139033ebd7b000bb8085159ce2cabdb7680a4dd1 Mon Sep 17 00:00:00 2001 From: Yana VasilevaDate: Mon, 21 Sep 2020 09:38:06 +0200 Subject: [PATCH 161/200] improve(connect): improve request configuration option enum Related to CAM-12458 --- .../httpclient/impl/RequestConfigOption.java | 154 +++++------------- 1 file changed, 44 insertions(+), 110 deletions(-) diff --git a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/RequestConfigOption.java b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/RequestConfigOption.java index ad813ffd2ae..ab38e78532e 100644 --- a/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/RequestConfigOption.java +++ b/connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/RequestConfigOption.java @@ -18,130 +18,64 @@ import java.net.InetAddress; import java.util.Collection; +import java.util.function.BiConsumer; import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig.Builder; public enum RequestConfigOption { - AUTHENTICATION_ENABLED("authentication-enabled") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setAuthenticationEnabled((boolean) value); - } - }, - CIRCULAR_REDIRECTS_ALLOWED("circular-redirects-allowed") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setCircularRedirectsAllowed((boolean) value); - } - }, - CONNECTION_TIMEOUT("connection-timeout") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setConnectTimeout((int) value); - } - }, - CONNECTION_REQUEST_TIMEOUT("connection-request-timeout") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setConnectionRequestTimeout((int) value); - } - }, - CONTENT_COMPRESSION_ENABLED("content-compression-enabled") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setContentCompressionEnabled((boolean) value); - } - }, - COOKIE_SPEC("cookie-spec") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setCookieSpec((String) value); - } - }, - DECOMPRESSION_ENABLED("decompression-enabled") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setDecompressionEnabled((boolean) value); - } - }, - EXPECT_CONTINUE_ENABLED("expect-continue-enabled") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setExpectContinueEnabled((boolean) value); - } - }, - LOCAL_ADDRESS("local-address") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setLocalAddress((InetAddress) value); - } - }, - MAX_REDIRECTS("max-redirects") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setMaxRedirects((int) value); - } - }, - NORMALIZE_URI("normalize-uri") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setNormalizeUri((boolean) value); - } - }, - PROXY("proxy") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setProxy((HttpHost) value); - } - }, - PROXY_PREFERRED_AUTH_SCHEMES("proxy-preferred-auth-scheme") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setProxyPreferredAuthSchemes((Collection ) value); - } - }, - REDIRECTS_ENABLED("relative-redirects-allowed") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setRedirectsEnabled((boolean) value); - } - }, - RELATIVE_REDIRECTS_ALLOWED("relative-redirects-allowed") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setRelativeRedirectsAllowed((boolean) value); - } - }, - SOCKET_TIMEOUT("socket-timeout") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setSocketTimeout((int) value); - } - }, - STALE_CONNECTION_CHECK_ENABLED("stale-connection-check-enabled") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setStaleConnectionCheckEnabled((boolean) value); - } - }, - TARGET_PREFERRED_AUTH_SCHEMES("target-preferred-auth-schemes") { - @Override - public void apply(Builder configBuilder, Object value) { - configBuilder.setTargetPreferredAuthSchemes((Collection ) value); - } - }; + AUTHENTICATION_ENABLED("authentication-enabled", + (builder, value) -> builder.setAuthenticationEnabled((boolean) value)), + CIRCULAR_REDIRECTS_ALLOWED("circular-redirects-allowed", + (builder, value) -> builder.setCircularRedirectsAllowed((boolean) value)), + CONNECTION_TIMEOUT("connection-timeout", + (builder, value) -> builder.setConnectTimeout((int) value)), + CONNECTION_REQUEST_TIMEOUT("connection-request-timeout", + (builder, value) -> builder.setConnectionRequestTimeout((int) value)), + CONTENT_COMPRESSION_ENABLED("content-compression-enabled", + (builder, value) -> builder.setContentCompressionEnabled((boolean) value)), + COOKIE_SPEC("cookie-spec", + (builder, value) -> builder.setCookieSpec((String) value)), + DECOMPRESSION_ENABLED("decompression-enabled", + (builder, value) -> builder.setDecompressionEnabled((boolean) value)), + EXPECT_CONTINUE_ENABLED("expect-continue-enabled", + (builder, value) -> builder.setExpectContinueEnabled((boolean) value)), + LOCAL_ADDRESS("local-address", + (builder, value) -> builder.setLocalAddress((InetAddress) value)), + MAX_REDIRECTS("max-redirects", + (builder, value) -> builder.setMaxRedirects((int) value)), + NORMALIZE_URI("normalize-uri", + (builder, value) -> builder.setNormalizeUri((boolean) value)), + PROXY("proxy", + (builder, value) -> builder.setProxy((HttpHost) value)), + PROXY_PREFERRED_AUTH_SCHEMES("proxy-preferred-auth-scheme", + (builder, value) -> builder.setProxyPreferredAuthSchemes((Collection ) value)), + REDIRECTS_ENABLED("relative-redirects-allowed", + (builder, value) -> builder.setRedirectsEnabled((boolean) value)), + RELATIVE_REDIRECTS_ALLOWED("relative-redirects-allowed", + (builder, value) -> builder.setRelativeRedirectsAllowed((boolean) value)), + SOCKET_TIMEOUT("socket-timeout", + (builder, value) -> builder.setSocketTimeout((int) value)), + STALE_CONNECTION_CHECK_ENABLED("stale-connection-check-enabled", + (builder, value) -> builder.setStaleConnectionCheckEnabled((boolean) value)), + TARGET_PREFERRED_AUTH_SCHEMES("target-preferred-auth-schemes", + (builder, value) -> builder.setTargetPreferredAuthSchemes((Collection ) value)); private String name; + private BiConsumer consumer; - private RequestConfigOption(String name) { + private RequestConfigOption(String name, BiConsumer consumer) { this.name = name; + this.consumer = consumer; } public String getName() { return name; } - public abstract void apply(Builder configBuilder, Object value); + public void apply(Builder configBuilder, Object value) { + this.consumer.accept(configBuilder, value); + } + } From 68a37439a7e6e4328a19db235d8eba06a7e86ede Mon Sep 17 00:00:00 2001 From: camunda-jenkins Date: Fri, 25 Sep 2020 11:09:04 +0200 Subject: [PATCH 162/200] [maven-release-plugin] prepare release 1.5.0 --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index dfbe8ee945b..274ebe8a25a 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.5.0-SNAPSHOT +1.5.0 camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.5.0 diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index c66e85acb26..5fdb6a28af9 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.5.0-SNAPSHOT +1.5.0 camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index d1e0aae6529..fdba4b3b991 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.5.0-SNAPSHOT +1.5.0 camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index b1c6c36f2d0..b82a2526789 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.5.0-SNAPSHOT +1.5.0 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index 24c1fa36ca2..ccee2bc7093 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -120,7 +120,7 @@ org.camunda.connect camunda-connect-bom -1.5.0-SNAPSHOT +1.5.0 bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -HEAD +1.5.0 diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index a167c7f9e65..5cd8702634d 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.5.0-SNAPSHOT +1.5.0 camunda-connect-soap-http-client From 839bb0a3abebdf61e4d7b73121ae294862f19e4b Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Fri, 25 Sep 2020 11:09:12 +0200 Subject: [PATCH 163/200] [maven-release-plugin] prepare for next development iteration --- connect/bom/pom.xml | 4 ++-- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 4 ++-- connect/soap-http-client/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 274ebe8a25a..25753ad27af 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -11,7 +11,7 @@ org.camunda.connect camunda-connect-bom -1.5.0 +1.6.0-SNAPSHOT camunda BPM - connect - bom pom @@ -49,7 +49,7 @@https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.5.0 +HEAD diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 5fdb6a28af9..4e4ebcc495a 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.5.0 +1.6.0-SNAPSHOT camunda-connect-connectors-all diff --git a/connect/core/pom.xml b/connect/core/pom.xml index fdba4b3b991..f3661b7e2de 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.5.0 +1.6.0-SNAPSHOT camunda-connect-core diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index b82a2526789..409b4db9e07 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -4,7 +4,7 @@camunda-connect-root org.camunda.connect -1.5.0 +1.6.0-SNAPSHOT 4.0.0 diff --git a/connect/pom.xml b/connect/pom.xml index ccee2bc7093..e214deac374 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -4,7 +4,7 @@@@ -120,7 +120,7 @@ org.camunda.connect camunda-connect-bom -1.5.0 +1.6.0-SNAPSHOT bom https://github.com/camunda/camunda-connect scm:git:git@github.com:camunda/camunda-connect.git scm:git:git@github.com:camunda/camunda-connect.git -1.5.0 +HEAD diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 5cd8702634d..93a3a3f8510 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -4,7 +4,7 @@org.camunda.connect camunda-connect-root -1.5.0 +1.6.0-SNAPSHOT camunda-connect-soap-http-client From 0b804a0a2ec7e8bba93637a6d6fd21fb7ac3fb7c Mon Sep 17 00:00:00 2001 From: camunda-jenkinsDate: Fri, 25 Sep 2020 11:11:24 +0200 Subject: [PATCH 164/200] chore(test): adjust old version for backward compatibility test after release --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index e214deac374..79095fe01fc 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -14,7 +14,7 @@ pom - From 06f4ed76c4f0cef0d8cb87a962c12ff2333c7ce4 Mon Sep 17 00:00:00 2001 From: Martin Stamm1.4.0 +1.5.0 false -Xdoclint:none Date: Fri, 23 Oct 2020 09:09:32 +0200 Subject: [PATCH 165/200] chore(community): remove broken github action related to CAMTEAM-82 --- connect/.github/workflows/main.yml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 connect/.github/workflows/main.yml diff --git a/connect/.github/workflows/main.yml b/connect/.github/workflows/main.yml deleted file mode 100644 index 6c6799a025f..00000000000 --- a/connect/.github/workflows/main.yml +++ /dev/null @@ -1,13 +0,0 @@ -on: - pull_request: - types: [opened] - -jobs: - comment_job: - runs-on: ubuntu-latest - name: Label Pull requests - steps: - - name: Comment - uses: camunda/camunda-comment-action@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From bf66c07f238d51f8cb8d8b7c95430e6debf7eefe Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 12 Oct 2020 03:13:21 +0000 Subject: [PATCH 166/200] chore(deps): bump junit from 4.12 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot-preview[bot] --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 79095fe01fc..164878e384d 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -47,7 +47,7 @@ junit junit -4.12 +4.13.1 From 4d58d894a0e129ccf5fe79f860c14e048d4092e2 Mon Sep 17 00:00:00 2001 From: camunda-jenkins + +Date: Mon, 4 Jan 2021 09:42:31 +0100 Subject: [PATCH 167/200] Update NOTICE file --- connect/NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/NOTICE b/connect/NOTICE index 8aa0b8e02e1..cb902739041 100644 --- a/connect/NOTICE +++ b/connect/NOTICE @@ -1,3 +1,3 @@ Camunda -Copyright 2014-2020 Camunda Services GmbH +Copyright 2014-2021 Camunda Services GmbH From 488a61f482ceebf038ccdf16bca6bcd630dccd38 Mon Sep 17 00:00:00 2001 From: Thorben Lindhauer Date: Tue, 29 Dec 2020 17:49:17 +0100 Subject: [PATCH 168/200] chore(project): update commons-codec dependency - is a transitive dependency of httpclient related to CAM-12774 --- connect/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/connect/pom.xml b/connect/pom.xml index 164878e384d..b481759e09d 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -43,6 +43,14 @@ httpclient 4.5.9 + commons-codec +commons-codec +1.15 +junit From a2fb4e3f50a96227ecee06fb4b2d2da64b233b76 Mon Sep 17 00:00:00 2001 From: Thorben LindhauerDate: Tue, 29 Dec 2020 16:24:05 +0100 Subject: [PATCH 169/200] chore(project): bump http client to 4.5.13 related to CAM-12956 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index b481759e09d..59e8c07bde2 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -41,7 +41,7 @@ + org.apache.httpcomponents httpclient -4.5.9 +4.5.13 + commons-codec +commons-codec +- + junit diff --git a/connect/pom.xml b/connect/pom.xml index 59e8c07bde2..0e68c39e308 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -43,9 +43,7 @@httpclient 4.5.13 commons-codec commons-codec From 48d2f4f900cb13ca81a96d838d103caab9d78f9d Mon Sep 17 00:00:00 2001 From: Miklas BoskampDate: Wed, 27 Jan 2021 16:29:15 +0100 Subject: [PATCH 171/200] chore(repo): rename Camunda BPM Platform to Camunda Platform Related to CAM-12950 --- connect/README.md | 2 +- connect/bom/pom.xml | 2 +- connect/connectors-all/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/http-client/pom.xml | 2 +- connect/pom.xml | 2 +- connect/soap-http-client/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/connect/README.md b/connect/README.md index dbacf64223d..da9f8f3d3e6 100644 --- a/connect/README.md +++ b/connect/README.md @@ -19,7 +19,7 @@ Simple API for connecting HTTP Services and other things. # Using a Connector -camunda Connect API aims at two usage scenarios, usage in a generic system such as camunda BPM +camunda Connect API aims at two usage scenarios, usage in a generic system such as Camunda Platform process engine and standalone usage via API. Please see the [official documentation](https://docs.camunda.org/manual/latest/reference/connect/) for more information. # Contributing diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 25753ad27af..febcd275238 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -12,7 +12,7 @@ org.camunda.connect camunda-connect-bom 1.6.0-SNAPSHOT -camunda BPM - connect - bom +Camunda Platform - connect - bom pom diff --git a/connect/connectors-all/pom.xml b/connect/connectors-all/pom.xml index 4e4ebcc495a..a6b63a14a67 100644 --- a/connect/connectors-all/pom.xml +++ b/connect/connectors-all/pom.xml @@ -8,7 +8,7 @@ camunda-connect-connectors-all -camunda BPM - connect - all connectors in one +Camunda Platform - connect - all connectors in one diff --git a/connect/mvnw b/connect/mvnw new file mode 100755 index 00000000000..41c0f0c23db --- /dev/null +++ b/connect/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/connect/mvnw.cmd b/connect/mvnw.cmd new file mode 100644 index 00000000000..86115719e53 --- /dev/null +++ b/connect/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% From ba1fc201ca54797c3e992637f6bf25ef086b004b Mon Sep 17 00:00:00 2001 From: "ci.cambpm" Date: Tue, 4 Jan 2022 17:54:36 +0100 Subject: [PATCH 173/200] Update NOTICE file --- connect/NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/NOTICE b/connect/NOTICE index cb902739041..add164d4dad 100644 --- a/connect/NOTICE +++ b/connect/NOTICE @@ -1,3 +1,3 @@ Camunda -Copyright 2014-2021 Camunda Services GmbH +Copyright 2014-2022 Camunda Services GmbH From 56599a5b707bd22a10b50a36a2fb9d05ae0facf1 Mon Sep 17 00:00:00 2001 From: Tobias Metzke-Bernstein Date: Wed, 13 Apr 2022 09:45:55 +0200 Subject: [PATCH 174/200] chore(project): bump commons version to 1.10.0 * extracts versions into properties * bumps logback to 1.2.10 related to CAM-14106 closes #70 --- connect/http-client/pom.xml | 3 --- connect/pom.xml | 33 ++++++++++++++++++++++++++------ connect/soap-http-client/pom.xml | 1 - 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/connect/http-client/pom.xml b/connect/http-client/pom.xml index c3c6b09a597..e9f40b8e27a 100644 --- a/connect/http-client/pom.xml +++ b/connect/http-client/pom.xml @@ -16,7 +16,6 @@ org.camunda.connect camunda-connect-core -${project.version} @@ -52,14 +51,12 @@ - +com.github.tomakehurst wiremock -1.58 test diff --git a/connect/pom.xml b/connect/pom.xml index 641a4a6c90a..a8f422ac0ee 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -14,7 +14,16 @@ org.mockito mockito-core -1.9.5 test pom + @@ -33,7 +42,7 @@2.9.1 +1.10.0 +1.15 1.5.0 +4.5.13 +4.13.1 +1.2.10 +1.9.5 +1.58 +false -Xdoclint:none @@ -41,31 +50,43 @@ org.camunda.commons camunda-commons-bom -1.9.0 +${commons.version} import pom org.apache.httpcomponents httpclient -4.5.13 +${httpclient.version} commons-codec commons-codec -1.15 +${commons-codec.version} junit junit -4.13.1 +${junit.version} org.assertj assertj-core -2.9.1 +${assertj.version} + + ch.qos.logback logback-classic -1.1.2 +${logback.version} ++ + +com.github.tomakehurst +wiremock +${wiremock.version} ++ diff --git a/connect/soap-http-client/pom.xml b/connect/soap-http-client/pom.xml index 8d39f04886b..4bfda7e7625 100644 --- a/connect/soap-http-client/pom.xml +++ b/connect/soap-http-client/pom.xml @@ -38,7 +38,6 @@org.mockito +mockito-core +${mockito.version} From 7b21fef9721a577c9f8bb2aef444373ff0ae1669 Mon Sep 17 00:00:00 2001 From: Tassilo Weidner <3015690+tasso94@users.noreply.github.com> Date: Tue, 26 Apr 2022 11:28:12 +0200 Subject: [PATCH 175/200] chore(deps): bump logback to version 1.2.11 related to CAM-14022, closes #72 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index a8f422ac0ee..272871c88e0 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -20,7 +20,7 @@ com.github.tomakehurst wiremock -1.58 test 1.5.0 4.5.13 4.13.1 -1.2.10 +1.2.11 1.9.5 1.58 From 5bd7afb1705f9f014817ad75778f830688e86b7f Mon Sep 17 00:00:00 2001 From: Tassilo Weidner <3015690+tasso94@users.noreply.github.com> Date: Tue, 26 Apr 2022 15:15:43 +0200 Subject: [PATCH 176/200] chore(deps): bump commons related to CAM-14022, closes #74 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 272871c88e0..0c803e73b6d 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -15,7 +15,7 @@2.9.1 -1.10.0 +1.10.1 1.15 1.5.0 4.5.13 From b561f73ece5bfb8e4e9f6c4106d9e377244f818c Mon Sep 17 00:00:00 2001 From: Daniel KelemenDate: Wed, 6 Jul 2022 12:08:49 +0200 Subject: [PATCH 177/200] chore(deps): bump commons related to CAM-13977 --- connect/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connect/pom.xml b/connect/pom.xml index 0c803e73b6d..0f746100075 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -15,7 +15,7 @@ 2.9.1 -1.10.1 +1.11.0 1.15 1.5.0 4.5.13 @@ -52,7 +52,7 @@httpclient ${httpclient.version} commons-codec commons-codec From 991087bfb5c781e075ddd03193763d8dfb50b776 Mon Sep 17 00:00:00 2001 From: Daniel KelemenDate: Tue, 19 Jul 2022 10:16:24 +0200 Subject: [PATCH 178/200] chore(deps): bump commons related to CAM-14771 --- connect/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/pom.xml b/connect/pom.xml index 0f746100075..d81c5266815 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -15,7 +15,7 @@ 2.9.1 -1.11.0 +1.12.0 1.15 1.5.0 4.5.13 From 51b7c63fd2b0d8c7fb3db815e155baeae9993ebc Mon Sep 17 00:00:00 2001 From: Yana VasilevaDate: Wed, 31 Aug 2022 15:38:16 +0200 Subject: [PATCH 179/200] chore(bom): bump to 2.2.5 release parent contains artifactory repository change Related to CAM-14850 --- connect/bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index 79b6bb57010..f1bc3c59bfb 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -4,7 +4,7 @@ From 99e2ef46b644309cd149a5605d964e12f04439c8 Mon Sep 17 00:00:00 2001 From: "ci.cambpm" org.camunda camunda-bpm-release-parent -2.2.2 +2.2.5 Date: Thu, 5 Jan 2023 10:00:21 +0100 Subject: [PATCH 180/200] Update NOTICE file --- connect/NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/NOTICE b/connect/NOTICE index add164d4dad..a894b7dec80 100644 --- a/connect/NOTICE +++ b/connect/NOTICE @@ -1,3 +1,3 @@ Camunda -Copyright 2014-2022 Camunda Services GmbH +Copyright 2014-2023 Camunda Services GmbH From d25f3653fec40adf52d07f344519047faa973e07 Mon Sep 17 00:00:00 2001 From: yanavasileva Date: Mon, 20 Mar 2023 16:57:48 +0100 Subject: [PATCH 181/200] chore(deps) bump to 2.2.6 release parent (#79) to adopt maven repository definitions camunda/camunda-bpm-platform#3240 --- connect/bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml index f1bc3c59bfb..b852ff67b90 100644 --- a/connect/bom/pom.xml +++ b/connect/bom/pom.xml @@ -4,7 +4,7 @@ From ec06d32ede91491a76416357d5c3afe89fb8135f Mon Sep 17 00:00:00 2001 From: Miklas Boskamp org.camunda camunda-bpm-release-parent -2.2.5 +2.2.6 Date: Wed, 26 Apr 2023 09:41:41 +0200 Subject: [PATCH 182/200] chore(mvn): update maven wrapper to 3.8.8 Related to camunda/camunda-bpm-platform/issues/3372 --- .../.mvn/wrapper/MavenWrapperDownloader.java | 117 --------- connect/.mvn/wrapper/maven-wrapper.jar | Bin 47774 -> 62547 bytes connect/.mvn/wrapper/maven-wrapper.properties | 20 +- connect/mvnw | 224 +++++++++--------- connect/mvnw.cmd | 57 +++-- 5 files changed, 169 insertions(+), 249 deletions(-) delete mode 100644 connect/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/connect/.mvn/wrapper/MavenWrapperDownloader.java b/connect/.mvn/wrapper/MavenWrapperDownloader.java deleted file mode 100644 index b901097f2db..00000000000 --- a/connect/.mvn/wrapper/MavenWrapperDownloader.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright 2007-present the original author or authors. - * - * 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. - */ -import java.net.*; -import java.io.*; -import java.nio.channels.*; -import java.util.Properties; - -public class MavenWrapperDownloader { - - private static final String WRAPPER_VERSION = "0.5.6"; - /** - * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. - */ - private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" - + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; - - /** - * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to - * use instead of the default one. - */ - private static final String MAVEN_WRAPPER_PROPERTIES_PATH = - ".mvn/wrapper/maven-wrapper.properties"; - - /** - * Path where the maven-wrapper.jar will be saved to. - */ - private static final String MAVEN_WRAPPER_JAR_PATH = - ".mvn/wrapper/maven-wrapper.jar"; - - /** - * Name of the property which should be used to override the default download url for the wrapper. - */ - private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; - - public static void main(String args[]) { - System.out.println("- Downloader started"); - File baseDirectory = new File(args[0]); - System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); - - // If the maven-wrapper.properties exists, read it and check if it contains a custom - // wrapperUrl parameter. - File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); - String url = DEFAULT_DOWNLOAD_URL; - if(mavenWrapperPropertyFile.exists()) { - FileInputStream mavenWrapperPropertyFileInputStream = null; - try { - mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); - Properties mavenWrapperProperties = new Properties(); - mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); - url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); - } catch (IOException e) { - System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); - } finally { - try { - if(mavenWrapperPropertyFileInputStream != null) { - mavenWrapperPropertyFileInputStream.close(); - } - } catch (IOException e) { - // Ignore ... - } - } - } - System.out.println("- Downloading from: " + url); - - File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); - if(!outputFile.getParentFile().exists()) { - if(!outputFile.getParentFile().mkdirs()) { - System.out.println( - "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); - } - } - System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); - try { - downloadFileFromURL(url, outputFile); - System.out.println("Done"); - System.exit(0); - } catch (Throwable e) { - System.out.println("- Error downloading"); - e.printStackTrace(); - System.exit(1); - } - } - - private static void downloadFileFromURL(String urlString, File destination) throws Exception { - if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { - String username = System.getenv("MVNW_USERNAME"); - char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); - Authenticator.setDefault(new Authenticator() { - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication(username, password); - } - }); - } - URL website = new URL(urlString); - ReadableByteChannel rbc; - rbc = Channels.newChannel(website.openStream()); - FileOutputStream fos = new FileOutputStream(destination); - fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); - fos.close(); - rbc.close(); - } - -} diff --git a/connect/.mvn/wrapper/maven-wrapper.jar b/connect/.mvn/wrapper/maven-wrapper.jar index 41c70a7e0b7da7ecbbcf53b62aacdf8bc81e10b0..cb28b0e37c7d206feb564310fdeec0927af4123a 100644 GIT binary patch literal 62547 zcmb5V1CS=sk~Z9!wr$(CZEL#U=Co~N+O}=mwr$(Cds^S@-Tij=#=rmlVk@E|Dyp8$ z$UKz?`Q$l@GN3=8fq)=^fVx`E)Pern1@-q?PE1vZPD);!LGdpP^)C$aAFx&{CzjH` zpQV9;fd0PyFPNN=yp*_@iYmRFcvOrKbU!1a*o)t$0ex(~3z5?bw11HQYW_uDngyer za60w&wz^`W&Z!0XSH^cLNR&k>%)Vr|$}(wfBzmSbuK^)dy#xr@_NZVszJASn12dw; z-KbI5yz=2awY0>OUF)&crfPu&tVl|!>g*#ur@K=$@8N05<_Mldg}X`N6O<~3|Dpk3 z RWb!e7z<{Mr96 z^C {%ROigEIapRGbFA5g4XoQAe_Y1ii3Ci!KV`?$ zZ2Hy 1VP#hVp>OOqe~m|lo@^276Ik<~*6eRSOe;$wn_0@St#cJy}qI#RP= zHVMXyFYYX%T_k3MNbtOX{<*_6Htq*o|7~MkS|A|A|8AqKl!%zTirAJGz;R<3&F7_N z)uC9$9K1M-)g0#}tnM(lO2k~W&4xT7gshgZ1-y2Yo-q9Li7%zguh7W#kGfnjo7Cl6 z!^wTtP392HU0aVB!$cPHjdK}yi7xNMp+KVZy3_u}+lBCloJ&C?#NE@y$_{Uv83*iV zhDOcv`=|CiyQ5)C4fghUmxmwBP0fvuR>aV`bZ3{Q4&6-(M@5sHt0M(}WetqItGB1C zCU-)_n-VD;(6T1%0(@6%U`UgUwgJCCdXvI#f%79Elbg4^yucgfW1^ zNF!|C39SaXsqU9kIimX0vZ`U29)>O|Kfs*hXBXC;Cs9_Zos3%8lu)JGm~c19+j8Va z)~kFfHouwMbfRHJ``%9mLj_bCx!<)O9XNq&uH(>(Q0V7-gom7$kxSpjpPiYGG{IT8 zKdjoDkkMTL9-|vXDuUL=B-K)nVaSFd5TsX0v1C$ETE1Ajnhe9ept?d;xVCWMc$MbR zL{-oP*vjp_3%f0b8h!Qija6rzq~E!#7X~8^ZUb#@rnF~sG0hx^Ok?G9dwmit494OT z_WQzm_sR_#%|I`jx5(6aJYTLv;3U#e@*^jms9#~U`eHOZZEB~yn=4UA(=_U#pYn5e zeeaDmq-$-)&)5Y}h1zDbftv>|?GjQ=)qUw*^4Qug_064CXwb#|8rsLI=CxwcLMz zHjR>CkcAG#o%I8i186AbS@;qrezPCQYWHe=q-5zF>xO*Kk|VTZD ;t={XqrKfR|{itr~k71VS?cBc=9zgeFbpeQf*Wad-tAW7(o ze6RbNeu31Uebi}b0>|=7ZjH*J+zSj8fy|+T)+X{N8Vv^d+USG3arWZ?pz)WD)VW}P z0!D>}01W#e@VWTL8w1m|h`D(EnHc*C5#1WK4 G|C5ViXO$YzKfJkda# z2c2*qXI-StLW*7_c-%Dws+D#Kkv^gL!_=GMn?Y^0J7*3le!!fTzSux%=1T$O8oy8j z%)PQ9!O+>+y+Dw*r`*}y4SpUa21pWJ$gEDXCZg8L+B!pYWd8X;jRBQkN_b=#tb6Nx zVodM4k?gF&R&P=s`B3d@M5Qvr;1;i_w1AI=*rH(G1kVRMC`_nohm~Ie5^YW YqZMV2<`J* z`i)p799U_mcUjKYn!^T&hu7`Lw$PkddV&W(ni)y|9f}rGr|i-7nnfH6nyB$Q{(*Nv zZz@~rzWM#V@sjT3ewv9c`pP@xM6D!StnV@qCdO${loe(4Gy00NDF5&@Ku;h2P+Vh7 z(X6De$cX5@V}DH XG?K^6mV>XiT768Ee^ye&Cs=2yefVcFn|G zBz$~J(ld&1j@%`sBK^^0Gs$I$q9{R}!HhVu|B@Bhb29PF(%U6#P|T|{ughrfjB@s- zZ)nWbT=6f6aVyk86h(0{NqFg#_d-&q^A@E2l0Iu0(C1@^s6Y-G0r32qll>aW3cHP# zyH`KWu&2?XrIGVB6LOgb+$1zrsW>c2!a(2Y!TnGSAg(|akb#ROpk$~$h}jiY&nWEz zmMxk4&H$8yk(6GKOLQCx$Ji-5H%$Oo4l7~@gbHzNj;iC%_g-+`hCf=YA>Z&F)I1sI z%?Mm27>#i5b5x*U%#QE0wgsN|L73Qf%Mq) QW@O+)a;#mQN?b8e#X%wHbZyA_F+`P%-1SZVnTPPMermk1Rpm#(;z^tMJqwt zDMHw=^c9%?#BcjyPGZFlGOC12RN(i`QAez>VM4#BK&Tm~MZ_!#U8PR->|l+38rIqk zap{3_ei_txm=KL<4p_ukI`9GAEZ+--)Z%)I+9LYO!c|rF=Da5DE@8%g-Zb*O-z8Tv zzbvTzeUcYFgy{b) 8Q6+BPl*C}p~DiX%RHMlZf;NmCH;xy=D6Ii;tGU~ zM?k;9X_E?)-wP|VRChb4LrAL*?XD6R2L(MxRFolr6GJ$C>Ihr*nv#lBU>Yklt`-bQ zr;5c(o}R!m4PRz=CnYcQv}m?O=CA(PWBW0?)UY)5d4Kf;8-HU@=xMnA#uw{g`hK{U zB-EQG%T-7FMuUQ;r2xgBi1w69b-Jk8Kujr>`C#&kw-kx_R_GLRC}oum#c{je^h&x9 zoEe)8uUX|SahpME4SEog-5X^wQE0^I!YEHlwawJ|l^^0kD)z{o4^I$Eha$5tzD*A8 zR<*lss4U5N*JCYl;sxBaQkB3M8VT|gXibxFR-NH4Hsmw|{={*Xk)%!$IeqpW&($DQ zuf$~fL+;QIaK?EUfKSX;Gpbm8{<=v#$SrH~P-it--v1kL>3SbJS@>hAE2x_k1-iK# zRN~My-v@dGN3E#c!V1(nOH>vJ{rcOVCx$5s7B?7EKe%B`bb x(8}km#t2a z1A~COG(S4C7~h~k+3;NkxdA4gbB7bRVbm%$DXK0TSBI=Ph6f+PA@$t){_NrRLb`jp zn1u=O0C8%&`rdQgO3kEi#QqiBQcBcbG3 wqPrJ8+0r<`L0Co-n8y-NbWbx;}DTq@FD z1b)B$b>Nwx^2;+oIcgW(4I`5DeLE$mWYYc7#tishbd;Y!oQLxI>?6_zq7Ej)92xAZ z!D0mfl|v4EC<3(06V8m+BS)Vx90b=xBSTwTznptIbt5u5KD54$vwl|kp#RpZuJ*k) z>jw52JS&x )9&g3RDXGV zE lux37>A=`#5(UuRx&d4qxrV<38_w?#plbw03l9>Nz$Y zZS;fNq6>cGvoASa2y(D&qR9_{@tVrnvduek+riBR#VCG|4Ne^w@mf2 Y;-k90%V zpA6dVw|naH;pM~VAwLcQZ|pyTEr;_S2GpkB?7)+?cW{0yE$G43`viTn+^}IPNlDo3 zmE`*)*tFe^=p+a{a5xR;H0r=&!u9y)kYUv@;NUKZ)`u-KFTv0S&FTEQc;D3d|KEKSxirI9TtAWe#h vOXV z>807~TWI~^rL?)WMmi!T!j-vjsw@f11?#jNTu^cmjp!+A1f__Dw!7oqF>&r$V7gc< z?6D92h~Y?faUD+I8V!w~8Z%ws5 S{20(AkaTZc>=z`ZK=>ik1td7Op#vAnD;8S zh<>2tmEZiSm-nEjua WVE)aUXp$BumSS;qw#Xy7-yeq)(<{2G#ap8z)+lTi( ziMb -iig6!==yk zb6{;1hs`#qO5OJQlcJ|62g!?fbI^6v-(`tAQ%Drjcm!`-$%Q#@yw3pf`mXjN>=BSH z(Nftnf50zUUTK;htPt0ONKJq1_d0!a^g>DeNCNpoyZhsnch+s|jXg1!NnEv%li2yw zL}Y=P3u`S%Fj)lhWv0vF4}R;rh4&}2YB8B!|7^}a{#O ac|%oFdMToRrWxEIEN<0CG@_j#R4%R4i0$*6xzzr}^`rI!#y9Xkr{+Rt9G$*@ zQ}XJ+_dl^9@(QYdlXLIMI_Q2uSl>N9g*YXMjddFvVouadTFwyNOT0uG$p!rGF5*`1 z&xsKPj&;t10m&pdPv+LpZd$pyI_v1IJnMD%kWn{vY=O3k1sJRYwPoDV1S4OfVz4FB z$^ygjgHCW=ySKSsoSA&wSlq83JB+O-)s>>e@a{_FjB{@=AlrX7wq>JE=n@ }@fba(;n4EG| zge1i )?NE@M@DC5eEv 4; z#R~0aNssmFHANL@-eDq2_jFn=MXE9y>1FZH4&v<}vEdB6Kz^l)X%%X@E#4)ahB(KY zx8RH+1*6b|o1$_lRqi^)qoLs;eV5zkKSN;HDwJIx#ceKS!A$ZJ-BpJSc*zl+D~EM2 zm@Kpq2M*kX`;gES_Dd1Y#UH`i!#1HdehqP^{DA-AW^dV(UPu|O @Hvr>?X3^~=1i aRa~AVXbj z-yGL<(5}*)su2Tj#oIt+c6Gh}$0|sUYGGDzNMX+$Oi$e&UJt3&kwu)HX+XP{es(S3 z%9C9y({_fu>^BKjI7k;mZ4DKrdqxw`IM#8{Sh?X(6WE4S6-9M}U0&e32fV$2w{`19 zd=9JfCaYm@J$;nSG3(|byYDqh>c%`JW)W*Y0&K~g6)W?AvVP&DsF_6!fG3i%j^Q>R zR_j5@NguaZB{&XjXF+~6m|utO*pxq$8?0GjW0J-e6Lnf0c@}hvom8KOnirhjOM7!n zP#Iv^0_BqJI?hR5+Dl}p!7X}^NvFOCGvh9y*hgik<&X)3UcEBCdUr$Dt8?0f&LSur ze*n!(V(7umZ%UCS>Hf(g=}39OcvGbf2+D;OZ089m_nUbdCE0PXJfnyrIlLXGh2D!m zK=C#{JmoHY1ws47L0zeWkxxV=A%V8a&E^w%;fBp`PN_ndicD@oN?p?Bu~20>;h;W` ztV=hI*Ts$6JXOwOY?sOk_1xjzNYA#40dD}|js#3V{SLhPEkn5>Ma+cGQ i*#`g-*g56Q&@!dg)|1YpLai3Bu8a;l2fnD6&)MZ~hS%&J}k z2p-wG=S|5YGy*Rcnm<9VIVq%~`Q{g(Vq4V)CP257v06=M2W|8AgZO0CC_}HVQ>`VU zy;2LDlG1iwIeMj?l40_`21Qsm?d=1~6f4@_&`lp~pIeXnR)wF0z7FH&wu~L~mfmMr zY4_w6tc{ZP&sa&Ui@UxZ*!UovRT})(p!GtQh~+AMZ6wcqMXM*4r@EaUdt>;Qs2Nt8 zDCJi#^Rwx|T|j_kZi6K!X>Ir%%UxaH>m6I9Yp;Sr;DKJ@{)dz4hpG>jX?>iiXzVQ0 zR$IzL8q11KPvIWIT{hU`TrFyI0YQh`#>J4XE*3;v^07C004~FC7TlRVVC}<}LC4h_ zZjZ)2*#)JyXPHcwte!}{y%i_!{^KwF9qzIRst@oUu~4m;1J_qR;Pz1KSI{rXY5_I_ z%gWC*%bNsb;v?>+TbM$qT`_U8{-g@egY=7+SN#(?RE<2nfrWrOn2OXK!ek7v`aDrH zxCoFHyA&@^@m+#Y(*cohQ4B76me;)(t}{#7?E$_u#1fv)vUE5K;jmlgYI0$Mo!*EA zf?dx$4L(?nyFbv|AF1kB!$P_q)wk1*@L 0>m SC(A8f4Rgmv1HG;QDWFj<(1oz)JHr+cP|EPET zSD~QW&W(W?1PF-iZ()b|UrnB(#wG^NR!*X}t~OS-21dpXq)h)YcdA(1A`2n zVFax9rx~WuN=SVt`OIR=eE@$^9&Gx_HCfN= zI(V`)Jn+tJPF~mS?ED7#InwS&6 OfH;qDzI_8@t>In6 nl zo}q{Ds*cTG*w3CH{Mw9*Zs|iDH^KqmhlLp_+wfw IS24G z{c@fdgqy^Y)RNpI7va^nYr9;18t|j=AYDMpj)j1oNE;8+QQ)ap8O??lv%jbrb*a;} z?OvnGXbtE9zt;TOyWc|$9BeSGQbfNZR`o_C!kMr|mzFvN+5;g2TgFo8DzgS2kkuw@ z=`Gq?xbAPzyf3MQ^ZXp>Gx4GwPD))qv<1EreWT!S@H-IpO{TPP1se8Yv8f@Xw>B}Y z@#;egDL_+0WDA)AuP5@5Dyefuu&0g;P>ro9Qr>@2-VDrb(-whYxmWgkRGE(KC2LwS z;ya>ASBlDMtcZCCD8h+Awq1%A|Hbx)rpn`REck#(J^SbjiHXe-jBp!?>~DC7Wb?mC z_AN+^nOt;3tPnaRZBEpB6s|hCcFouWlA{3QJHP!EPBq1``CIsgMCYD#80(bsKpvwO)0#)1{ zos6v&9c=%W0G-T@9sfSLxeGZvnHk$SnHw57+5X4!u1dvH0YwOvuZ7M^2YOKra0dqR zD`K@MTs(k@h>V eI5UYI%n7#3L_WXVnpu$Vr-g}gEE>Y8ZQQsj_w bl&t6nj{;ga4q8SN#Z 6cBZepMoyv7MF-tnnZp*(8jq848yZ zsG_fP$Y-rtCAPPI7QC^nzQjlk;p3tk88!1dJuEFZ!BoB;c!T>L>xSD<#+4X%*;_IB z0bZ%-SLOi5DV7uo{z}YLKHsOHfFIYlu8h(?gRs9@bbzk&dkvw*CWnV;GTAKOZfbY9 z(nKOTQ?fRRs(pr@KsUDq@*P`YUk4j=m?FIoIr)pHUCSE84|Qcf6GucZBRt;6oq_8Z zP^R{LRMo?8>5oaye)Jgg9?H}q?%m@2bBI!XOOP1B0s$%htwA&XuR`=chDc2)ebgna zFWvevD|V882V)@vt|>eeB+@<-L0^6NN%B5BREi8K=GwHVh6X>kCN+R3l{%oJw5g>F zrj$rp$ 9 zhepggNYDlBLM;Q*C B&%w zW+aY{Mj{=;Rc0dkUw~k)SwgT$RVEn+1QV;%<*FZg!1OcfOcLiF@~k$`IG|E8J0?R2 zk?iDGLR*b|9#WhNLtavx0&=Nx2NII{!@1T78VEA*I#65C`b5)8cGclxKQoVFM$P({ zLw JKo9!9xN4Q8a2F`xL&_>KZfN zOK?5jP%CT{^m4_jZ ahnn4DrqgTr%(e_({|z2`C2NrR6=v9 z*|55wrjpExm3M&wQ^P?rQPmkI9Z9jlcB~4IfYuLaBV95OGm#E|YwBvj5Z}L~f`&wc zrFo!zLX*C{d2}OGE{YCxyPDNV(%RZ7;;6oM*5a>5LmLy~_NIuhXTy-*>*^oo1L;`o zlY#igc#sXmsfGHA{Vu$lCq$&Ok|9~pSl5Q3csNqZc-!a;O@R$G28a@Sg#&gnrYFsk z&OjZtfIdsr%RV)bh>{>f883aoWuYCPDP{_)%yQhVdYh;6(EOO=;ztX1>n-LcOvCIr zKPLkb`WG2;>r)LTp!~AlXjf-Oe3k`Chvw$l7SB2bA=x3s$;;VTFL0QcHliysKd^*n zg-SNbtPnMAIBX7uiwi&vS)`dunX$}x)f=iwHH;OS6jZ9dYJ^w