You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/05/05 11:29:33 UTC
[incubator-streampipes] branch dev updated (bd4cc84 -> 50d29ea)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from bd4cc84 Modify release settings in pom
new a7358a1 Cleanup properties files
new 12a66b8 Update package.json
new 3716ae0 Fix bug in app overview module
new e353e36 Add NotificationCount view to installation process
new 82ec877 Import Roboto font in angular.json
new 50d29ea Add assembly profile
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../resources/projects/basic/archetype.properties | 25 -------
.../resources/projects/basic/archetype.properties | 25 -------
.../resources/projects/basic/archetype.properties | 25 -------
.../resources/projects/basic/archetype.properties | 25 -------
.../src/test/resources/projects/basic/goal.txt | 0
pom.xml | 11 +++
.../manager/setup/CouchDbInstallationStep.java | 31 ++++++--
tools/maven/assembly.xml | 82 ++++++++++++++++++++++
ui/Dockerfile | 2 +-
ui/angular.json | 3 +-
ui/package.json | 71 ++++++++++---------
.../app/app-overview/app-overview.component.html | 2 -
ui/src/assets/fonts/Roboto-Regular.css | 2 +-
13 files changed, 158 insertions(+), 146 deletions(-)
delete mode 100644 archetypes/streampipes-archetype-pe-processors-flink/src/test/resources/projects/basic/archetype.properties
delete mode 100644 archetypes/streampipes-archetype-pe-processors-jvm/src/test/resources/projects/basic/archetype.properties
delete mode 100644 archetypes/streampipes-archetype-pe-sinks-flink/src/test/resources/projects/basic/archetype.properties
delete mode 100644 archetypes/streampipes-archetype-pe-sinks-jvm/src/test/resources/projects/basic/archetype.properties
delete mode 100644 archetypes/streampipes-archetype-pe-sinks-jvm/src/test/resources/projects/basic/goal.txt
create mode 100644 tools/maven/assembly.xml
[incubator-streampipes] 03/06: Fix bug in app overview module
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 3716ae0c7d3d38aa22e664777faee2f0ee9f7049
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sun May 3 21:08:45 2020 +0200
Fix bug in app overview module
---
ui/src/app/app-overview/app-overview.component.html | 2 --
1 file changed, 2 deletions(-)
diff --git a/ui/src/app/app-overview/app-overview.component.html b/ui/src/app/app-overview/app-overview.component.html
index dd3b8f6..f358675 100644
--- a/ui/src/app/app-overview/app-overview.component.html
+++ b/ui/src/app/app-overview/app-overview.component.html
@@ -49,6 +49,4 @@
</div>
<app-asset-monitoring (appOpened)="appOpened($event)"
*ngIf="currentlySelectedApp === apps[0].appId"></app-asset-monitoring>
- <app-transport-monitoring (appOpened)="appOpened($event)"
- *ngIf="currentlySelectedApp === apps[1].appId"></app-transport-monitoring>
</div>
[incubator-streampipes] 02/06: Update package.json
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 12a66b8bdbb07a0a292de40168544cc237093e12
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sun May 3 21:05:26 2020 +0200
Update package.json
---
ui/package.json | 71 +++++++++++++++++++++++++++++----------------------------
1 file changed, 36 insertions(+), 35 deletions(-)
diff --git a/ui/package.json b/ui/package.json
index 21dbb10..7b7820c 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -28,16 +28,16 @@
"@angular/platform-browser-dynamic": "9.0.5",
"@angular/router": "9.0.5",
"@angular/upgrade": "9.0.5",
- "@asymmetrik/ngx-leaflet": "^6.0.1",
- "@fortawesome/fontawesome-free": "^5.12.1",
+ "@asymmetrik/ngx-leaflet": "6.0.1",
+ "@fortawesome/fontawesome-free": "5.12.1",
"@ngui/datetime-picker": "0.16.2",
- "@stomp/ng2-stompjs": "^7.2.0",
- "@swimlane/ngx-charts": "^13.0.2",
+ "@stomp/ng2-stompjs": "7.2.0",
+ "@swimlane/ngx-charts": "13.0.2",
"@uirouter/angular-hybrid": "10.0.1",
"@uirouter/core": "6.0.4",
- "@uirouter/angular": "^6.0.1",
- "@uirouter/angularjs": "^1.0.25",
- "@uirouter/rx": "^0.6.5",
+ "@uirouter/angular": "6.0.1",
+ "@uirouter/angularjs": "1.0.25",
+ "@uirouter/rx": "0.6.5",
"angular": "1.7.7",
"angular-animate": "1.7.7",
"angular-aria": "1.7.7",
@@ -58,51 +58,52 @@
"angular-sanitize": "1.7.7",
"angular-slick-carousel": "3.1.7",
"angular-touch": "1.7.7",
- "angular-tree-component": "^8.4.0",
- "angular-trix": "^1.0.2",
+ "angular-tree-component": "8.5.6",
+ "angular-trix": "1.0.2",
"angular-ui-bootstrap": "0.14.3",
"angular-ui-sortable": "0.13.4",
"angular-ui-tree": "2.9.0",
- "angular2-uuid": "^1.1.1",
+ "angular2-uuid": "1.1.1",
"angularjs-datetime-picker": "0.1.16",
"bootstrap": "3.3.4",
- "calendar-heatmap-graph": "^0.0.14",
- "core-js": "^2.5.3",
- "dagre": "^0.8.4",
- "fast-json-patch": "^2.1.0",
- "file-saver": "^1.3.8",
+ "calendar-heatmap-graph": "0.0.14",
+ "core-js": "2.5.3",
+ "dagre": "0.8.4",
+ "fast-json-patch": "2.1.0",
+ "file-saver": "1.3.8",
"jquery": "2.1.3",
- "jquery-ui-dist": "^1.12.1",
+ "jquery-ui-dist": "1.12.1",
"jquery.panzoom": "2.0.5",
- "datatables.net": "^1.10.20",
+ "datatables.net": "1.10.20",
"jsonld": "0.4.12",
"jsplumb": "2.1.3",
- "jszip": "^3.2.1",
- "konva": "^3.2.4",
- "leaflet": "^1.6.0",
+ "jszip": "3.2.1",
+ "konva": "3.2.4",
+ "leaflet": "1.6.0",
"lodash": "3.10.1",
- "material-design-icons": "^3.0.1",
+ "material-design-icons": "3.0.1",
"ng-dynamic-component": "4.0.3",
"ng-file-upload": "9.0.13",
- "@danielmoncada/angular-datetime-picker": "^9.2.0",
+ "@danielmoncada/angular-datetime-picker": "9.2.0",
+ "moment": "2.24.0",
"ng-prettyjson": "0.1.8",
- "ng-showdown": "^1.1.0",
- "ng-simple-slideshow": "^1.2.9",
- "ng2-charts": "^2.0.3",
- "ng2-dragula": "^1.5.0",
+ "ng-showdown": "1.1.0",
+ "ng-simple-slideshow": "1.2.9",
+ "ng2-charts": "2.0.3",
+ "ng2-dragula": "1.5.0",
"ngmap": "1.18.0",
- "ngx-color-picker": "^9.0.0",
- "plotly.js": "^1.52.2",
- "prismjs": "^1.16.0",
- "rxjs": "^6.3.3",
- "rxjs-compat": "^6.3.3",
+ "ngx-color-picker": "9.0.0",
+ "plotly.js": "1.52.2",
+ "prismjs": "1.16.0",
+ "rxjs": "6.3.3",
+ "rxjs-compat": "6.3.3",
"shepherd.js": "2.4.0",
"slick-carousel": "1.6.0",
- "systemjs": "^0.21.6",
- "tslib": "^1.10.0",
- "ng-pick-datetime": "^7.0.0",
+ "systemjs": "0.21.6",
+ "tslib": "1.10.0",
+ "ng-pick-datetime": "7.0.0",
"trix": "0.10.1",
- "zone.js": "~0.10.2"
+ "zone.js": "0.10.2"
},
"devDependencies": {
"@angular-builders/custom-webpack": "^8.4.1",
[incubator-streampipes] 04/06: Add NotificationCount view to
installation process
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit e353e36d3806c824a5490842777c1d68a5509c08
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sun May 3 21:33:34 2020 +0200
Add NotificationCount view to installation process
---
.../manager/setup/CouchDbInstallationStep.java | 31 +++++++++++++++++-----
1 file changed, 25 insertions(+), 6 deletions(-)
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/CouchDbInstallationStep.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/CouchDbInstallationStep.java
index 2dc0051..fac9eb8 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/CouchDbInstallationStep.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/CouchDbInstallationStep.java
@@ -103,17 +103,36 @@ public class CouchDbInstallationStep implements InstallationStep {
private Message addNotificationView() {
try {
DesignDocument userDocument = prepareDocument("_design/notificationtypes");
- Map<String, MapReduce> views = new HashMap<>();
+ DesignDocument notificationCountDocument = prepareDocument("_design/unread");
+ Map<String, MapReduce> notificationTypeViews = new HashMap<>();
MapReduce notificationTypeFunction = new MapReduce();
notificationTypeFunction.setMap("function (doc) { var vizName = doc.title.replace(/\\s/g, '-'); var indexName = doc.correspondingPipelineId + '-' + vizName; emit([indexName, doc.createdAtTimestamp], doc);}");
-
- views.put("notificationtypes", notificationTypeFunction);
-
- userDocument.setViews(views);
+ notificationTypeViews.put("notificationtypes", notificationTypeFunction);
+ userDocument.setViews(notificationTypeViews);
Response resp = Utils.getCouchDbNotificationClient().design().synchronizeWithDb(userDocument);
- if (resp.getError() != null) return Notifications.error(PREPARING_NOTIFICATIONS_TEXT);
+ Map<String, MapReduce> notificationCountTypeViews = new HashMap<>();
+ MapReduce countFunction = new MapReduce();
+ countFunction.setMap("function (doc) {\n" +
+ " var user = doc.targetedAt; \n" +
+ " if (!doc.read) {\n" +
+ " emit(user, 1);\n" +
+ " }\n" +
+ "}");
+ countFunction.setReduce("function (keys, values, rereduce) {\n" +
+ " if (rereduce) {\n" +
+ " return sum(values);\n" +
+ " } else {\n" +
+ " return values.length;\n" +
+ " }\n" +
+ "}");
+ notificationCountTypeViews.put("unread", countFunction);
+ notificationCountDocument.setViews(notificationCountTypeViews);
+ Response countResp =
+ Utils.getCouchDbNotificationClient().design().synchronizeWithDb(notificationCountDocument);
+
+ if (resp.getError() != null && countResp != null) return Notifications.error(PREPARING_NOTIFICATIONS_TEXT);
else return Notifications.success(PREPARING_NOTIFICATIONS_TEXT);
} catch (Exception e) {
return Notifications.error(PREPARING_NOTIFICATIONS_TEXT);
[incubator-streampipes] 01/06: Cleanup properties files
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit a7358a172d641152ae2f5c7d5f1f59f042e4fe22
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sun May 3 19:28:27 2020 +0200
Cleanup properties files
---
.../resources/projects/basic/archetype.properties | 25 ----------------------
.../resources/projects/basic/archetype.properties | 25 ----------------------
.../resources/projects/basic/archetype.properties | 25 ----------------------
.../resources/projects/basic/archetype.properties | 25 ----------------------
.../src/test/resources/projects/basic/goal.txt | 0
5 files changed, 100 deletions(-)
diff --git a/archetypes/streampipes-archetype-pe-processors-flink/src/test/resources/projects/basic/archetype.properties b/archetypes/streampipes-archetype-pe-processors-flink/src/test/resources/projects/basic/archetype.properties
deleted file mode 100644
index 2c7da24..0000000
--- a/archetypes/streampipes-archetype-pe-processors-flink/src/test/resources/projects/basic/archetype.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-#Tue Nov 21 10:33:48 CET 2017
-package=org.apache.streampipes.test
-version=0.1-SNAPSHOT
-groupId=test-pe
-artifactId=basic
-classNamePrefix=Example
-packageName=example
diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/test/resources/projects/basic/archetype.properties b/archetypes/streampipes-archetype-pe-processors-jvm/src/test/resources/projects/basic/archetype.properties
deleted file mode 100644
index 2c7da24..0000000
--- a/archetypes/streampipes-archetype-pe-processors-jvm/src/test/resources/projects/basic/archetype.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-#Tue Nov 21 10:33:48 CET 2017
-package=org.apache.streampipes.test
-version=0.1-SNAPSHOT
-groupId=test-pe
-artifactId=basic
-classNamePrefix=Example
-packageName=example
diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/test/resources/projects/basic/archetype.properties b/archetypes/streampipes-archetype-pe-sinks-flink/src/test/resources/projects/basic/archetype.properties
deleted file mode 100644
index 2c7da24..0000000
--- a/archetypes/streampipes-archetype-pe-sinks-flink/src/test/resources/projects/basic/archetype.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-#Tue Nov 21 10:33:48 CET 2017
-package=org.apache.streampipes.test
-version=0.1-SNAPSHOT
-groupId=test-pe
-artifactId=basic
-classNamePrefix=Example
-packageName=example
diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/test/resources/projects/basic/archetype.properties b/archetypes/streampipes-archetype-pe-sinks-jvm/src/test/resources/projects/basic/archetype.properties
deleted file mode 100644
index 2c7da24..0000000
--- a/archetypes/streampipes-archetype-pe-sinks-jvm/src/test/resources/projects/basic/archetype.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-#Tue Nov 21 10:33:48 CET 2017
-package=org.apache.streampipes.test
-version=0.1-SNAPSHOT
-groupId=test-pe
-artifactId=basic
-classNamePrefix=Example
-packageName=example
diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/test/resources/projects/basic/goal.txt b/archetypes/streampipes-archetype-pe-sinks-jvm/src/test/resources/projects/basic/goal.txt
deleted file mode 100644
index e69de29..0000000
[incubator-streampipes] 06/06: Add assembly profile
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 50d29ea3d28a4bf7e3bd898f1d214ceb98ae01d1
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Tue May 5 13:22:19 2020 +0200
Add assembly profile
---
pom.xml | 11 +++++++
tools/maven/assembly.xml | 82 ++++++++++++++++++++++++++++++++++++++++++++++++
ui/Dockerfile | 2 +-
3 files changed, 94 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 47cc799..5473e71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -941,6 +941,17 @@
<version>3.2.0</version>
<configuration>
<finalName>apache-streampipes-${project.version}-incubating</finalName>
+ <descriptors>
+ <descriptor>tools/maven/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>net.revelc.code.formatter</groupId>
+ <artifactId>formatter-maven-plugin</artifactId>
+ <version>2.11.0</version>
+ <configuration>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
</plugins>
diff --git a/tools/maven/assembly.xml b/tools/maven/assembly.xml
new file mode 100644
index 0000000..81e9990
--- /dev/null
+++ b/tools/maven/assembly.xml
@@ -0,0 +1,82 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>source</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <!-- main project directory structure -->
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory></outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <!-- build output -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
+
+ <!-- NOTE: Most of the following excludes should not be required
+ if the standard release process is followed. This is because the
+ release plugin checks out project sources into a location like
+ target/checkout, then runs the build from there. The result is
+ a source-release archive that comes from a pretty clean directory
+ structure.
+
+ HOWEVER, if the release plugin is configured to run extra goals
+ or generate a project website, it's definitely possible that some
+ of these files will be present. So, it's safer to exclude them.
+ -->
+
+ <!-- IDEs -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?out(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
+
+ <!-- misc -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
+
+ <!-- release-plugin temp files -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>.</directory>
+ <includes>
+ <include>**/*.sh</include>
+ </includes>
+ <lineEnding>lf</lineEnding>
+ <fileMode>755</fileMode>
+ </fileSet>
+ <!-- license, readme, etc. calculated at build time -->
+ <fileSet>
+ <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/ui/Dockerfile b/ui/Dockerfile
index 173aea2..b0a62c1 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -43,5 +43,5 @@ COPY docker-entrypoint.sh /
RUN chown -R nginx:nginx /usr/share/nginx/html/
-ENTRYPOINT ["/docker-entrypoint.sh"]
+ENTRYPOINT ["sh", "/docker-entrypoint.sh"]
CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
[incubator-streampipes] 05/06: Import Roboto font in angular.json
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 82ec877dbc0f47e50a93f473e75082b8809f386f
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sun May 3 22:04:07 2020 +0200
Import Roboto font in angular.json
---
ui/angular.json | 3 ++-
ui/src/assets/fonts/Roboto-Regular.css | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ui/angular.json b/ui/angular.json
index 86a210e..60fb1b5 100644
--- a/ui/angular.json
+++ b/ui/angular.json
@@ -26,7 +26,8 @@
}
],
"styles": [
- "src/scss/main.scss"
+ "src/scss/main.scss",
+ "src/assets/fonts/Roboto-Regular.css"
],
"scripts": [
"node_modules/systemjs/dist/system.js",
diff --git a/ui/src/assets/fonts/Roboto-Regular.css b/ui/src/assets/fonts/Roboto-Regular.css
index eac6cfa..d1d7664 100644
--- a/ui/src/assets/fonts/Roboto-Regular.css
+++ b/ui/src/assets/fonts/Roboto-Regular.css
@@ -23,5 +23,5 @@
font-weight: 700;
src: local('Roboto'),
local('Roboto'),
- url(Roboto-Regular.ttf) format('ttf');
+ url(assets/fonts/Roboto-Regular.ttf) format('ttf');
}