From e786a1b88d73ab36e8b872477748e0689bf7cfa6 Mon Sep 17 00:00:00 2001 From: tex Date: Wed, 14 Nov 2018 08:30:16 +0100 Subject: [PATCH 01/18] - Create Resource to upload and download files - Create File pull stream protocol: Pull the file in an interval from a given URL --- .../connect/config/ConfigKeys.java | 3 + .../config/ConnectContainerConfig.java | 10 ++ .../org/streampipes/connect/init/Main.java | 4 + .../management/master/FileManagement.java | 83 +++++++++++ .../rest/AbstractContainerResource.java | 7 + .../connect/rest/master/FileResource.java | 103 +++++++++++++ .../connect/adapter/AdapterRegistry.java | 20 +-- .../protocol/stream/FilePullProtocol.java | 141 ++++++++++++++++++ 8 files changed, 362 insertions(+), 9 deletions(-) create mode 100644 streampipes-connect-container/src/main/java/org/streampipes/connect/management/master/FileManagement.java create mode 100644 streampipes-connect-container/src/main/java/org/streampipes/connect/rest/master/FileResource.java create mode 100644 streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/protocol/stream/FilePullProtocol.java diff --git a/streampipes-connect-container/src/main/java/org/streampipes/connect/config/ConfigKeys.java b/streampipes-connect-container/src/main/java/org/streampipes/connect/config/ConfigKeys.java index 2badeab7e7..42091bd8ad 100644 --- a/streampipes-connect-container/src/main/java/org/streampipes/connect/config/ConfigKeys.java +++ b/streampipes-connect-container/src/main/java/org/streampipes/connect/config/ConfigKeys.java @@ -29,4 +29,7 @@ public class ConfigKeys { final static String CONNECT_CONTAINER_WORKER_HOST = "SP_CONNECT_CONTAINER_WORKER_HOST"; final static String CONNECT_CONTAINER_WORKER_PORT = "SP_CONNECT_CONTAINER_WORKER_PORT"; + + final static String DATA_LOCATION = "SP_DATA_LOCATION"; + } diff --git a/streampipes-connect-container/src/main/java/org/streampipes/connect/config/ConnectContainerConfig.java b/streampipes-connect-container/src/main/java/org/streampipes/connect/config/ConnectContainerConfig.java index cc5f91b6a5..6a299df36d 100644 --- a/streampipes-connect-container/src/main/java/org/streampipes/connect/config/ConnectContainerConfig.java +++ b/streampipes-connect-container/src/main/java/org/streampipes/connect/config/ConnectContainerConfig.java @@ -40,6 +40,9 @@ public enum ConnectContainerConfig { config.register(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT, Config.WORKER_PORT, "The port of the connect container"); config.register(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST, "connect-worker", "The hostname of the connect container"); + + config.register(ConfigKeys.DATA_LOCATION,"/home/user/", "Folder that stores all the uploaded data"); + } public String getBackendApiUrl() { @@ -96,4 +99,11 @@ public Integer getConnectContainerWorkerPort() { return config.getInteger(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT); } + public String getDataLocation() { + return config.getString(ConfigKeys.DATA_LOCATION); + } + + + + } diff --git a/streampipes-connect-container/src/main/java/org/streampipes/connect/init/Main.java b/streampipes-connect-container/src/main/java/org/streampipes/connect/init/Main.java index 3ecf3dfe00..22ad123ef4 100644 --- a/streampipes-connect-container/src/main/java/org/streampipes/connect/init/Main.java +++ b/streampipes-connect-container/src/main/java/org/streampipes/connect/init/Main.java @@ -20,6 +20,7 @@ import org.apache.http.client.fluent.Request; import org.eclipse.jetty.server.Server; import org.glassfish.jersey.jetty.JettyHttpContainerFactory; +import org.glassfish.jersey.media.multipart.MultiPartFeature; import org.glassfish.jersey.server.ResourceConfig; import org.lightcouch.CouchDbClient; import org.slf4j.Logger; @@ -107,6 +108,9 @@ private static Set> getMasterApiClasses() { allClasses.add(DescriptionResource.class); allClasses.add(SourcesResource.class); allClasses.add(GuessResource.class); + allClasses.add(FileResource.class); + allClasses.add(MultiPartFeature.class); + allClasses.addAll(getApiClasses()); diff --git a/streampipes-connect-container/src/main/java/org/streampipes/connect/management/master/FileManagement.java b/streampipes-connect-container/src/main/java/org/streampipes/connect/management/master/FileManagement.java new file mode 100644 index 0000000000..0a8aa09fd5 --- /dev/null +++ b/streampipes-connect-container/src/main/java/org/streampipes/connect/management/master/FileManagement.java @@ -0,0 +1,83 @@ +/* +Copyright 2018 FZI Forschungszentrum Informatik + +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.streampipes.connect.management.master; + +import org.apache.commons.io.IOUtils; +import org.streampipes.connect.config.ConnectContainerConfig; + +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; + +public class FileManagement { + + public void saveFile(InputStream inputStream, String fileName) throws IOException { + String filePath = getMainFilePath() + fileName; + saveFile(filePath, inputStream); + } + + public List getUrls(String username) throws IOException { + String urlPrefix = ConnectContainerConfig.INSTANCE.getConnectContainerMasterUrl()+ "api/v1/" + + username + "/master/file/"; + + List urls = new ArrayList<>(); + File[] files = new File(getMainFilePath()).listFiles(); + for (int i = 0; i < files.length; i++) { + urls.add(urlPrefix + files[i].getName()); + } + + return urls; + } + + public File getFile(String name) throws IOException { + File file = new File(getMainFilePath() + name); + if(file.exists()) { + return file; + } else { + throw new IOException(); + } + } + + public void deleteFile(String name) throws IOException { + File file = new File(getMainFilePath() + name); + if(file.exists()) { + file.delete(); + } else { + throw new IOException("File" + name + "is not excisting"); + } + } + + private void saveFile(String filePath, InputStream inputStream ) throws IOException { + File file = new File(filePath); + file.getParentFile().mkdirs(); + file.createNewFile(); + byte[] aByte = IOUtils.toByteArray(inputStream); + FileOutputStream fos =new FileOutputStream(file); + IOUtils.write(aByte, fos); + } + + private String getMainFilePath() { + return ConnectContainerConfig.INSTANCE.getDataLocation(); + } + + + + +} diff --git a/streampipes-connect-container/src/main/java/org/streampipes/connect/rest/AbstractContainerResource.java b/streampipes-connect-container/src/main/java/org/streampipes/connect/rest/AbstractContainerResource.java index 72f39acf3e..cc73bc77ce 100644 --- a/streampipes-connect-container/src/main/java/org/streampipes/connect/rest/AbstractContainerResource.java +++ b/streampipes-connect-container/src/main/java/org/streampipes/connect/rest/AbstractContainerResource.java @@ -30,6 +30,13 @@ protected Response ok(T entity) { .build(); } + protected Response ok() { + return Response + .ok() + .build(); + } + + protected Response statusMessage(Message message) { return ok(message); } diff --git a/streampipes-connect-container/src/main/java/org/streampipes/connect/rest/master/FileResource.java b/streampipes-connect-container/src/main/java/org/streampipes/connect/rest/master/FileResource.java new file mode 100644 index 0000000000..a9224cca71 --- /dev/null +++ b/streampipes-connect-container/src/main/java/org/streampipes/connect/rest/master/FileResource.java @@ -0,0 +1,103 @@ +/* +Copyright 2018 FZI Forschungszentrum Informatik + +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.streampipes.connect.rest.master; + +import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import org.glassfish.jersey.media.multipart.FormDataParam; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.streampipes.connect.management.master.FileManagement; +import org.streampipes.connect.rest.AbstractContainerResource; + +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; + +@Path("/api/v1/{username}/master/file") +public class FileResource extends AbstractContainerResource { + + private Logger logger = LoggerFactory.getLogger(FileResource.class); + + FileManagement fileManagement; + + public FileResource() { + this.fileManagement = new FileManagement(); + } + + public FileResource(FileManagement fileManagement) { + this.fileManagement = fileManagement; + } + + @POST + @Consumes(MediaType.MULTIPART_FORM_DATA) + public Response uploadFiles(@FormDataParam("file_upload") InputStream uploadedInputStream, + @FormDataParam("file_upload") FormDataContentDisposition fileDetail) { + + try { + fileManagement.saveFile(uploadedInputStream, fileDetail.getFileName()); + return ok(); + } catch (Exception e) { + logger.error(e.toString()); + return fail(); + } + } + + @GET + // @Produces({MediaType.F}) + @Path("/{filename}") + public Response getFileU(@PathParam("filename") String fileName) { + try { + File file = fileManagement.getFile(fileName); + logger.info("Downloaded file: " + fileName); + return Response.ok(file, MediaType.APPLICATION_OCTET_STREAM) + .header("Content-Disposition", "attachment; filename=\"" + fileName + "\"") + .build(); + } catch (IOException e) { + logger.error(e.toString()); + return fail(); + } + } + + @GET + public Response getFileUrls(@PathParam("username") String username) { + try { + return ok(fileManagement.getUrls(username)); + } catch (IOException e) { + logger.error(e.toString()); + return fail(); + } + } + + + @DELETE + @Path("/{filename}") + @Consumes(MediaType.APPLICATION_JSON) + public Response deleteFile(@PathParam("filename") String fileName) { + try { + fileManagement.deleteFile(fileName); + return ok(); + } catch (IOException e) { + logger.error(e.toString()); + return fail(); } + } + + +} diff --git a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/AdapterRegistry.java b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/AdapterRegistry.java index 2f6fbe00c5..8b6deb4ab2 100644 --- a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/AdapterRegistry.java +++ b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/AdapterRegistry.java @@ -36,6 +36,7 @@ import org.streampipes.connect.adapter.generic.protocol.Protocol; import org.streampipes.connect.adapter.generic.protocol.set.FileProtocol; import org.streampipes.connect.adapter.generic.protocol.set.HttpProtocol; +import org.streampipes.connect.adapter.generic.protocol.stream.FilePullProtocol; import org.streampipes.connect.adapter.generic.protocol.stream.HttpStreamProtocol; import org.streampipes.connect.adapter.generic.protocol.stream.KafkaProtocol; import org.streampipes.connect.adapter.generic.protocol.stream.MqttProtocol; @@ -56,12 +57,12 @@ public class AdapterRegistry { public static Map getAllAdapters() { Map allAdapters = new HashMap<>(); -// allAdapters.put(GenericDataSetAdapter.ID, new GenericDataSetAdapter()); + allAdapters.put(GenericDataSetAdapter.ID, new GenericDataSetAdapter()); allAdapters.put(GenericDataStreamAdapter.ID, new GenericDataStreamAdapter()); -// allAdapters.put(TwitterAdapter.ID, new TwitterAdapter()); + allAdapters.put(TwitterAdapter.ID, new TwitterAdapter()); allAdapters.put(OpenSenseMapAdapter.ID, new OpenSenseMapAdapter()); allAdapters.put(GdeltAdapter.ID, new GdeltAdapter()); -// allAdapters.put(NswTrafficCameraAdapter.ID, new NswTrafficCameraAdapter()); + allAdapters.put(NswTrafficCameraAdapter.ID, new NswTrafficCameraAdapter()); return allAdapters; } @@ -72,9 +73,9 @@ public static Map getAllFormats() { allFormats.put(JsonFormat.ID, new JsonFormat()); allFormats.put(JsonObjectFormat.ID, new JsonObjectFormat()); allFormats.put(JsonArrayFormat.ID, new JsonArrayFormat()); -// allFormats.put(CsvFormat.ID, new CsvFormat()); + allFormats.put(CsvFormat.ID, new CsvFormat()); allFormats.put(GeoJsonFormat.ID, new GeoJsonFormat()); -// allFormats.put(XmlFormat.ID, new XmlFormat()); + allFormats.put(XmlFormat.ID, new XmlFormat()); return allFormats; } @@ -85,9 +86,9 @@ public static Map getAllParsers() { allParsers.put(JsonFormat.ID, new JsonParser()); allParsers.put(JsonObjectFormat.ID, new JsonObjectParser()); allParsers.put(JsonArrayFormat.ID, new JsonArrayParser()); -// allParsers.put(CsvFormat.ID, new CsvParser()); + allParsers.put(CsvFormat.ID, new CsvParser()); allParsers.put(GeoJsonFormat.ID, new GeoJsonParser()); -// allParsers.put(XmlFormat.ID, new XmlParser()); + allParsers.put(XmlFormat.ID, new XmlParser()); return allParsers; } @@ -95,11 +96,12 @@ public static Map getAllParsers() { public static Map getAllProtocols() { Map allProtocols = new HashMap<>(); -// allProtocols.put(HttpProtocol.ID, new HttpProtocol()); -// allProtocols.put(FileProtocol.ID, new FileProtocol()); + allProtocols.put(HttpProtocol.ID, new HttpProtocol()); + allProtocols.put(FileProtocol.ID, new FileProtocol()); allProtocols.put(KafkaProtocol.ID, new KafkaProtocol()); allProtocols.put(MqttProtocol.ID, new MqttProtocol()); allProtocols.put(HttpStreamProtocol.ID, new HttpStreamProtocol()); + allProtocols.put(FilePullProtocol.ID, new FilePullProtocol()); return allProtocols; } diff --git a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/protocol/stream/FilePullProtocol.java b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/protocol/stream/FilePullProtocol.java new file mode 100644 index 0000000000..05c76744b0 --- /dev/null +++ b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/protocol/stream/FilePullProtocol.java @@ -0,0 +1,141 @@ +/* +Copyright 2018 FZI Forschungszentrum Informatik + +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.streampipes.connect.adapter.generic.protocol.stream; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.streampipes.connect.adapter.generic.format.Format; +import org.streampipes.connect.adapter.generic.format.Parser; +import org.streampipes.connect.adapter.generic.guess.SchemaGuesser; +import org.streampipes.connect.adapter.generic.protocol.Protocol; +import org.streampipes.connect.adapter.generic.protocol.set.FileProtocol; +import org.streampipes.connect.adapter.generic.sdk.ParameterExtractor; +import org.streampipes.model.connect.grounding.ProtocolDescription; +import org.streampipes.model.connect.guess.GuessSchema; +import org.streampipes.model.schema.EventSchema; +import org.streampipes.model.staticproperty.FreeTextStaticProperty; + +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class FilePullProtocol extends PullProtocol { + + private static Logger logger = LoggerFactory.getLogger(FilePullProtocol.class); + + public static final String ID = "https://streampipes.org/vocabulary/v1/protocol/stream/pull/file"; + + private String fileUrl; + + public FilePullProtocol() { + } + + public FilePullProtocol(Parser parser, Format format, long interval, String fileUrl) { + super(parser, format, interval); + this.fileUrl = fileUrl; + } + + @Override + InputStream getDataFromEndpoint() { + FileReader fr = null; + InputStream inn = null; + + try { + URL url = new URL(fileUrl); + + // fr = new FileReader(fileUri); + // BufferedReader br = new BufferedReader(fr); + + // inn = new FileInputStream(fileUri); + inn = url.openStream(); + + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + + return inn; + } + + @Override + public Protocol getInstance(ProtocolDescription protocolDescription, Parser parser, Format format) { + ParameterExtractor extractor = new ParameterExtractor(protocolDescription.getConfig()); + long intervalProperty = Long.parseLong(extractor.singleValue("interval")); + + String fileUri = extractor.singleValue("fileUrl"); + + return new FilePullProtocol(parser, format, intervalProperty, fileUri); } + + @Override + public ProtocolDescription declareModel() { + ProtocolDescription pd = new ProtocolDescription(ID,"File Pull","This is the " + + "description for the File Pull protocol"); + FreeTextStaticProperty urlProperty = new FreeTextStaticProperty("fileUrl", "File URL", + "This property defines the URL for the http file location."); + pd.setSourceType("STREAM"); + FreeTextStaticProperty intervalProperty = new FreeTextStaticProperty("interval", "Interval", "This property " + + "defines the pull interval in seconds."); + pd.setIconUrl("file.png"); + pd.addConfig(urlProperty); + pd.addConfig(intervalProperty); + return pd; + } + + @Override + public GuessSchema getGuessSchema() { + InputStream dataInputStream = getDataFromEndpoint(); + + List dataByte = parser.parseNEvents(dataInputStream, 20); + + EventSchema eventSchema= parser.getEventSchema(dataByte); + + GuessSchema result = SchemaGuesser.guessSchma(eventSchema, getNElements(20)); + + return result; } + + @Override + public List> getNElements(int n) { + List> result = new ArrayList<>(); + + InputStream dataInputStream = getDataFromEndpoint(); + + List dataByteArray = parser.parseNEvents(dataInputStream, n); + + // Check that result size is n. Currently just an error is logged. Maybe change to an exception + if (dataByteArray.size() < n) { + logger.error("Error in File Protocol! User required: " + n + " elements but the resource just had: " + + dataByteArray.size()); + } + + for (byte[] b : dataByteArray) { + result.add(format.parse(b)); + } + + return result; + } + + @Override + public String getId() { + return ID; + } +} From 9bf47b550debb43b3616ff0c268d625b85df145a Mon Sep 17 00:00:00 2001 From: zehnder Date: Wed, 14 Nov 2018 19:20:52 +0000 Subject: [PATCH 02/18] [RELEASE] [skip-ci]updating poms for 0.60.1-SNAPSHOT development --- .../pom.xml | 2 +- .../streampipes-archetype-pe-processors-jvm/pom.xml | 2 +- .../streampipes-archetype-pe-sinks-flink/pom.xml | 2 +- .../streampipes-archetype-pe-sinks-jvm/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sources/pom.xml | 2 +- pom.xml | 2 +- streampipes-app-file-export/pom.xml | 2 +- streampipes-backend/pom.xml | 2 +- streampipes-code-generation/pom.xml | 2 +- streampipes-commons/pom.xml | 2 +- streampipes-config/pom.xml | 2 +- streampipes-connect-container/pom.xml | 12 ++++-------- streampipes-connect/pom.xml | 5 ++--- streampipes-container-embedded/pom.xml | 2 +- streampipes-container-standalone/pom.xml | 2 +- streampipes-container/pom.xml | 2 +- streampipes-dataformat-json/pom.xml | 2 +- streampipes-dataformat/pom.xml | 2 +- streampipes-logging/pom.xml | 2 +- streampipes-measurement-units/pom.xml | 2 +- streampipes-messaging-jms/pom.xml | 2 +- streampipes-messaging-kafka/pom.xml | 2 +- streampipes-messaging/pom.xml | 2 +- streampipes-model-client/pom.xml | 2 +- streampipes-model/pom.xml | 2 +- streampipes-performance-tests/pom.xml | 2 +- streampipes-pipeline-management/pom.xml | 5 ++--- streampipes-rest-shared/pom.xml | 6 ++---- streampipes-rest/pom.xml | 2 +- streampipes-sdk/pom.xml | 2 +- streampipes-serializers/pom.xml | 2 +- streampipes-sources/pom.xml | 2 +- streampipes-storage-api/pom.xml | 2 +- streampipes-storage-couchdb/pom.xml | 2 +- streampipes-storage-management/pom.xml | 2 +- streampipes-storage-rdf4j/pom.xml | 2 +- streampipes-test-utils/pom.xml | 6 ++---- streampipes-user-management/pom.xml | 2 +- streampipes-vocabulary/pom.xml | 2 +- streampipes-wrapper-distributed/pom.xml | 2 +- streampipes-wrapper-esper/pom.xml | 2 +- streampipes-wrapper-flink/pom.xml | 2 +- streampipes-wrapper-kafka-streams/pom.xml | 2 +- streampipes-wrapper-siddhi/pom.xml | 6 ++---- streampipes-wrapper-spark/pom.xml | 2 +- streampipes-wrapper-standalone/pom.xml | 2 +- streampipes-wrapper/pom.xml | 2 +- 47 files changed, 55 insertions(+), 67 deletions(-) diff --git a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml index 73b2e8665a..76f3f56014 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-processors-flink diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml index 4e89bba763..538be9e8c3 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-processors-jvm diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml index 4478fbc1c6..8a53a7d95c 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-sinks-flink diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml index b4154a33a2..3c23a0b744 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-sinks-jvm diff --git a/archetypes/streampipes-archetype-pe-sources/pom.xml b/archetypes/streampipes-archetype-pe-sources/pom.xml index a2d7df5a92..296cc36ed0 100644 --- a/archetypes/streampipes-archetype-pe-sources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sources/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-sources diff --git a/pom.xml b/pom.xml index d12aee555d..de037ee8f6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT pom UTF-8 diff --git a/streampipes-app-file-export/pom.xml b/streampipes-app-file-export/pom.xml index c232c4382e..a9a458ed59 100644 --- a/streampipes-app-file-export/pom.xml +++ b/streampipes-app-file-export/pom.xml @@ -21,7 +21,7 @@ streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT StreamPipes App File Export streampipes-app-file-export diff --git a/streampipes-backend/pom.xml b/streampipes-backend/pom.xml index 3713f7bc9d..1fb39f1eec 100644 --- a/streampipes-backend/pom.xml +++ b/streampipes-backend/pom.xml @@ -3,7 +3,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT streampipes-backend war diff --git a/streampipes-code-generation/pom.xml b/streampipes-code-generation/pom.xml index 58e277b5ee..ab133b4d93 100644 --- a/streampipes-code-generation/pom.xml +++ b/streampipes-code-generation/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT streampipes-code-generation diff --git a/streampipes-commons/pom.xml b/streampipes-commons/pom.xml index f7d92a1623..a8a8dbd0e6 100644 --- a/streampipes-commons/pom.xml +++ b/streampipes-commons/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT streampipes-commons StreamPipes Commons diff --git a/streampipes-config/pom.xml b/streampipes-config/pom.xml index 3b454477f6..ee2ff80b67 100644 --- a/streampipes-config/pom.xml +++ b/streampipes-config/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-connect-container/pom.xml b/streampipes-connect-container/pom.xml index c1aadff932..389828aefb 100644 --- a/streampipes-connect-container/pom.xml +++ b/streampipes-connect-container/pom.xml @@ -1,11 +1,9 @@ - + streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 @@ -84,12 +82,10 @@ false - + org.streampipes.connect.init.Main - + diff --git a/streampipes-connect/pom.xml b/streampipes-connect/pom.xml index 35fcdc92c0..4d9d2a4d62 100755 --- a/streampipes-connect/pom.xml +++ b/streampipes-connect/pom.xml @@ -1,10 +1,9 @@ - + org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-container-embedded/pom.xml b/streampipes-container-embedded/pom.xml index 9b012b8802..3f6315a149 100644 --- a/streampipes-container-embedded/pom.xml +++ b/streampipes-container-embedded/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT streampipes-container-embedded jar diff --git a/streampipes-container-standalone/pom.xml b/streampipes-container-standalone/pom.xml index e1f653a0f5..ec7094f855 100644 --- a/streampipes-container-standalone/pom.xml +++ b/streampipes-container-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-container/pom.xml b/streampipes-container/pom.xml index 9b22a3bfae..b17e5339e6 100644 --- a/streampipes-container/pom.xml +++ b/streampipes-container/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT streampipes-container Large scale event processing agents with semantic checking for combinability. diff --git a/streampipes-dataformat-json/pom.xml b/streampipes-dataformat-json/pom.xml index ade931a3c3..9518c09540 100644 --- a/streampipes-dataformat-json/pom.xml +++ b/streampipes-dataformat-json/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-dataformat/pom.xml b/streampipes-dataformat/pom.xml index a70391c890..2a7c738eaf 100644 --- a/streampipes-dataformat/pom.xml +++ b/streampipes-dataformat/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-logging/pom.xml b/streampipes-logging/pom.xml index 1c798fcb59..a84f084db1 100644 --- a/streampipes-logging/pom.xml +++ b/streampipes-logging/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-measurement-units/pom.xml b/streampipes-measurement-units/pom.xml index f7cc92afa9..9be4cc7cd2 100644 --- a/streampipes-measurement-units/pom.xml +++ b/streampipes-measurement-units/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT streampipes-measurement-units diff --git a/streampipes-messaging-jms/pom.xml b/streampipes-messaging-jms/pom.xml index bf9d635f6f..9070f0886d 100644 --- a/streampipes-messaging-jms/pom.xml +++ b/streampipes-messaging-jms/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-messaging-kafka/pom.xml b/streampipes-messaging-kafka/pom.xml index a7d5ddf6e5..3c0e715680 100644 --- a/streampipes-messaging-kafka/pom.xml +++ b/streampipes-messaging-kafka/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-messaging/pom.xml b/streampipes-messaging/pom.xml index e098a6b583..2c5289958f 100644 --- a/streampipes-messaging/pom.xml +++ b/streampipes-messaging/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-model-client/pom.xml b/streampipes-model-client/pom.xml index 3f19c1c856..79da5b4d37 100644 --- a/streampipes-model-client/pom.xml +++ b/streampipes-model-client/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT streampipes-model-client jar diff --git a/streampipes-model/pom.xml b/streampipes-model/pom.xml index e31e298ee8..fb0a6504bb 100644 --- a/streampipes-model/pom.xml +++ b/streampipes-model/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT diff --git a/streampipes-performance-tests/pom.xml b/streampipes-performance-tests/pom.xml index 20401348d5..d093770560 100644 --- a/streampipes-performance-tests/pom.xml +++ b/streampipes-performance-tests/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-pipeline-management/pom.xml b/streampipes-pipeline-management/pom.xml index 0113a1a937..0a15a2b72d 100644 --- a/streampipes-pipeline-management/pom.xml +++ b/streampipes-pipeline-management/pom.xml @@ -15,13 +15,12 @@ ~ --> - + 4.0.0 org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT streampipes-pipeline-management diff --git a/streampipes-rest-shared/pom.xml b/streampipes-rest-shared/pom.xml index 3629471372..57321d0a8e 100644 --- a/streampipes-rest-shared/pom.xml +++ b/streampipes-rest-shared/pom.xml @@ -16,13 +16,11 @@ ~ --> - + streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-rest/pom.xml b/streampipes-rest/pom.xml index 43c09b5b58..1c00f7f128 100644 --- a/streampipes-rest/pom.xml +++ b/streampipes-rest/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT StreamPipes REST API streampipes-rest diff --git a/streampipes-sdk/pom.xml b/streampipes-sdk/pom.xml index 00c768f8a9..97b62f3ff6 100644 --- a/streampipes-sdk/pom.xml +++ b/streampipes-sdk/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-serializers/pom.xml b/streampipes-serializers/pom.xml index 91bb9bd410..f036f5f57b 100644 --- a/streampipes-serializers/pom.xml +++ b/streampipes-serializers/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-sources/pom.xml b/streampipes-sources/pom.xml index 45e3003829..0d45a84746 100644 --- a/streampipes-sources/pom.xml +++ b/streampipes-sources/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT streampipes-sources diff --git a/streampipes-storage-api/pom.xml b/streampipes-storage-api/pom.xml index b000ca0c28..d27f98f991 100644 --- a/streampipes-storage-api/pom.xml +++ b/streampipes-storage-api/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT streampipes-storage-api jar diff --git a/streampipes-storage-couchdb/pom.xml b/streampipes-storage-couchdb/pom.xml index a176a7526b..e33120e3af 100644 --- a/streampipes-storage-couchdb/pom.xml +++ b/streampipes-storage-couchdb/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-storage-management/pom.xml b/streampipes-storage-management/pom.xml index 90cf66ddcd..a32e4b74af 100644 --- a/streampipes-storage-management/pom.xml +++ b/streampipes-storage-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-storage-rdf4j/pom.xml b/streampipes-storage-rdf4j/pom.xml index 143141461c..17153ed528 100644 --- a/streampipes-storage-rdf4j/pom.xml +++ b/streampipes-storage-rdf4j/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-test-utils/pom.xml b/streampipes-test-utils/pom.xml index 15bd10cbbe..485398f6b3 100644 --- a/streampipes-test-utils/pom.xml +++ b/streampipes-test-utils/pom.xml @@ -16,13 +16,11 @@ ~ --> - + streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-user-management/pom.xml b/streampipes-user-management/pom.xml index 8d3760a4b5..391306c3c6 100644 --- a/streampipes-user-management/pom.xml +++ b/streampipes-user-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-vocabulary/pom.xml b/streampipes-vocabulary/pom.xml index c25c769c4d..1f12231fc5 100644 --- a/streampipes-vocabulary/pom.xml +++ b/streampipes-vocabulary/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-distributed/pom.xml b/streampipes-wrapper-distributed/pom.xml index 930fc02421..576c51515f 100644 --- a/streampipes-wrapper-distributed/pom.xml +++ b/streampipes-wrapper-distributed/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-esper/pom.xml b/streampipes-wrapper-esper/pom.xml index 3850f3dcd7..99f2bbc19f 100644 --- a/streampipes-wrapper-esper/pom.xml +++ b/streampipes-wrapper-esper/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-flink/pom.xml b/streampipes-wrapper-flink/pom.xml index 1afc92cb7e..95f0d67733 100644 --- a/streampipes-wrapper-flink/pom.xml +++ b/streampipes-wrapper-flink/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT streampipes-wrapper-flink StreamPipes Wrapper for Apache Flink diff --git a/streampipes-wrapper-kafka-streams/pom.xml b/streampipes-wrapper-kafka-streams/pom.xml index 9a92a9c673..1b39decc99 100644 --- a/streampipes-wrapper-kafka-streams/pom.xml +++ b/streampipes-wrapper-kafka-streams/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-siddhi/pom.xml b/streampipes-wrapper-siddhi/pom.xml index 4234d666bb..fb3ac96060 100644 --- a/streampipes-wrapper-siddhi/pom.xml +++ b/streampipes-wrapper-siddhi/pom.xml @@ -16,13 +16,11 @@ ~ --> - + streampipes-parent org.streampipes - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-spark/pom.xml b/streampipes-wrapper-spark/pom.xml index aaedde98dc..a0a7c840ce 100644 --- a/streampipes-wrapper-spark/pom.xml +++ b/streampipes-wrapper-spark/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT streampipes-wrapper-spark diff --git a/streampipes-wrapper-standalone/pom.xml b/streampipes-wrapper-standalone/pom.xml index ee484d41c5..7778039590 100644 --- a/streampipes-wrapper-standalone/pom.xml +++ b/streampipes-wrapper-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT streampipes-wrapper-standalone StreamPipes Wrapper for Standalone Pipeline Element Implementations diff --git a/streampipes-wrapper/pom.xml b/streampipes-wrapper/pom.xml index 768ca96b16..0dab95a0ff 100644 --- a/streampipes-wrapper/pom.xml +++ b/streampipes-wrapper/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT streampipes-wrapper From aa164e3234d3acedfd607476a9591904b691fd2e Mon Sep 17 00:00:00 2001 From: zehnder Date: Wed, 14 Nov 2018 19:32:44 +0000 Subject: [PATCH 03/18] [RELEASE] [skip-ci]updating develop poms to master versions to avoid merge conflicts --- archetypes/streampipes-archetype-pe-processors-flink/pom.xml | 2 +- archetypes/streampipes-archetype-pe-processors-jvm/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sinks-flink/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sources/pom.xml | 2 +- pom.xml | 2 +- streampipes-app-file-export/pom.xml | 2 +- streampipes-backend/pom.xml | 2 +- streampipes-code-generation/pom.xml | 2 +- streampipes-commons/pom.xml | 2 +- streampipes-config/pom.xml | 2 +- streampipes-connect-container/pom.xml | 2 +- streampipes-connect/pom.xml | 2 +- streampipes-container-embedded/pom.xml | 2 +- streampipes-container-standalone/pom.xml | 2 +- streampipes-container/pom.xml | 2 +- streampipes-dataformat-json/pom.xml | 2 +- streampipes-dataformat/pom.xml | 2 +- streampipes-logging/pom.xml | 2 +- streampipes-measurement-units/pom.xml | 2 +- streampipes-messaging-jms/pom.xml | 2 +- streampipes-messaging-kafka/pom.xml | 2 +- streampipes-messaging/pom.xml | 2 +- streampipes-model-client/pom.xml | 2 +- streampipes-model/pom.xml | 2 +- streampipes-performance-tests/pom.xml | 2 +- streampipes-pipeline-management/pom.xml | 2 +- streampipes-rest-shared/pom.xml | 2 +- streampipes-rest/pom.xml | 2 +- streampipes-sdk/pom.xml | 2 +- streampipes-serializers/pom.xml | 2 +- streampipes-sources/pom.xml | 2 +- streampipes-storage-api/pom.xml | 2 +- streampipes-storage-couchdb/pom.xml | 2 +- streampipes-storage-management/pom.xml | 2 +- streampipes-storage-rdf4j/pom.xml | 2 +- streampipes-test-utils/pom.xml | 2 +- streampipes-user-management/pom.xml | 2 +- streampipes-vocabulary/pom.xml | 2 +- streampipes-wrapper-distributed/pom.xml | 2 +- streampipes-wrapper-esper/pom.xml | 2 +- streampipes-wrapper-flink/pom.xml | 2 +- streampipes-wrapper-kafka-streams/pom.xml | 2 +- streampipes-wrapper-siddhi/pom.xml | 2 +- streampipes-wrapper-spark/pom.xml | 2 +- streampipes-wrapper-standalone/pom.xml | 2 +- streampipes-wrapper/pom.xml | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml index 76f3f56014..8791c5a179 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 ../../pom.xml streampipes-archetype-pe-processors-flink diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml index 538be9e8c3..df0c5c921b 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 ../../pom.xml streampipes-archetype-pe-processors-jvm diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml index 8a53a7d95c..a08e64ab7b 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 ../../pom.xml streampipes-archetype-pe-sinks-flink diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml index 3c23a0b744..c120d8a585 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 ../../pom.xml streampipes-archetype-pe-sinks-jvm diff --git a/archetypes/streampipes-archetype-pe-sources/pom.xml b/archetypes/streampipes-archetype-pe-sources/pom.xml index 296cc36ed0..399236e230 100644 --- a/archetypes/streampipes-archetype-pe-sources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sources/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 ../../pom.xml streampipes-archetype-pe-sources diff --git a/pom.xml b/pom.xml index de037ee8f6..778fdd3822 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 pom UTF-8 diff --git a/streampipes-app-file-export/pom.xml b/streampipes-app-file-export/pom.xml index a9a458ed59..7903d68e98 100644 --- a/streampipes-app-file-export/pom.xml +++ b/streampipes-app-file-export/pom.xml @@ -21,7 +21,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 StreamPipes App File Export streampipes-app-file-export diff --git a/streampipes-backend/pom.xml b/streampipes-backend/pom.xml index 1fb39f1eec..f1cd415a32 100644 --- a/streampipes-backend/pom.xml +++ b/streampipes-backend/pom.xml @@ -3,7 +3,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 streampipes-backend war diff --git a/streampipes-code-generation/pom.xml b/streampipes-code-generation/pom.xml index ab133b4d93..32f522ffcb 100644 --- a/streampipes-code-generation/pom.xml +++ b/streampipes-code-generation/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 streampipes-code-generation diff --git a/streampipes-commons/pom.xml b/streampipes-commons/pom.xml index a8a8dbd0e6..f4e3579c82 100644 --- a/streampipes-commons/pom.xml +++ b/streampipes-commons/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 streampipes-commons StreamPipes Commons diff --git a/streampipes-config/pom.xml b/streampipes-config/pom.xml index ee2ff80b67..6d91f808d6 100644 --- a/streampipes-config/pom.xml +++ b/streampipes-config/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-connect-container/pom.xml b/streampipes-connect-container/pom.xml index 389828aefb..36bb440dd4 100644 --- a/streampipes-connect-container/pom.xml +++ b/streampipes-connect-container/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-connect/pom.xml b/streampipes-connect/pom.xml index 4d9d2a4d62..84d0b2e2de 100755 --- a/streampipes-connect/pom.xml +++ b/streampipes-connect/pom.xml @@ -3,7 +3,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-container-embedded/pom.xml b/streampipes-container-embedded/pom.xml index 3f6315a149..8e863adead 100644 --- a/streampipes-container-embedded/pom.xml +++ b/streampipes-container-embedded/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 streampipes-container-embedded jar diff --git a/streampipes-container-standalone/pom.xml b/streampipes-container-standalone/pom.xml index ec7094f855..9ae62bea36 100644 --- a/streampipes-container-standalone/pom.xml +++ b/streampipes-container-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-container/pom.xml b/streampipes-container/pom.xml index b17e5339e6..95d39f8024 100644 --- a/streampipes-container/pom.xml +++ b/streampipes-container/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 streampipes-container Large scale event processing agents with semantic checking for combinability. diff --git a/streampipes-dataformat-json/pom.xml b/streampipes-dataformat-json/pom.xml index 9518c09540..91a2914fc2 100644 --- a/streampipes-dataformat-json/pom.xml +++ b/streampipes-dataformat-json/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-dataformat/pom.xml b/streampipes-dataformat/pom.xml index 2a7c738eaf..d521532467 100644 --- a/streampipes-dataformat/pom.xml +++ b/streampipes-dataformat/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-logging/pom.xml b/streampipes-logging/pom.xml index a84f084db1..2db68f852b 100644 --- a/streampipes-logging/pom.xml +++ b/streampipes-logging/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-measurement-units/pom.xml b/streampipes-measurement-units/pom.xml index 9be4cc7cd2..a9c8cd2981 100644 --- a/streampipes-measurement-units/pom.xml +++ b/streampipes-measurement-units/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 streampipes-measurement-units diff --git a/streampipes-messaging-jms/pom.xml b/streampipes-messaging-jms/pom.xml index 9070f0886d..28ca7dd584 100644 --- a/streampipes-messaging-jms/pom.xml +++ b/streampipes-messaging-jms/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-messaging-kafka/pom.xml b/streampipes-messaging-kafka/pom.xml index 3c0e715680..3581489b95 100644 --- a/streampipes-messaging-kafka/pom.xml +++ b/streampipes-messaging-kafka/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-messaging/pom.xml b/streampipes-messaging/pom.xml index 2c5289958f..8604d8a3ee 100644 --- a/streampipes-messaging/pom.xml +++ b/streampipes-messaging/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-model-client/pom.xml b/streampipes-model-client/pom.xml index 79da5b4d37..3093bdbfbd 100644 --- a/streampipes-model-client/pom.xml +++ b/streampipes-model-client/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 streampipes-model-client jar diff --git a/streampipes-model/pom.xml b/streampipes-model/pom.xml index fb0a6504bb..2468bc2687 100644 --- a/streampipes-model/pom.xml +++ b/streampipes-model/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 diff --git a/streampipes-performance-tests/pom.xml b/streampipes-performance-tests/pom.xml index d093770560..0881c54ebb 100644 --- a/streampipes-performance-tests/pom.xml +++ b/streampipes-performance-tests/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-pipeline-management/pom.xml b/streampipes-pipeline-management/pom.xml index 0a15a2b72d..fe5b129c99 100644 --- a/streampipes-pipeline-management/pom.xml +++ b/streampipes-pipeline-management/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 streampipes-pipeline-management diff --git a/streampipes-rest-shared/pom.xml b/streampipes-rest-shared/pom.xml index 57321d0a8e..dfaac0523c 100644 --- a/streampipes-rest-shared/pom.xml +++ b/streampipes-rest-shared/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-rest/pom.xml b/streampipes-rest/pom.xml index 1c00f7f128..d58b27c1a3 100644 --- a/streampipes-rest/pom.xml +++ b/streampipes-rest/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 StreamPipes REST API streampipes-rest diff --git a/streampipes-sdk/pom.xml b/streampipes-sdk/pom.xml index 97b62f3ff6..1ac95b9a74 100644 --- a/streampipes-sdk/pom.xml +++ b/streampipes-sdk/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-serializers/pom.xml b/streampipes-serializers/pom.xml index f036f5f57b..bbbe67e177 100644 --- a/streampipes-serializers/pom.xml +++ b/streampipes-serializers/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-sources/pom.xml b/streampipes-sources/pom.xml index 0d45a84746..e40fd7a957 100644 --- a/streampipes-sources/pom.xml +++ b/streampipes-sources/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 streampipes-sources diff --git a/streampipes-storage-api/pom.xml b/streampipes-storage-api/pom.xml index d27f98f991..fac23a8100 100644 --- a/streampipes-storage-api/pom.xml +++ b/streampipes-storage-api/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 streampipes-storage-api jar diff --git a/streampipes-storage-couchdb/pom.xml b/streampipes-storage-couchdb/pom.xml index e33120e3af..f5cf32f0a8 100644 --- a/streampipes-storage-couchdb/pom.xml +++ b/streampipes-storage-couchdb/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-storage-management/pom.xml b/streampipes-storage-management/pom.xml index a32e4b74af..6a6395dd44 100644 --- a/streampipes-storage-management/pom.xml +++ b/streampipes-storage-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-storage-rdf4j/pom.xml b/streampipes-storage-rdf4j/pom.xml index 17153ed528..51d75494c5 100644 --- a/streampipes-storage-rdf4j/pom.xml +++ b/streampipes-storage-rdf4j/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-test-utils/pom.xml b/streampipes-test-utils/pom.xml index 485398f6b3..652e147b9e 100644 --- a/streampipes-test-utils/pom.xml +++ b/streampipes-test-utils/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-user-management/pom.xml b/streampipes-user-management/pom.xml index 391306c3c6..e2f7d042ff 100644 --- a/streampipes-user-management/pom.xml +++ b/streampipes-user-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-vocabulary/pom.xml b/streampipes-vocabulary/pom.xml index 1f12231fc5..f178045611 100644 --- a/streampipes-vocabulary/pom.xml +++ b/streampipes-vocabulary/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-wrapper-distributed/pom.xml b/streampipes-wrapper-distributed/pom.xml index 576c51515f..2a5b38d949 100644 --- a/streampipes-wrapper-distributed/pom.xml +++ b/streampipes-wrapper-distributed/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-wrapper-esper/pom.xml b/streampipes-wrapper-esper/pom.xml index 99f2bbc19f..3c880fa191 100644 --- a/streampipes-wrapper-esper/pom.xml +++ b/streampipes-wrapper-esper/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-wrapper-flink/pom.xml b/streampipes-wrapper-flink/pom.xml index 95f0d67733..be14a7fd42 100644 --- a/streampipes-wrapper-flink/pom.xml +++ b/streampipes-wrapper-flink/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 streampipes-wrapper-flink StreamPipes Wrapper for Apache Flink diff --git a/streampipes-wrapper-kafka-streams/pom.xml b/streampipes-wrapper-kafka-streams/pom.xml index 1b39decc99..3805233ba8 100644 --- a/streampipes-wrapper-kafka-streams/pom.xml +++ b/streampipes-wrapper-kafka-streams/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-wrapper-siddhi/pom.xml b/streampipes-wrapper-siddhi/pom.xml index fb3ac96060..c336b24d1f 100644 --- a/streampipes-wrapper-siddhi/pom.xml +++ b/streampipes-wrapper-siddhi/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.0 4.0.0 diff --git a/streampipes-wrapper-spark/pom.xml b/streampipes-wrapper-spark/pom.xml index a0a7c840ce..9b4594d72a 100644 --- a/streampipes-wrapper-spark/pom.xml +++ b/streampipes-wrapper-spark/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 streampipes-wrapper-spark diff --git a/streampipes-wrapper-standalone/pom.xml b/streampipes-wrapper-standalone/pom.xml index 7778039590..7659df68ad 100644 --- a/streampipes-wrapper-standalone/pom.xml +++ b/streampipes-wrapper-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 streampipes-wrapper-standalone StreamPipes Wrapper for Standalone Pipeline Element Implementations diff --git a/streampipes-wrapper/pom.xml b/streampipes-wrapper/pom.xml index 0dab95a0ff..179b58dd9e 100644 --- a/streampipes-wrapper/pom.xml +++ b/streampipes-wrapper/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.0 streampipes-wrapper From e4e4fb152f4381697f7250d3296b28ca9f674d45 Mon Sep 17 00:00:00 2001 From: zehnder Date: Wed, 14 Nov 2018 19:32:47 +0000 Subject: [PATCH 04/18] [RELEASE] [skip-ci]Updating develop poms back to pre merge state --- archetypes/streampipes-archetype-pe-processors-flink/pom.xml | 2 +- archetypes/streampipes-archetype-pe-processors-jvm/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sinks-flink/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sources/pom.xml | 2 +- pom.xml | 2 +- streampipes-app-file-export/pom.xml | 2 +- streampipes-backend/pom.xml | 2 +- streampipes-code-generation/pom.xml | 2 +- streampipes-commons/pom.xml | 2 +- streampipes-config/pom.xml | 2 +- streampipes-connect-container/pom.xml | 2 +- streampipes-connect/pom.xml | 2 +- streampipes-container-embedded/pom.xml | 2 +- streampipes-container-standalone/pom.xml | 2 +- streampipes-container/pom.xml | 2 +- streampipes-dataformat-json/pom.xml | 2 +- streampipes-dataformat/pom.xml | 2 +- streampipes-logging/pom.xml | 2 +- streampipes-measurement-units/pom.xml | 2 +- streampipes-messaging-jms/pom.xml | 2 +- streampipes-messaging-kafka/pom.xml | 2 +- streampipes-messaging/pom.xml | 2 +- streampipes-model-client/pom.xml | 2 +- streampipes-model/pom.xml | 2 +- streampipes-performance-tests/pom.xml | 2 +- streampipes-pipeline-management/pom.xml | 2 +- streampipes-rest-shared/pom.xml | 2 +- streampipes-rest/pom.xml | 2 +- streampipes-sdk/pom.xml | 2 +- streampipes-serializers/pom.xml | 2 +- streampipes-sources/pom.xml | 2 +- streampipes-storage-api/pom.xml | 2 +- streampipes-storage-couchdb/pom.xml | 2 +- streampipes-storage-management/pom.xml | 2 +- streampipes-storage-rdf4j/pom.xml | 2 +- streampipes-test-utils/pom.xml | 2 +- streampipes-user-management/pom.xml | 2 +- streampipes-vocabulary/pom.xml | 2 +- streampipes-wrapper-distributed/pom.xml | 2 +- streampipes-wrapper-esper/pom.xml | 2 +- streampipes-wrapper-flink/pom.xml | 2 +- streampipes-wrapper-kafka-streams/pom.xml | 2 +- streampipes-wrapper-siddhi/pom.xml | 2 +- streampipes-wrapper-spark/pom.xml | 2 +- streampipes-wrapper-standalone/pom.xml | 2 +- streampipes-wrapper/pom.xml | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml index 8791c5a179..76f3f56014 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-processors-flink diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml index df0c5c921b..538be9e8c3 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-processors-jvm diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml index a08e64ab7b..8a53a7d95c 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-sinks-flink diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml index c120d8a585..3c23a0b744 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-sinks-jvm diff --git a/archetypes/streampipes-archetype-pe-sources/pom.xml b/archetypes/streampipes-archetype-pe-sources/pom.xml index 399236e230..296cc36ed0 100644 --- a/archetypes/streampipes-archetype-pe-sources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sources/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-sources diff --git a/pom.xml b/pom.xml index 778fdd3822..de037ee8f6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT pom UTF-8 diff --git a/streampipes-app-file-export/pom.xml b/streampipes-app-file-export/pom.xml index 7903d68e98..a9a458ed59 100644 --- a/streampipes-app-file-export/pom.xml +++ b/streampipes-app-file-export/pom.xml @@ -21,7 +21,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT StreamPipes App File Export streampipes-app-file-export diff --git a/streampipes-backend/pom.xml b/streampipes-backend/pom.xml index f1cd415a32..1fb39f1eec 100644 --- a/streampipes-backend/pom.xml +++ b/streampipes-backend/pom.xml @@ -3,7 +3,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT streampipes-backend war diff --git a/streampipes-code-generation/pom.xml b/streampipes-code-generation/pom.xml index 32f522ffcb..ab133b4d93 100644 --- a/streampipes-code-generation/pom.xml +++ b/streampipes-code-generation/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT streampipes-code-generation diff --git a/streampipes-commons/pom.xml b/streampipes-commons/pom.xml index f4e3579c82..a8a8dbd0e6 100644 --- a/streampipes-commons/pom.xml +++ b/streampipes-commons/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT streampipes-commons StreamPipes Commons diff --git a/streampipes-config/pom.xml b/streampipes-config/pom.xml index 6d91f808d6..ee2ff80b67 100644 --- a/streampipes-config/pom.xml +++ b/streampipes-config/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-connect-container/pom.xml b/streampipes-connect-container/pom.xml index 36bb440dd4..389828aefb 100644 --- a/streampipes-connect-container/pom.xml +++ b/streampipes-connect-container/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-connect/pom.xml b/streampipes-connect/pom.xml index 84d0b2e2de..4d9d2a4d62 100755 --- a/streampipes-connect/pom.xml +++ b/streampipes-connect/pom.xml @@ -3,7 +3,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-container-embedded/pom.xml b/streampipes-container-embedded/pom.xml index 8e863adead..3f6315a149 100644 --- a/streampipes-container-embedded/pom.xml +++ b/streampipes-container-embedded/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT streampipes-container-embedded jar diff --git a/streampipes-container-standalone/pom.xml b/streampipes-container-standalone/pom.xml index 9ae62bea36..ec7094f855 100644 --- a/streampipes-container-standalone/pom.xml +++ b/streampipes-container-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-container/pom.xml b/streampipes-container/pom.xml index 95d39f8024..b17e5339e6 100644 --- a/streampipes-container/pom.xml +++ b/streampipes-container/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT streampipes-container Large scale event processing agents with semantic checking for combinability. diff --git a/streampipes-dataformat-json/pom.xml b/streampipes-dataformat-json/pom.xml index 91a2914fc2..9518c09540 100644 --- a/streampipes-dataformat-json/pom.xml +++ b/streampipes-dataformat-json/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-dataformat/pom.xml b/streampipes-dataformat/pom.xml index d521532467..2a7c738eaf 100644 --- a/streampipes-dataformat/pom.xml +++ b/streampipes-dataformat/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-logging/pom.xml b/streampipes-logging/pom.xml index 2db68f852b..a84f084db1 100644 --- a/streampipes-logging/pom.xml +++ b/streampipes-logging/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-measurement-units/pom.xml b/streampipes-measurement-units/pom.xml index a9c8cd2981..9be4cc7cd2 100644 --- a/streampipes-measurement-units/pom.xml +++ b/streampipes-measurement-units/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT streampipes-measurement-units diff --git a/streampipes-messaging-jms/pom.xml b/streampipes-messaging-jms/pom.xml index 28ca7dd584..9070f0886d 100644 --- a/streampipes-messaging-jms/pom.xml +++ b/streampipes-messaging-jms/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-messaging-kafka/pom.xml b/streampipes-messaging-kafka/pom.xml index 3581489b95..3c0e715680 100644 --- a/streampipes-messaging-kafka/pom.xml +++ b/streampipes-messaging-kafka/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-messaging/pom.xml b/streampipes-messaging/pom.xml index 8604d8a3ee..2c5289958f 100644 --- a/streampipes-messaging/pom.xml +++ b/streampipes-messaging/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-model-client/pom.xml b/streampipes-model-client/pom.xml index 3093bdbfbd..79da5b4d37 100644 --- a/streampipes-model-client/pom.xml +++ b/streampipes-model-client/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT streampipes-model-client jar diff --git a/streampipes-model/pom.xml b/streampipes-model/pom.xml index 2468bc2687..fb0a6504bb 100644 --- a/streampipes-model/pom.xml +++ b/streampipes-model/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT diff --git a/streampipes-performance-tests/pom.xml b/streampipes-performance-tests/pom.xml index 0881c54ebb..d093770560 100644 --- a/streampipes-performance-tests/pom.xml +++ b/streampipes-performance-tests/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-pipeline-management/pom.xml b/streampipes-pipeline-management/pom.xml index fe5b129c99..0a15a2b72d 100644 --- a/streampipes-pipeline-management/pom.xml +++ b/streampipes-pipeline-management/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT streampipes-pipeline-management diff --git a/streampipes-rest-shared/pom.xml b/streampipes-rest-shared/pom.xml index dfaac0523c..57321d0a8e 100644 --- a/streampipes-rest-shared/pom.xml +++ b/streampipes-rest-shared/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-rest/pom.xml b/streampipes-rest/pom.xml index d58b27c1a3..1c00f7f128 100644 --- a/streampipes-rest/pom.xml +++ b/streampipes-rest/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT StreamPipes REST API streampipes-rest diff --git a/streampipes-sdk/pom.xml b/streampipes-sdk/pom.xml index 1ac95b9a74..97b62f3ff6 100644 --- a/streampipes-sdk/pom.xml +++ b/streampipes-sdk/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-serializers/pom.xml b/streampipes-serializers/pom.xml index bbbe67e177..f036f5f57b 100644 --- a/streampipes-serializers/pom.xml +++ b/streampipes-serializers/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-sources/pom.xml b/streampipes-sources/pom.xml index e40fd7a957..0d45a84746 100644 --- a/streampipes-sources/pom.xml +++ b/streampipes-sources/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT streampipes-sources diff --git a/streampipes-storage-api/pom.xml b/streampipes-storage-api/pom.xml index fac23a8100..d27f98f991 100644 --- a/streampipes-storage-api/pom.xml +++ b/streampipes-storage-api/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT streampipes-storage-api jar diff --git a/streampipes-storage-couchdb/pom.xml b/streampipes-storage-couchdb/pom.xml index f5cf32f0a8..e33120e3af 100644 --- a/streampipes-storage-couchdb/pom.xml +++ b/streampipes-storage-couchdb/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-storage-management/pom.xml b/streampipes-storage-management/pom.xml index 6a6395dd44..a32e4b74af 100644 --- a/streampipes-storage-management/pom.xml +++ b/streampipes-storage-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-storage-rdf4j/pom.xml b/streampipes-storage-rdf4j/pom.xml index 51d75494c5..17153ed528 100644 --- a/streampipes-storage-rdf4j/pom.xml +++ b/streampipes-storage-rdf4j/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-test-utils/pom.xml b/streampipes-test-utils/pom.xml index 652e147b9e..485398f6b3 100644 --- a/streampipes-test-utils/pom.xml +++ b/streampipes-test-utils/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-user-management/pom.xml b/streampipes-user-management/pom.xml index e2f7d042ff..391306c3c6 100644 --- a/streampipes-user-management/pom.xml +++ b/streampipes-user-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-vocabulary/pom.xml b/streampipes-vocabulary/pom.xml index f178045611..1f12231fc5 100644 --- a/streampipes-vocabulary/pom.xml +++ b/streampipes-vocabulary/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-distributed/pom.xml b/streampipes-wrapper-distributed/pom.xml index 2a5b38d949..576c51515f 100644 --- a/streampipes-wrapper-distributed/pom.xml +++ b/streampipes-wrapper-distributed/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-esper/pom.xml b/streampipes-wrapper-esper/pom.xml index 3c880fa191..99f2bbc19f 100644 --- a/streampipes-wrapper-esper/pom.xml +++ b/streampipes-wrapper-esper/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-flink/pom.xml b/streampipes-wrapper-flink/pom.xml index be14a7fd42..95f0d67733 100644 --- a/streampipes-wrapper-flink/pom.xml +++ b/streampipes-wrapper-flink/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT streampipes-wrapper-flink StreamPipes Wrapper for Apache Flink diff --git a/streampipes-wrapper-kafka-streams/pom.xml b/streampipes-wrapper-kafka-streams/pom.xml index 3805233ba8..1b39decc99 100644 --- a/streampipes-wrapper-kafka-streams/pom.xml +++ b/streampipes-wrapper-kafka-streams/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-siddhi/pom.xml b/streampipes-wrapper-siddhi/pom.xml index c336b24d1f..fb3ac96060 100644 --- a/streampipes-wrapper-siddhi/pom.xml +++ b/streampipes-wrapper-siddhi/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.0 + 0.60.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-spark/pom.xml b/streampipes-wrapper-spark/pom.xml index 9b4594d72a..a0a7c840ce 100644 --- a/streampipes-wrapper-spark/pom.xml +++ b/streampipes-wrapper-spark/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT streampipes-wrapper-spark diff --git a/streampipes-wrapper-standalone/pom.xml b/streampipes-wrapper-standalone/pom.xml index 7659df68ad..7778039590 100644 --- a/streampipes-wrapper-standalone/pom.xml +++ b/streampipes-wrapper-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT streampipes-wrapper-standalone StreamPipes Wrapper for Standalone Pipeline Element Implementations diff --git a/streampipes-wrapper/pom.xml b/streampipes-wrapper/pom.xml index 179b58dd9e..0dab95a0ff 100644 --- a/streampipes-wrapper/pom.xml +++ b/streampipes-wrapper/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.0 + 0.60.1-SNAPSHOT streampipes-wrapper From ba54ca9640690a19a7a6c46059082e7ad847b8ce Mon Sep 17 00:00:00 2001 From: zehnder Date: Wed, 14 Nov 2018 19:36:54 +0000 Subject: [PATCH 05/18] Change config of release CI step --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f327c9152..ac70ce2d66 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -163,7 +163,7 @@ finish release: - git push origin --tags - git checkout master - git push github master - - git push github version-$MVN_VERSION + - git push github $MVN_VERSION - git checkout dev - git push github dev From ee7f56ef42839128996364c331cc50c90576e88a Mon Sep 17 00:00:00 2001 From: zehnder Date: Wed, 14 Nov 2018 19:54:29 +0000 Subject: [PATCH 06/18] Add only dev to connect container stage --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac70ce2d66..e84d361946 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,7 +84,8 @@ docker-connect-container: - docker push $IMAGE_NAME/streampipes-connect-container:latest - docker push $HARBOR_IMAGE_NAME/streampipes-connect-container:$MVN_VERSION - docker push $HARBOR_IMAGE_NAME/streampipes-connect-container:latest - + only: + - dev deploy: image: maven:3-jdk-8 From ae29914e90b80836677d05dd42e5196b2922bbf0 Mon Sep 17 00:00:00 2001 From: tex Date: Thu, 15 Nov 2018 15:53:26 +0100 Subject: [PATCH 07/18] - Change Confing: Data Location - Don't return the file URL, return the location of the file on the host - Rename FilePullProtocol to FileStreamProtocol - FileStreamProtocol use the filePath instead of URL --- .../config/ConnectContainerConfig.java | 2 +- .../management/master/FileManagement.java | 7 +--- .../connect/rest/master/FileResource.java | 7 ++-- .../connect/adapter/AdapterRegistry.java | 4 +- ...lProtocol.java => FileStreamProtocol.java} | 42 ++++++++----------- 5 files changed, 25 insertions(+), 37 deletions(-) rename streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/protocol/stream/{FilePullProtocol.java => FileStreamProtocol.java} (76%) diff --git a/streampipes-connect-container/src/main/java/org/streampipes/connect/config/ConnectContainerConfig.java b/streampipes-connect-container/src/main/java/org/streampipes/connect/config/ConnectContainerConfig.java index 6a299df36d..d019576ff7 100644 --- a/streampipes-connect-container/src/main/java/org/streampipes/connect/config/ConnectContainerConfig.java +++ b/streampipes-connect-container/src/main/java/org/streampipes/connect/config/ConnectContainerConfig.java @@ -41,7 +41,7 @@ public enum ConnectContainerConfig { config.register(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT, Config.WORKER_PORT, "The port of the connect container"); config.register(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST, "connect-worker", "The hostname of the connect container"); - config.register(ConfigKeys.DATA_LOCATION,"/home/user/", "Folder that stores all the uploaded data"); + config.register(ConfigKeys.DATA_LOCATION,"/data/", "Folder that stores all the uploaded data"); } diff --git a/streampipes-connect-container/src/main/java/org/streampipes/connect/management/master/FileManagement.java b/streampipes-connect-container/src/main/java/org/streampipes/connect/management/master/FileManagement.java index 0a8aa09fd5..99624683d2 100644 --- a/streampipes-connect-container/src/main/java/org/streampipes/connect/management/master/FileManagement.java +++ b/streampipes-connect-container/src/main/java/org/streampipes/connect/management/master/FileManagement.java @@ -33,14 +33,11 @@ public void saveFile(InputStream inputStream, String fileName) throws IOExceptio saveFile(filePath, inputStream); } - public List getUrls(String username) throws IOException { - String urlPrefix = ConnectContainerConfig.INSTANCE.getConnectContainerMasterUrl()+ "api/v1/" + - username + "/master/file/"; - + public List getFilePahts(String username) throws IOException { List urls = new ArrayList<>(); File[] files = new File(getMainFilePath()).listFiles(); for (int i = 0; i < files.length; i++) { - urls.add(urlPrefix + files[i].getName()); + urls.add(getMainFilePath() + files[i].getName()); } return urls; diff --git a/streampipes-connect-container/src/main/java/org/streampipes/connect/rest/master/FileResource.java b/streampipes-connect-container/src/main/java/org/streampipes/connect/rest/master/FileResource.java index a9224cca71..8a03179ff0 100644 --- a/streampipes-connect-container/src/main/java/org/streampipes/connect/rest/master/FileResource.java +++ b/streampipes-connect-container/src/main/java/org/streampipes/connect/rest/master/FileResource.java @@ -27,7 +27,6 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; @@ -63,7 +62,7 @@ public Response uploadFiles(@FormDataParam("file_upload") InputStream uploadedIn @GET // @Produces({MediaType.F}) @Path("/{filename}") - public Response getFileU(@PathParam("filename") String fileName) { + public Response getFile(@PathParam("filename") String fileName) { try { File file = fileManagement.getFile(fileName); logger.info("Downloaded file: " + fileName); @@ -77,9 +76,9 @@ public Response getFileU(@PathParam("filename") String fileName) { } @GET - public Response getFileUrls(@PathParam("username") String username) { + public Response getFilePahts(@PathParam("username") String username) { try { - return ok(fileManagement.getUrls(username)); + return ok(fileManagement.getFilePahts(username)); } catch (IOException e) { logger.error(e.toString()); return fail(); diff --git a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/AdapterRegistry.java b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/AdapterRegistry.java index 8b6deb4ab2..fcb0ae3e18 100644 --- a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/AdapterRegistry.java +++ b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/AdapterRegistry.java @@ -36,7 +36,7 @@ import org.streampipes.connect.adapter.generic.protocol.Protocol; import org.streampipes.connect.adapter.generic.protocol.set.FileProtocol; import org.streampipes.connect.adapter.generic.protocol.set.HttpProtocol; -import org.streampipes.connect.adapter.generic.protocol.stream.FilePullProtocol; +import org.streampipes.connect.adapter.generic.protocol.stream.FileStreamProtocol; import org.streampipes.connect.adapter.generic.protocol.stream.HttpStreamProtocol; import org.streampipes.connect.adapter.generic.protocol.stream.KafkaProtocol; import org.streampipes.connect.adapter.generic.protocol.stream.MqttProtocol; @@ -101,7 +101,7 @@ public static Map getAllProtocols() { allProtocols.put(KafkaProtocol.ID, new KafkaProtocol()); allProtocols.put(MqttProtocol.ID, new MqttProtocol()); allProtocols.put(HttpStreamProtocol.ID, new HttpStreamProtocol()); - allProtocols.put(FilePullProtocol.ID, new FilePullProtocol()); + allProtocols.put(FileStreamProtocol.ID, new FileStreamProtocol()); return allProtocols; } diff --git a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/protocol/stream/FilePullProtocol.java b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/protocol/stream/FileStreamProtocol.java similarity index 76% rename from streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/protocol/stream/FilePullProtocol.java rename to streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/protocol/stream/FileStreamProtocol.java index 05c76744b0..8048884dbb 100644 --- a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/protocol/stream/FilePullProtocol.java +++ b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/protocol/stream/FileStreamProtocol.java @@ -22,51 +22,43 @@ import org.streampipes.connect.adapter.generic.format.Parser; import org.streampipes.connect.adapter.generic.guess.SchemaGuesser; import org.streampipes.connect.adapter.generic.protocol.Protocol; -import org.streampipes.connect.adapter.generic.protocol.set.FileProtocol; import org.streampipes.connect.adapter.generic.sdk.ParameterExtractor; import org.streampipes.model.connect.grounding.ProtocolDescription; import org.streampipes.model.connect.guess.GuessSchema; import org.streampipes.model.schema.EventSchema; import org.streampipes.model.staticproperty.FreeTextStaticProperty; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; +import java.io.*; import java.util.ArrayList; import java.util.List; import java.util.Map; -public class FilePullProtocol extends PullProtocol { +public class FileStreamProtocol extends PullProtocol { - private static Logger logger = LoggerFactory.getLogger(FilePullProtocol.class); + private static Logger logger = LoggerFactory.getLogger(FileStreamProtocol.class); - public static final String ID = "https://streampipes.org/vocabulary/v1/protocol/stream/pull/file"; + public static final String ID = "https://streampipes.org/vocabulary/v1/protocol/stream/file"; - private String fileUrl; + private String filePath; - public FilePullProtocol() { + public FileStreamProtocol() { } - public FilePullProtocol(Parser parser, Format format, long interval, String fileUrl) { + public FileStreamProtocol(Parser parser, Format format, long interval, String filePath) { super(parser, format, interval); - this.fileUrl = fileUrl; + this.filePath = filePath; } @Override InputStream getDataFromEndpoint() { FileReader fr = null; InputStream inn = null; - try { - URL url = new URL(fileUrl); - // fr = new FileReader(fileUri); - // BufferedReader br = new BufferedReader(fr); + fr = new FileReader(filePath); + BufferedReader br = new BufferedReader(fr); - // inn = new FileInputStream(fileUri); - inn = url.openStream(); + inn = new FileInputStream(filePath); } catch (FileNotFoundException e) { e.printStackTrace(); @@ -82,16 +74,16 @@ public Protocol getInstance(ProtocolDescription protocolDescription, Parser pars ParameterExtractor extractor = new ParameterExtractor(protocolDescription.getConfig()); long intervalProperty = Long.parseLong(extractor.singleValue("interval")); - String fileUri = extractor.singleValue("fileUrl"); + String fileUri = extractor.singleValue("filePath"); - return new FilePullProtocol(parser, format, intervalProperty, fileUri); } + return new FileStreamProtocol(parser, format, intervalProperty, fileUri); } @Override public ProtocolDescription declareModel() { - ProtocolDescription pd = new ProtocolDescription(ID,"File Pull","This is the " + - "description for the File Pull protocol"); - FreeTextStaticProperty urlProperty = new FreeTextStaticProperty("fileUrl", "File URL", - "This property defines the URL for the http file location."); + ProtocolDescription pd = new ProtocolDescription(ID,"File","This is the " + + "description for the File Stream protocol"); + FreeTextStaticProperty urlProperty = new FreeTextStaticProperty("filePath", "File Path", + "This property defines the path to the file."); pd.setSourceType("STREAM"); FreeTextStaticProperty intervalProperty = new FreeTextStaticProperty("interval", "Interval", "This property " + "defines the pull interval in seconds."); From 4edce427836409fe08bbc6b21078824833ff5931 Mon Sep 17 00:00:00 2001 From: tex Date: Tue, 20 Nov 2018 12:25:32 +0100 Subject: [PATCH 08/18] - Add feature to Extractor, to the selected options - Fix Csv Format --- .../adapter/generic/format/csv/CsvFormat.java | 5 ++++- .../adapter/generic/format/csv/CsvParser.java | 3 ++- .../adapter/generic/sdk/ParameterExtractor.java | 13 +++++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/format/csv/CsvFormat.java b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/format/csv/CsvFormat.java index 5ad53cb8b8..16e6b5a953 100644 --- a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/format/csv/CsvFormat.java +++ b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/format/csv/CsvFormat.java @@ -52,9 +52,12 @@ public CsvFormat(String delimiter, Boolean header) { @Override public Format getInstance(FormatDescription formatDescription) { ParameterExtractor extractor = new ParameterExtractor(formatDescription.getConfig()); - boolean header = extractor.singleValue(HEADER_NAME) == null ? false : true; String delimiter = extractor.singleValue(DELIMITER_NAME); + boolean header = extractor.selectedMultiValues(HEADER_NAME).stream() + .anyMatch(option -> option.equals("Header")); + + return new CsvFormat(delimiter, header); } diff --git a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/format/csv/CsvParser.java b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/format/csv/CsvParser.java index 543aca615c..c090531ccd 100644 --- a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/format/csv/CsvParser.java +++ b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/format/csv/CsvParser.java @@ -51,7 +51,8 @@ public CsvParser(String delimiter, Boolean header) { public Parser getInstance(FormatDescription formatDescription) { ParameterExtractor extractor = new ParameterExtractor(formatDescription.getConfig()); - boolean header = extractor.singleValue(CsvFormat.HEADER_NAME) == null ? false : true; + boolean header = extractor.selectedMultiValues(CsvFormat.HEADER_NAME).stream() + .anyMatch(option -> option.equals("Header")); String delimiter = extractor.singleValue(CsvFormat.DELIMITER_NAME); return new CsvParser(delimiter, header); diff --git a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/sdk/ParameterExtractor.java b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/sdk/ParameterExtractor.java index ff756f8760..5619a913f1 100644 --- a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/sdk/ParameterExtractor.java +++ b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/sdk/ParameterExtractor.java @@ -17,10 +17,10 @@ package org.streampipes.connect.adapter.generic.sdk; -import org.streampipes.model.staticproperty.FreeTextStaticProperty; -import org.streampipes.model.staticproperty.StaticProperty; +import org.streampipes.model.staticproperty.*; import java.util.List; +import java.util.stream.Collectors; public class ParameterExtractor { private List list; @@ -34,6 +34,15 @@ public String singleValue(String internalName) { .getValue()); } + public List selectedMultiValues(String internalName) { + return ((SelectionStaticProperty) getStaticPropertyByName(internalName)) + .getOptions() + .stream() + .filter(Option::isSelected) + .map(Option::getName) + .collect(Collectors.toList()); + } + private StaticProperty getStaticPropertyByName(String name) { for(StaticProperty p : list) From 1a4399ac26ab9c1ee2569554a7fc1fc690de8456 Mon Sep 17 00:00:00 2001 From: Johannes Tex Date: Tue, 20 Nov 2018 16:39:00 +0000 Subject: [PATCH 09/18] Bug Fix --- .../connect/adapter/generic/format/csv/CsvParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/format/csv/CsvParser.java b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/format/csv/CsvParser.java index c090531ccd..9ca0d8ed70 100644 --- a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/format/csv/CsvParser.java +++ b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/generic/format/csv/CsvParser.java @@ -83,7 +83,7 @@ public EventSchema getEventSchema(List oneEvent) { String[] keys; String[] data; - if (!this.header) { + if (this.header) { keys = new String (oneEvent.get(0)).split(delimiter); data = new String (oneEvent.get(1)).split(delimiter); } else { From 02448b740f140aec57c5a9076382cec92f9f5fd4 Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Tue, 20 Nov 2018 21:36:45 +0100 Subject: [PATCH 10/18] Remove repository definition from archetypes --- .../pom.xml | 25 ------------------ .../pom.xml | 26 ------------------- .../pom.xml | 26 ------------------- .../pom.xml | 26 ------------------- .../streampipes-archetype-pe-sources/pom.xml | 26 ------------------- 5 files changed, 129 deletions(-) diff --git a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml index 76f3f56014..c687b9c298 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml @@ -31,29 +31,4 @@ - - - scm:git:ssh://git@ipe-wim-gitlab.fzi.de:2222/streampipes/ce-backend.git/archetypes/streampipes-archetype-pe-sinks-jvm - - - - - - deployment - Internal Releases - https://laus.fzi.de/nexus/content/repositories/public/ - - - - - deployment - Internal Releases - https://laus.fzi.de/nexus/content/repositories/releases/ - - - deployment - Internal Releases - https://laus.fzi.de/nexus/content/repositories/snapshots/ - - diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml index 538be9e8c3..9119e2a429 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml @@ -30,30 +30,4 @@ - - - - scm:git:ssh://git@ipe-wim-gitlab.fzi.de:2222/streampipes/ce-backend.git/archetypes/streampipes-archetype-pe-processors-jvm - - - - - - deployment - Internal Releases - https://laus.fzi.de/nexus/content/repositories/public/ - - - - - deployment - Internal Releases - https://laus.fzi.de/nexus/content/repositories/releases/ - - - deployment - Internal Releases - https://laus.fzi.de/nexus/content/repositories/snapshots/ - - diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml index 8a53a7d95c..592898bf83 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml @@ -30,30 +30,4 @@ - - - - scm:git:ssh://git@ipe-wim-gitlab.fzi.de:2222/streampipes/ce-backend.git/archetypes/streampipes-archetype-pe-sinks-jvm - - - - - - deployment - Internal Releases - https://laus.fzi.de/nexus/content/repositories/public/ - - - - - deployment - Internal Releases - https://laus.fzi.de/nexus/content/repositories/releases/ - - - deployment - Internal Releases - https://laus.fzi.de/nexus/content/repositories/snapshots/ - - diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml index 3c23a0b744..138a6ee0c3 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml @@ -30,30 +30,4 @@ - - - - scm:git:ssh://git@ipe-wim-gitlab.fzi.de:2222/streampipes/ce-backend.git/archetypes/streampipes-archetype-pe-sinks-jvm - - - - - - deployment - Internal Releases - https://laus.fzi.de/nexus/content/repositories/public/ - - - - - deployment - Internal Releases - https://laus.fzi.de/nexus/content/repositories/releases/ - - - deployment - Internal Releases - https://laus.fzi.de/nexus/content/repositories/snapshots/ - - diff --git a/archetypes/streampipes-archetype-pe-sources/pom.xml b/archetypes/streampipes-archetype-pe-sources/pom.xml index 296cc36ed0..2001726a84 100644 --- a/archetypes/streampipes-archetype-pe-sources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sources/pom.xml @@ -30,30 +30,4 @@ - - - - scm:git:ssh://git@ipe-wim-gitlab.fzi.de:2222/streampipes/ce-backend.git/archetypes/streampipes-archetype-pe-sources - - - - - - deployment - Internal Releases - https://laus.fzi.de/nexus/content/repositories/public/ - - - - - deployment - Internal Releases - https://laus.fzi.de/nexus/content/repositories/releases/ - - - deployment - Internal Releases - https://laus.fzi.de/nexus/content/repositories/snapshots/ - - From 732d4a90b3002e3769e3c3dffccf91dd3a0cbbbc Mon Sep 17 00:00:00 2001 From: Philipp Zehnder Date: Wed, 21 Nov 2018 23:12:51 +0100 Subject: [PATCH 11/18] Working on archtype --- .../META-INF/maven/archetype-metadata.xml | 16 ++++++- .../deployment/docker-compose.yml | 13 ++++++ .../archetype-resources/development/.env | 10 +++++ package-lock.json | 3 ++ pom.xml | 42 +++++++++---------- 5 files changed, 61 insertions(+), 23 deletions(-) create mode 100644 archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml create mode 100644 archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/development/.env create mode 100644 package-lock.json diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/META-INF/maven/archetype-metadata.xml index c309cbf6b0..ebfaa43f9c 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -17,12 +17,24 @@ **/*.java - - + + Dockerfile + + + + deployment/docker-compose.yml + + + + + + development/.env + + diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml new file mode 100644 index 0000000000..04003e52cf --- /dev/null +++ b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml @@ -0,0 +1,13 @@ +version: "2" +services: + sinks-brokers-jvm: + image: ${SP_DOCKER_REGISTRY}/streampipes/streampipes-pipeline-elements/sinks-brokers-jvm:${SP_PE_VERSION} + depends_on: + - "consul" +# ports: +# - "8098:8090" + environment: + - SP_ICON_HOST=${SP_ICON_HOST} + networks: + spnet: + diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/development/.env b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/development/.env new file mode 100644 index 0000000000..8e0e563301 --- /dev/null +++ b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/development/.env @@ -0,0 +1,10 @@ +# Those parameters are used by IntelliJ to set the default consul parameters for development +SP_PORT=6666 +SP_HOST=localhost +SP_ICON_HOST=localhost +SP_KAFKA_HOST=localhost +SP_ZOOKEEPER_HOST=localhost +SP_COUCHDB_HOST=localhost +SP_JMS_HOST=localhost +SP_NGINX_HOST=localhost +SP_NGINX_PORT=8082 \ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000000..48e341a095 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,3 @@ +{ + "lockfileVersion": 1 +} diff --git a/pom.xml b/pom.xml index de037ee8f6..cb00e8daee 100644 --- a/pom.xml +++ b/pom.xml @@ -648,26 +648,26 @@ false - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - --pinentry-mode - loopback - - - + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins maven-jar-plugin @@ -724,4 +724,4 @@ https://laus.fzi.de/nexus/content/repositories/snapshots/ - \ No newline at end of file + From 2f29b1b5378359d1e7f1b9f2f676deda8e238b25 Mon Sep 17 00:00:00 2001 From: Philipp Zehnder Date: Sat, 24 Nov 2018 15:19:50 +0100 Subject: [PATCH 12/18] Updated license file --- LICENSE | 4 ++-- .../main/resources/archetype-resources/development/env | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/development/env diff --git a/LICENSE b/LICENSE index 9088962c7e..62331553d1 100644 --- a/LICENSE +++ b/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2017 FZI Forschungszentrum Informatik + Copyright 2018 FZI Forschungszentrum Informatik Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -199,4 +199,4 @@ 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 + limitations under the License. diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/development/env b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/development/env new file mode 100644 index 0000000000..8e0e563301 --- /dev/null +++ b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/development/env @@ -0,0 +1,10 @@ +# Those parameters are used by IntelliJ to set the default consul parameters for development +SP_PORT=6666 +SP_HOST=localhost +SP_ICON_HOST=localhost +SP_KAFKA_HOST=localhost +SP_ZOOKEEPER_HOST=localhost +SP_COUCHDB_HOST=localhost +SP_JMS_HOST=localhost +SP_NGINX_HOST=localhost +SP_NGINX_PORT=8082 \ No newline at end of file From e22b7ac4330578fe2f3bf203c8c8a4f2841dfa36 Mon Sep 17 00:00:00 2001 From: Philipp Zehnder Date: Sun, 25 Nov 2018 23:04:52 +0100 Subject: [PATCH 13/18] Working on archetypes --- .../META-INF/maven/archetype-metadata.xml | 20 ++++++++++++++++++- .../deployment/docker-compose.yml | 13 ++++++++++++ .../archetype-resources/deployment/system | 10 ++++++++++ .../archetype-resources/development/env} | 0 .../src/main/java/config/Config.java | 12 +++++------ .../META-INF/maven/archetype-metadata.xml | 8 +++++++- .../deployment/docker-compose.yml | 4 ++-- .../archetype-resources/deployment/system | 10 ++++++++++ .../src/main/java/config/Config.java | 2 +- .../META-INF/maven/archetype-metadata.xml | 18 +++++++++++++++++ .../deployment/docker-compose.yml | 13 ++++++++++++ .../archetype-resources/deployment/system | 10 ++++++++++ .../archetype-resources/development/env | 10 ++++++++++ .../src/main/java/config/Config.java | 13 +++++------- .../META-INF/maven/archetype-metadata.xml | 20 ++++++++++++++++++- .../deployment/docker-compose.yml | 13 ++++++++++++ .../archetype-resources/deployment/system | 10 ++++++++++ .../archetype-resources/development/env | 10 ++++++++++ .../src/main/java/config/Config.java | 2 +- 19 files changed, 176 insertions(+), 22 deletions(-) create mode 100644 archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/docker-compose.yml create mode 100644 archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/system rename archetypes/{streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/development/.env => streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/development/env} (100%) create mode 100644 archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/system create mode 100644 archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/docker-compose.yml create mode 100644 archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/system create mode 100644 archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/development/env create mode 100644 archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml create mode 100644 archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/system create mode 100644 archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/development/env diff --git a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/META-INF/maven/archetype-metadata.xml index c309cbf6b0..0a105588e6 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -17,12 +17,30 @@ **/*.java - + Dockerfile + + + + deployment/docker-compose.yml + + + + + + deployment/system + + + + + + development/env + + diff --git a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/docker-compose.yml b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/docker-compose.yml new file mode 100644 index 0000000000..1a528c9d0b --- /dev/null +++ b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/docker-compose.yml @@ -0,0 +1,13 @@ +version: "2" +services: + ${artifactId}: + image: ${artifactId} + depends_on: + - "consul" +# ports: +# - "8098:8090" + environment: + - SP_ICON_HOST=${SP_ICON_HOST} + networks: + spnet: + diff --git a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/system b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/system new file mode 100644 index 0000000000..c703a5bddb --- /dev/null +++ b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/system @@ -0,0 +1,10 @@ +activemq +kafka +zookeeper +swagger-ui +connect-master +couchdb +backend +nginx +kafka-rest +testarchetype \ No newline at end of file diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/development/.env b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/development/env similarity index 100% rename from archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/development/.env rename to archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/development/env diff --git a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/src/main/java/config/Config.java b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/src/main/java/config/Config.java index e742629bca..9190408b60 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/src/main/java/config/Config.java +++ b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/src/main/java/config/Config.java @@ -13,15 +13,13 @@ public enum Config implements PeConfig { private SpConfig config; public static final String JAR_FILE = "./streampipes-processing-element-container.jar"; - private final static String service_id = "pe/${package}"; - private final static String service_name = "${packageName}"; - private final static String service_container_name = "${artifactId}"; + private final static String SERVICE_ID = "pe/${package}"; Config() { - config = SpConfig.getSpConfig(service_id); + config = SpConfig.getSpConfig(SERVICE_ID); - config.register(ConfigKeys.HOST, service_container_name, "Hostname for the pe mixed flink component"); + config.register(ConfigKeys.HOST, "${artifactId}", "Hostname for the pe mixed flink component"); config.register(ConfigKeys.PORT, 8090, "Port for the pe mixed flink component"); config.register(ConfigKeys.FLINK_HOST, "jobmanager", "Host for the flink cluster"); config.register(ConfigKeys.FLINK_PORT, 6123, "Port for the flink cluster"); @@ -30,7 +28,7 @@ public enum Config implements PeConfig { config.register(ConfigKeys.DEBUG, false, "When set to true programs are not deployed to cluster, but executed locally"); - config.register(ConfigKeys.SERVICE_NAME, service_name, "The name of the service"); + config.register(ConfigKeys.SERVICE_NAME, "${packageName}", "The name of the service"); } @@ -73,7 +71,7 @@ public boolean getDebug() { @Override public String getId() { - return service_id; + return SERVICE_ID; } @Override diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/META-INF/maven/archetype-metadata.xml index ebfaa43f9c..19f5c9f52d 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -32,7 +32,13 @@ - development/.env + deployment/system + + + + + + development/env diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml index 04003e52cf..1a528c9d0b 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml +++ b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml @@ -1,7 +1,7 @@ version: "2" services: - sinks-brokers-jvm: - image: ${SP_DOCKER_REGISTRY}/streampipes/streampipes-pipeline-elements/sinks-brokers-jvm:${SP_PE_VERSION} + ${artifactId}: + image: ${artifactId} depends_on: - "consul" # ports: diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/system b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/system new file mode 100644 index 0000000000..c703a5bddb --- /dev/null +++ b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/system @@ -0,0 +1,10 @@ +activemq +kafka +zookeeper +swagger-ui +connect-master +couchdb +backend +nginx +kafka-rest +testarchetype \ No newline at end of file diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/src/main/java/config/Config.java b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/src/main/java/config/Config.java index 51cf66e4ae..54b4136bb1 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/src/main/java/config/Config.java +++ b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/src/main/java/config/Config.java @@ -22,7 +22,7 @@ public enum Config implements PeConfig { Config() { config = SpConfig.getSpConfig("pe/${package}"); - config.register(HOST, "${projectName}", "Hostname for the pe sinks"); + config.register(HOST, "${artifactId}", "Hostname for the pe sinks"); config.register(PORT, 8090, "Port for the pe sinks"); config.register(NGINX_HOST, System.getenv("STREAMPIPES_HOST"), "External hostname of " + "StreamPipes Nginx"); diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/META-INF/maven/archetype-metadata.xml index c309cbf6b0..c256857bac 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -23,6 +23,24 @@ Dockerfile + + + + deployment/docker-compose.yml + + + + + + deployment/system + + + + + + development/env + + diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/docker-compose.yml b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/docker-compose.yml new file mode 100644 index 0000000000..1a528c9d0b --- /dev/null +++ b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/docker-compose.yml @@ -0,0 +1,13 @@ +version: "2" +services: + ${artifactId}: + image: ${artifactId} + depends_on: + - "consul" +# ports: +# - "8098:8090" + environment: + - SP_ICON_HOST=${SP_ICON_HOST} + networks: + spnet: + diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/system b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/system new file mode 100644 index 0000000000..c703a5bddb --- /dev/null +++ b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/system @@ -0,0 +1,10 @@ +activemq +kafka +zookeeper +swagger-ui +connect-master +couchdb +backend +nginx +kafka-rest +testarchetype \ No newline at end of file diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/development/env b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/development/env new file mode 100644 index 0000000000..8e0e563301 --- /dev/null +++ b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/development/env @@ -0,0 +1,10 @@ +# Those parameters are used by IntelliJ to set the default consul parameters for development +SP_PORT=6666 +SP_HOST=localhost +SP_ICON_HOST=localhost +SP_KAFKA_HOST=localhost +SP_ZOOKEEPER_HOST=localhost +SP_COUCHDB_HOST=localhost +SP_JMS_HOST=localhost +SP_NGINX_HOST=localhost +SP_NGINX_PORT=8082 \ No newline at end of file diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/src/main/java/config/Config.java b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/src/main/java/config/Config.java index e742629bca..da27036fba 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/src/main/java/config/Config.java +++ b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/src/main/java/config/Config.java @@ -13,15 +13,12 @@ public enum Config implements PeConfig { private SpConfig config; public static final String JAR_FILE = "./streampipes-processing-element-container.jar"; - private final static String service_id = "pe/${package}"; - private final static String service_name = "${packageName}"; - private final static String service_container_name = "${artifactId}"; - + private final static String SERVICE_ID = "pe/${package}"; Config() { - config = SpConfig.getSpConfig(service_id); + config = SpConfig.getSpConfig(SERVICE_ID); - config.register(ConfigKeys.HOST, service_container_name, "Hostname for the pe mixed flink component"); + config.register(ConfigKeys.HOST, "${artifactId}", "Hostname for the pe mixed flink component"); config.register(ConfigKeys.PORT, 8090, "Port for the pe mixed flink component"); config.register(ConfigKeys.FLINK_HOST, "jobmanager", "Host for the flink cluster"); config.register(ConfigKeys.FLINK_PORT, 6123, "Port for the flink cluster"); @@ -30,7 +27,7 @@ public enum Config implements PeConfig { config.register(ConfigKeys.DEBUG, false, "When set to true programs are not deployed to cluster, but executed locally"); - config.register(ConfigKeys.SERVICE_NAME, service_name, "The name of the service"); + config.register(ConfigKeys.SERVICE_NAME, "${packageName}", "The name of the service"); } @@ -73,7 +70,7 @@ public boolean getDebug() { @Override public String getId() { - return service_id; + return SERVICE_ID; } @Override diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/META-INF/maven/archetype-metadata.xml index c309cbf6b0..0a105588e6 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -17,12 +17,30 @@ **/*.java - + Dockerfile + + + + deployment/docker-compose.yml + + + + + + deployment/system + + + + + + development/env + + diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml new file mode 100644 index 0000000000..1a528c9d0b --- /dev/null +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml @@ -0,0 +1,13 @@ +version: "2" +services: + ${artifactId}: + image: ${artifactId} + depends_on: + - "consul" +# ports: +# - "8098:8090" + environment: + - SP_ICON_HOST=${SP_ICON_HOST} + networks: + spnet: + diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/system b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/system new file mode 100644 index 0000000000..c703a5bddb --- /dev/null +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/system @@ -0,0 +1,10 @@ +activemq +kafka +zookeeper +swagger-ui +connect-master +couchdb +backend +nginx +kafka-rest +testarchetype \ No newline at end of file diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/development/env b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/development/env new file mode 100644 index 0000000000..8e0e563301 --- /dev/null +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/development/env @@ -0,0 +1,10 @@ +# Those parameters are used by IntelliJ to set the default consul parameters for development +SP_PORT=6666 +SP_HOST=localhost +SP_ICON_HOST=localhost +SP_KAFKA_HOST=localhost +SP_ZOOKEEPER_HOST=localhost +SP_COUCHDB_HOST=localhost +SP_JMS_HOST=localhost +SP_NGINX_HOST=localhost +SP_NGINX_PORT=8082 \ No newline at end of file diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/config/Config.java b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/config/Config.java index 51cf66e4ae..2d02f2e93a 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/config/Config.java +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/config/Config.java @@ -22,7 +22,7 @@ public enum Config implements PeConfig { Config() { config = SpConfig.getSpConfig("pe/${package}"); - config.register(HOST, "${projectName}", "Hostname for the pe sinks"); + config.register(HOST, ""${artifactId}"", "Hostname for the pe sinks"); config.register(PORT, 8090, "Port for the pe sinks"); config.register(NGINX_HOST, System.getenv("STREAMPIPES_HOST"), "External hostname of " + "StreamPipes Nginx"); From c20909ee310277c208f764182f239c5caee0f73f Mon Sep 17 00:00:00 2001 From: Philipp Zehnder Date: Mon, 26 Nov 2018 10:37:31 +0100 Subject: [PATCH 14/18] Fix archetypes --- .../archetype-resources/deployment/system | 1 + .../archetype-resources/deployment/system | 1 + .../META-INF/maven/archetype-metadata.xml | 2 +- .../archetype-resources/deployment/system | 1 + .../main/resources/archetype-resources/pom.xml | 15 +++++++++++++++ .../src/main/java/main/Init.java | 9 +++++++++ .../archetype-resources/deployment/system | 1 + .../src/main/java/config/Config.java | 2 +- .../src/main/java/main/Init.java | 2 +- .../__classNamePrefix__Controller.java | 2 +- 10 files changed, 32 insertions(+), 4 deletions(-) diff --git a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/system b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/system index c703a5bddb..8bfd130513 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/system +++ b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/system @@ -3,6 +3,7 @@ kafka zookeeper swagger-ui connect-master +connect-worker couchdb backend nginx diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/system b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/system index c703a5bddb..8bfd130513 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/system +++ b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/system @@ -3,6 +3,7 @@ kafka zookeeper swagger-ui connect-master +connect-worker couchdb backend nginx diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/META-INF/maven/archetype-metadata.xml index c256857bac..0a105588e6 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -17,7 +17,7 @@ **/*.java - + Dockerfile diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/system b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/system index c703a5bddb..8bfd130513 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/system +++ b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/deployment/system @@ -3,6 +3,7 @@ kafka zookeeper swagger-ui connect-master +connect-worker couchdb backend nginx diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/pom.xml b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/pom.xml index 5a80f20dd8..b5395f5224 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/pom.xml @@ -81,6 +81,21 @@ streampipes-config ${sp.version} + + org.streampipes + streampipes-dataformat-json + ${sp.version} + + + org.streampipes + streampipes-messaging-kafka + ${sp.version} + + + org.streampipes + streampipes-messaging-jms + ${sp.version} + diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/src/main/java/main/Init.java b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/src/main/java/main/Init.java index 9886522bb5..956c1aa998 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/src/main/java/main/Init.java +++ b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/src/main/java/main/Init.java @@ -5,6 +5,9 @@ import org.streampipes.container.init.DeclarersSingleton; import org.streampipes.container.standalone.init.StandaloneModelSubmitter; +import org.streampipes.dataformat.json.JsonDataFormatFactory; +import org.streampipes.messaging.kafka.SpKafkaProtocolFactory; + import ${package}.config.Config; import ${package}.pe.sink.${packageName}.${classNamePrefix}Controller; @@ -15,6 +18,12 @@ public static void main(String[] args) throws Exception { DeclarersSingleton.getInstance() .add(new ${classNamePrefix}Controller()); + DeclarersSingleton.getInstance().setPort(Config.INSTANCE.getPort()); + DeclarersSingleton.getInstance().setHostName(Config.INSTANCE.getHost()); + + DeclarersSingleton.getInstance().registerDataFormat(new JsonDataFormatFactory()); + DeclarersSingleton.getInstance().registerProtocol(new SpKafkaProtocolFactory()); + new Init().init(Config.INSTANCE); } diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/system b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/system index c703a5bddb..8bfd130513 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/system +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/deployment/system @@ -3,6 +3,7 @@ kafka zookeeper swagger-ui connect-master +connect-worker couchdb backend nginx diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/config/Config.java b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/config/Config.java index 2d02f2e93a..54b4136bb1 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/config/Config.java +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/config/Config.java @@ -22,7 +22,7 @@ public enum Config implements PeConfig { Config() { config = SpConfig.getSpConfig("pe/${package}"); - config.register(HOST, ""${artifactId}"", "Hostname for the pe sinks"); + config.register(HOST, "${artifactId}", "Hostname for the pe sinks"); config.register(PORT, 8090, "Port for the pe sinks"); config.register(NGINX_HOST, System.getenv("STREAMPIPES_HOST"), "External hostname of " + "StreamPipes Nginx"); diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/main/Init.java b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/main/Init.java index c36e4dec52..d0fbdcfaa9 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/main/Init.java +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/main/Init.java @@ -9,7 +9,7 @@ import org.streampipes.messaging.kafka.SpKafkaProtocolFactory; import ${package}.config.Config; -import ${package}.pe.processor.${packageName}.${classNamePrefix}Controller; +import ${package}.pe.sink.${packageName}.${classNamePrefix}Controller; public class Init extends StandaloneModelSubmitter { diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/pe/sink/__packageName__/__classNamePrefix__Controller.java b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/pe/sink/__packageName__/__classNamePrefix__Controller.java index 1046dce9b7..321c0a8d01 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/pe/sink/__packageName__/__classNamePrefix__Controller.java +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java/pe/sink/__packageName__/__classNamePrefix__Controller.java @@ -36,7 +36,7 @@ public DataSinkDescription declareModel() { } @Override - public ConfiguredEventSink<${classNamePrefix}Parameters> onInvocation(DataSinkInvocation graph) { + public ConfiguredEventSink<${classNamePrefix}Parameters> onInvocation(DataSinkInvocation graph, DataSinkParameterExtractor extractor) { String exampleString = extractor.singleValueParameter(EXAMPLE_KEY, String.class); From 7b224dd008f6bd98103323ad51b43c4bf274d111 Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Tue, 27 Nov 2018 21:13:25 +0100 Subject: [PATCH 15/18] Activate maven gpg plugin --- pom.xml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index cb00e8daee..37bf8f004a 100644 --- a/pom.xml +++ b/pom.xml @@ -648,26 +648,26 @@ false - - - - - - - - - - - - - - - - - - - - + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + --pinentry-mode + loopback + + + org.apache.maven.plugins maven-jar-plugin From 8e92ea2a480403bc2835b6bf25ff8ece86c73c7a Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Tue, 27 Nov 2018 21:39:09 +0100 Subject: [PATCH 16/18] Add streampipes connect to docker hub release stage --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e84d361946..dec39c13c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -183,6 +183,9 @@ docker hub: - docker push streampipes/backend:$MVN_VERSION - docker build --pull -t streampipes/backend ./streampipes-backend/ - docker push streampipes/backend + - docker build --pull -t streampipes/streampipes-connect-container:latest -t streampipes/streampipes-connect-container:$MVN_VERSION ./streampipes-connect-container/ + - docker push streampipes/streampipes-connect-container:$MVN_VERSION + - docker push streampipes/streampipes-connect-container:latest when: manual only: - master From a3d6e7a4451f20c793ebee720e9ff2981659ef5a Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Tue, 27 Nov 2018 21:42:38 +0100 Subject: [PATCH 17/18] Modify sp.version of archetypes --- .../src/main/resources/archetype-resources/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 13 ++++++++++++- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/pom.xml b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/pom.xml index 5a80f20dd8..a8f0b08be9 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/pom.xml @@ -7,7 +7,7 @@ ${version} - 0.55.3-SNAPSHOT + 0.60.1 diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/pom.xml b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/pom.xml index 3ce1679429..c11ea7949e 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/pom.xml @@ -7,7 +7,7 @@ ${version} - 0.55.3-SNAPSHOT + 0.60.1 diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/pom.xml b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/pom.xml index b5395f5224..7cf8490892 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/pom.xml @@ -7,7 +7,7 @@ ${version} - 0.55.3-SNAPSHOT + 0.60.1 diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/pom.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/pom.xml index 3ce1679429..c11ea7949e 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/pom.xml @@ -7,7 +7,7 @@ ${version} - 0.55.3-SNAPSHOT + 0.60.1 diff --git a/archetypes/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/pom.xml b/archetypes/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/pom.xml index f10d8ce531..e61b505e13 100644 --- a/archetypes/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/pom.xml @@ -6,39 +6,50 @@ ${artifactId} ${version} + + 0.60.1 + + org.streampipes streampipes-commons + ${sp.version} org.streampipes streampipes-messaging-kafka + ${sp.version} org.streampipes streampipes-messaging-jms + ${sp.version} org.streampipes streampipes-dataformat-json + ${sp.version} org.streampipes streampipes-wrapper-standalone + ${sp.version} org.streampipes streampipes-container-standalone + ${sp.version} org.streampipes streampipes-sdk + ${sp.version} org.streampipes streampipes-config - ${version} + ${sp.version} From 31636f94ef809165a64c62278319c8314075ef9c Mon Sep 17 00:00:00 2001 From: zehnder Date: Tue, 27 Nov 2018 20:54:19 +0000 Subject: [PATCH 18/18] [RELEASE] [skip-ci]updating poms for branch'release-0.60.1' with non-snapshot versions --- archetypes/streampipes-archetype-pe-processors-flink/pom.xml | 2 +- archetypes/streampipes-archetype-pe-processors-jvm/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sinks-flink/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sources/pom.xml | 2 +- pom.xml | 2 +- streampipes-app-file-export/pom.xml | 2 +- streampipes-backend/pom.xml | 2 +- streampipes-code-generation/pom.xml | 2 +- streampipes-commons/pom.xml | 2 +- streampipes-config/pom.xml | 2 +- streampipes-connect-container/pom.xml | 2 +- streampipes-connect/pom.xml | 2 +- streampipes-container-embedded/pom.xml | 2 +- streampipes-container-standalone/pom.xml | 2 +- streampipes-container/pom.xml | 2 +- streampipes-dataformat-json/pom.xml | 2 +- streampipes-dataformat/pom.xml | 2 +- streampipes-logging/pom.xml | 2 +- streampipes-measurement-units/pom.xml | 2 +- streampipes-messaging-jms/pom.xml | 2 +- streampipes-messaging-kafka/pom.xml | 2 +- streampipes-messaging/pom.xml | 2 +- streampipes-model-client/pom.xml | 2 +- streampipes-model/pom.xml | 2 +- streampipes-performance-tests/pom.xml | 2 +- streampipes-pipeline-management/pom.xml | 2 +- streampipes-rest-shared/pom.xml | 2 +- streampipes-rest/pom.xml | 2 +- streampipes-sdk/pom.xml | 2 +- streampipes-serializers/pom.xml | 2 +- streampipes-sources/pom.xml | 2 +- streampipes-storage-api/pom.xml | 2 +- streampipes-storage-couchdb/pom.xml | 2 +- streampipes-storage-management/pom.xml | 2 +- streampipes-storage-rdf4j/pom.xml | 2 +- streampipes-test-utils/pom.xml | 2 +- streampipes-user-management/pom.xml | 2 +- streampipes-vocabulary/pom.xml | 2 +- streampipes-wrapper-distributed/pom.xml | 2 +- streampipes-wrapper-esper/pom.xml | 2 +- streampipes-wrapper-flink/pom.xml | 2 +- streampipes-wrapper-kafka-streams/pom.xml | 2 +- streampipes-wrapper-siddhi/pom.xml | 2 +- streampipes-wrapper-spark/pom.xml | 2 +- streampipes-wrapper-standalone/pom.xml | 2 +- streampipes-wrapper/pom.xml | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml index c687b9c298..95c5a210fa 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 ../../pom.xml streampipes-archetype-pe-processors-flink diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml index 9119e2a429..efefedc169 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 ../../pom.xml streampipes-archetype-pe-processors-jvm diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml index 592898bf83..8065c83c2a 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 ../../pom.xml streampipes-archetype-pe-sinks-flink diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml index 138a6ee0c3..5f997c3e9a 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 ../../pom.xml streampipes-archetype-pe-sinks-jvm diff --git a/archetypes/streampipes-archetype-pe-sources/pom.xml b/archetypes/streampipes-archetype-pe-sources/pom.xml index 2001726a84..183f039b9c 100644 --- a/archetypes/streampipes-archetype-pe-sources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sources/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 ../../pom.xml streampipes-archetype-pe-sources diff --git a/pom.xml b/pom.xml index 37bf8f004a..cc6d50f91e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 pom UTF-8 diff --git a/streampipes-app-file-export/pom.xml b/streampipes-app-file-export/pom.xml index a9a458ed59..59f0d87dde 100644 --- a/streampipes-app-file-export/pom.xml +++ b/streampipes-app-file-export/pom.xml @@ -21,7 +21,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 StreamPipes App File Export streampipes-app-file-export diff --git a/streampipes-backend/pom.xml b/streampipes-backend/pom.xml index 1fb39f1eec..5b5eb4bcc4 100644 --- a/streampipes-backend/pom.xml +++ b/streampipes-backend/pom.xml @@ -3,7 +3,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 streampipes-backend war diff --git a/streampipes-code-generation/pom.xml b/streampipes-code-generation/pom.xml index ab133b4d93..bf68bcaaa5 100644 --- a/streampipes-code-generation/pom.xml +++ b/streampipes-code-generation/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 streampipes-code-generation diff --git a/streampipes-commons/pom.xml b/streampipes-commons/pom.xml index a8a8dbd0e6..4163812579 100644 --- a/streampipes-commons/pom.xml +++ b/streampipes-commons/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 streampipes-commons StreamPipes Commons diff --git a/streampipes-config/pom.xml b/streampipes-config/pom.xml index ee2ff80b67..6ec7467d68 100644 --- a/streampipes-config/pom.xml +++ b/streampipes-config/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-connect-container/pom.xml b/streampipes-connect-container/pom.xml index 389828aefb..8d2807d78c 100644 --- a/streampipes-connect-container/pom.xml +++ b/streampipes-connect-container/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-connect/pom.xml b/streampipes-connect/pom.xml index 4d9d2a4d62..439824b9ac 100755 --- a/streampipes-connect/pom.xml +++ b/streampipes-connect/pom.xml @@ -3,7 +3,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-container-embedded/pom.xml b/streampipes-container-embedded/pom.xml index 3f6315a149..530955fe38 100644 --- a/streampipes-container-embedded/pom.xml +++ b/streampipes-container-embedded/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 streampipes-container-embedded jar diff --git a/streampipes-container-standalone/pom.xml b/streampipes-container-standalone/pom.xml index ec7094f855..8b99ab6bd7 100644 --- a/streampipes-container-standalone/pom.xml +++ b/streampipes-container-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-container/pom.xml b/streampipes-container/pom.xml index b17e5339e6..8c58c09184 100644 --- a/streampipes-container/pom.xml +++ b/streampipes-container/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 streampipes-container Large scale event processing agents with semantic checking for combinability. diff --git a/streampipes-dataformat-json/pom.xml b/streampipes-dataformat-json/pom.xml index 9518c09540..dda530a4b5 100644 --- a/streampipes-dataformat-json/pom.xml +++ b/streampipes-dataformat-json/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-dataformat/pom.xml b/streampipes-dataformat/pom.xml index 2a7c738eaf..81bd50b482 100644 --- a/streampipes-dataformat/pom.xml +++ b/streampipes-dataformat/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-logging/pom.xml b/streampipes-logging/pom.xml index a84f084db1..a8541f6f5b 100644 --- a/streampipes-logging/pom.xml +++ b/streampipes-logging/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-measurement-units/pom.xml b/streampipes-measurement-units/pom.xml index 9be4cc7cd2..df7a98e2f6 100644 --- a/streampipes-measurement-units/pom.xml +++ b/streampipes-measurement-units/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 streampipes-measurement-units diff --git a/streampipes-messaging-jms/pom.xml b/streampipes-messaging-jms/pom.xml index 9070f0886d..2113ef9921 100644 --- a/streampipes-messaging-jms/pom.xml +++ b/streampipes-messaging-jms/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-messaging-kafka/pom.xml b/streampipes-messaging-kafka/pom.xml index 3c0e715680..f360876c96 100644 --- a/streampipes-messaging-kafka/pom.xml +++ b/streampipes-messaging-kafka/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-messaging/pom.xml b/streampipes-messaging/pom.xml index 2c5289958f..bdadcf0b50 100644 --- a/streampipes-messaging/pom.xml +++ b/streampipes-messaging/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-model-client/pom.xml b/streampipes-model-client/pom.xml index 79da5b4d37..253ee8dbb4 100644 --- a/streampipes-model-client/pom.xml +++ b/streampipes-model-client/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 streampipes-model-client jar diff --git a/streampipes-model/pom.xml b/streampipes-model/pom.xml index fb0a6504bb..6e8236949d 100644 --- a/streampipes-model/pom.xml +++ b/streampipes-model/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 diff --git a/streampipes-performance-tests/pom.xml b/streampipes-performance-tests/pom.xml index d093770560..0b6094ccd3 100644 --- a/streampipes-performance-tests/pom.xml +++ b/streampipes-performance-tests/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-pipeline-management/pom.xml b/streampipes-pipeline-management/pom.xml index 0a15a2b72d..f65b66ba76 100644 --- a/streampipes-pipeline-management/pom.xml +++ b/streampipes-pipeline-management/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 streampipes-pipeline-management diff --git a/streampipes-rest-shared/pom.xml b/streampipes-rest-shared/pom.xml index 57321d0a8e..a493beef3d 100644 --- a/streampipes-rest-shared/pom.xml +++ b/streampipes-rest-shared/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-rest/pom.xml b/streampipes-rest/pom.xml index 1c00f7f128..6bc23eca42 100644 --- a/streampipes-rest/pom.xml +++ b/streampipes-rest/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 StreamPipes REST API streampipes-rest diff --git a/streampipes-sdk/pom.xml b/streampipes-sdk/pom.xml index 97b62f3ff6..2f48060a46 100644 --- a/streampipes-sdk/pom.xml +++ b/streampipes-sdk/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-serializers/pom.xml b/streampipes-serializers/pom.xml index f036f5f57b..77de1cf3f8 100644 --- a/streampipes-serializers/pom.xml +++ b/streampipes-serializers/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-sources/pom.xml b/streampipes-sources/pom.xml index 0d45a84746..383e9d1f31 100644 --- a/streampipes-sources/pom.xml +++ b/streampipes-sources/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 streampipes-sources diff --git a/streampipes-storage-api/pom.xml b/streampipes-storage-api/pom.xml index d27f98f991..12198d7322 100644 --- a/streampipes-storage-api/pom.xml +++ b/streampipes-storage-api/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 streampipes-storage-api jar diff --git a/streampipes-storage-couchdb/pom.xml b/streampipes-storage-couchdb/pom.xml index e33120e3af..dee780f25b 100644 --- a/streampipes-storage-couchdb/pom.xml +++ b/streampipes-storage-couchdb/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-storage-management/pom.xml b/streampipes-storage-management/pom.xml index a32e4b74af..f582a1a89a 100644 --- a/streampipes-storage-management/pom.xml +++ b/streampipes-storage-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-storage-rdf4j/pom.xml b/streampipes-storage-rdf4j/pom.xml index 17153ed528..22a3f663de 100644 --- a/streampipes-storage-rdf4j/pom.xml +++ b/streampipes-storage-rdf4j/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-test-utils/pom.xml b/streampipes-test-utils/pom.xml index 485398f6b3..0ca48dcddf 100644 --- a/streampipes-test-utils/pom.xml +++ b/streampipes-test-utils/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-user-management/pom.xml b/streampipes-user-management/pom.xml index 391306c3c6..4f2c215a80 100644 --- a/streampipes-user-management/pom.xml +++ b/streampipes-user-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-vocabulary/pom.xml b/streampipes-vocabulary/pom.xml index 1f12231fc5..65508f258a 100644 --- a/streampipes-vocabulary/pom.xml +++ b/streampipes-vocabulary/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-wrapper-distributed/pom.xml b/streampipes-wrapper-distributed/pom.xml index 576c51515f..b9ba18c3ad 100644 --- a/streampipes-wrapper-distributed/pom.xml +++ b/streampipes-wrapper-distributed/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-wrapper-esper/pom.xml b/streampipes-wrapper-esper/pom.xml index 99f2bbc19f..06e3d68cf1 100644 --- a/streampipes-wrapper-esper/pom.xml +++ b/streampipes-wrapper-esper/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-wrapper-flink/pom.xml b/streampipes-wrapper-flink/pom.xml index 95f0d67733..6f263110ea 100644 --- a/streampipes-wrapper-flink/pom.xml +++ b/streampipes-wrapper-flink/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 streampipes-wrapper-flink StreamPipes Wrapper for Apache Flink diff --git a/streampipes-wrapper-kafka-streams/pom.xml b/streampipes-wrapper-kafka-streams/pom.xml index 1b39decc99..d2316de077 100644 --- a/streampipes-wrapper-kafka-streams/pom.xml +++ b/streampipes-wrapper-kafka-streams/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-wrapper-siddhi/pom.xml b/streampipes-wrapper-siddhi/pom.xml index fb3ac96060..d696c9390f 100644 --- a/streampipes-wrapper-siddhi/pom.xml +++ b/streampipes-wrapper-siddhi/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.60.1-SNAPSHOT + 0.60.1 4.0.0 diff --git a/streampipes-wrapper-spark/pom.xml b/streampipes-wrapper-spark/pom.xml index a0a7c840ce..10e936f9df 100644 --- a/streampipes-wrapper-spark/pom.xml +++ b/streampipes-wrapper-spark/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 streampipes-wrapper-spark diff --git a/streampipes-wrapper-standalone/pom.xml b/streampipes-wrapper-standalone/pom.xml index 7778039590..ad8ed0c520 100644 --- a/streampipes-wrapper-standalone/pom.xml +++ b/streampipes-wrapper-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 streampipes-wrapper-standalone StreamPipes Wrapper for Standalone Pipeline Element Implementations diff --git a/streampipes-wrapper/pom.xml b/streampipes-wrapper/pom.xml index 0dab95a0ff..476d0287cf 100644 --- a/streampipes-wrapper/pom.xml +++ b/streampipes-wrapper/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.60.1-SNAPSHOT + 0.60.1 streampipes-wrapper