update dependencies and fix source.zip assembly

build/checkstyle.xml

@@ -31,6 +31,8 @@
 
 <module name="Checker">
 
+    <property name="cacheFile" value="target/checkstyle.cache"/>
+
     <module name="SuppressionFilter">
         <property name="file" value="${basedir}/build/checkstyle-suppression.xml" />
     </module>
@@ -63,7 +65,6 @@
     </module>
 
     <module name="TreeWalker" >
-        <property name="cacheFile" value="target/checkstyle.cache"/>
 
         <!-- required for SuppressWarningsFilter (and other Suppress* rules not used here) -->
         <!-- see http://checkstyle.sourceforge.net/config_annotation.html#SuppressWarningsHolder -->

client/pom.xml

@@ -70,7 +70,7 @@
             <plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
-                <version>1.6</version>
+                <version>1.7.5</version>
                 <configuration>
                     <nodeVersion>v8.9.4</nodeVersion>
                     <npmVersion>5.6.0</npmVersion>

data-service/pom.xml

@@ -150,7 +150,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.7</version>
+            <version>4.5.8</version>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>

pom.xml

@@ -172,7 +172,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.18</version>
+                        <version>8.19</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -265,19 +265,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <configuration>
-                            <goal>aggregate</goal>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin> <!-- checks owsp vulnerability database -->
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>

server/pom.xml

@@ -264,7 +264,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.7</version>
+            <version>4.5.8</version>
         </dependency>
         <dependency>
             <groupId>org.graylog2</groupId>
@@ -324,7 +324,7 @@
         <dependency>
             <groupId>com.blueconic</groupId>
             <artifactId>browscap-java</artifactId>
-            <version>1.2.7</version>
+            <version>1.2.8</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.xodus</groupId>
@@ -344,7 +344,7 @@
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
-            <version>2.6.2</version>
+            <version>2.7.0</version>
         </dependency>
         <dependency>
             <groupId>com.nulab-inc</groupId>

webapp/pom.xml

@@ -119,7 +119,7 @@
             <plugin>
                 <groupId>io.leonard.maven.plugins</groupId>
                 <artifactId>jspc-maven-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -282,17 +282,17 @@
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dojo</artifactId>
-            <version>1.14.2</version>
+            <version>1.15.0</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dijit</artifactId>
-            <version>1.14.2</version>
+            <version>1.15.0</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dojox</artifactId>
-            <version>1.14.2</version>
+            <version>1.15.0</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>

webapp/src/build/assembly/source-reference.xml

@@ -19,7 +19,8 @@
   ~ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   -->
 
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
 
     <id>source-reference</id>
@@ -29,26 +30,60 @@
     <includeBaseDirectory>false</includeBaseDirectory>
     <files>
         <file>
-            <source>${project.basedir}/pom.xml</source>
+            <source>${project.basedir}/../pom.xml</source>
+            <outputDirectory>/</outputDirectory>
         </file>
         <file>
             <source>${project.basedir}/../LICENSE</source>
+            <outputDirectory>/</outputDirectory>
         </file>
     </files>
     <fileSets>
         <fileSet>
-            <outputDirectory>/src</outputDirectory>
-            <directory>${project.basedir}/src</directory>
+            <outputDirectory>/server</outputDirectory>
+            <directory>${project.basedir}/../server</directory>
             <includes>
                 <include>*/**</include>
             </includes>
+            <excludes>
+                <exclude>target/**</exclude>
+                <exclude>*.iml</exclude>
+            </excludes>
         </fileSet>
         <fileSet>
-            <outputDirectory>/supplemental</outputDirectory>
-            <directory>${project.basedir}/supplemental</directory>
+            <outputDirectory>/webapp</outputDirectory>
+            <directory>${project.basedir}/../webapp</directory>
             <includes>
                 <include>*/**</include>
             </includes>
+            <excludes>
+                <exclude>target/**</exclude>
+                <exclude>*.iml</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <outputDirectory>/client</outputDirectory>
+            <directory>${project.basedir}/../client</directory>
+            <includes>
+                <include>*/**</include>
+            </includes>
+            <excludes>
+                <exclude>*.iml</exclude>
+                <exclude>target/**</exclude>
+                <exclude>.node/**</exclude>
+                <exclude>dist/**</exclude>
+                <exclude>node_modules/**</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <outputDirectory>/build</outputDirectory>
+            <directory>${project.basedir}/../build</directory>
+            <includes>
+                <include>*/**</include>
+            </includes>
+            <excludes>
+                <exclude>*.iml</exclude>
+            </excludes>
         </fileSet>
     </fileSets>