From 740347f9e99719a08bdfcf1f21ae8110e5ffa39e Mon Sep 17 00:00:00 2001 From: Eike Cochu <eike@cochu.com> Date: Wed, 28 Sep 2016 20:11:16 +0200 Subject: [PATCH] added missing ui dependency --- docker/Dockerfile | 4 ++-- vipra-ui/bower.json | 3 ++- vipra-util/src/main/java/de/vipra/util/model/ArticleWord.java | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 4bd762bb..49f2fa51 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:15.10 MAINTAINER Eike Cochu <eike@cochu.com> ENV ES_VERSION 2.3.1 ENV TOMCAT_MAJOR 8 -ENV TOMCAT_VERSION 8.0.33 +ENV TOMCAT_VERSION 8.0.37 RUN echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu wily main" >> /etc/apt/sources.list && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C300EE8C && \ apt-get update && \ @@ -12,7 +12,7 @@ RUN echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu wily main" >> /etc/ap mkdir -p /webroot /var/log/supervisor /data/db && \ wget --no-check-certificate -O- https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/$ES_VERSION/elasticsearch-$ES_VERSION.tar.gz | tar xvfz - && \ mv elasticsearch-$ES_VERSION elasticsearch && \ - wget -O- http://apache.openmirror.de/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz | tar xvfz - && \ + wget -O- http://mirror.23media.de/apache/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz | tar xvfz - && \ mv apache-tomcat-$TOMCAT_VERSION tomcat COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY tomcat-users.xml /tomcat/conf/tomcat-users.xml diff --git a/vipra-ui/bower.json b/vipra-ui/bower.json index 97208360..ca8c9a78 100644 --- a/vipra-ui/bower.json +++ b/vipra-ui/bower.json @@ -34,6 +34,7 @@ "angular-hotkeys": "chieffancypants/angular-hotkeys#^1.x", "eonasdan-bootstrap-datetimepicker": "^4.x", "angulartics-google-analytics": "^0.1.4", - "angular-loading-bar": "^0.9.0" + "angular-loading-bar": "^0.9.0", + "jquery-layout": "^1.4.3" } } diff --git a/vipra-util/src/main/java/de/vipra/util/model/ArticleWord.java b/vipra-util/src/main/java/de/vipra/util/model/ArticleWord.java index d244f270..be291f3e 100644 --- a/vipra-util/src/main/java/de/vipra/util/model/ArticleWord.java +++ b/vipra-util/src/main/java/de/vipra/util/model/ArticleWord.java @@ -19,6 +19,7 @@ public class ArticleWord implements Comparable<ArticleWord>, Serializable { public ArticleWord() {} public ArticleWord(final String word, final int count) { + // TODO NPE this.word = word.toLowerCase().trim(); this.count = count; } -- GitLab