Skip to content

Commit e99c243

Browse files
author
jrivard@gmail.com
committed
update dependencies and fix source.zip assembly
1 parent 1680a55 commit e99c243

File tree

7 files changed

+53
-30
lines changed

7 files changed

+53
-30
lines changed

‎build/checkstyle.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131

3232
<module name="Checker">
3333

34+
<property name="cacheFile" value="target/checkstyle.cache"/>
35+
3436
<module name="SuppressionFilter">
3537
<property name="file" value="${basedir}/build/checkstyle-suppression.xml" />
3638
</module>
@@ -63,7 +65,6 @@
6365
</module>
6466

6567
<module name="TreeWalker" >
66-
<property name="cacheFile" value="target/checkstyle.cache"/>
6768

6869
<!-- required for SuppressWarningsFilter (and other Suppress* rules not used here) -->
6970
<!-- see http://checkstyle.sourceforge.net/config_annotation.html#SuppressWarningsHolder -->

‎client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<plugin>
7171
<groupId>com.github.eirslett</groupId>
7272
<artifactId>frontend-maven-plugin</artifactId>
73-
<version>1.6</version>
73+
<version>1.7.5</version>
7474
<configuration>
7575
<nodeVersion>v8.9.4</nodeVersion>
7676
<npmVersion>5.6.0</npmVersion>

‎data-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
<dependency>
151151
<groupId>org.apache.httpcomponents</groupId>
152152
<artifactId>httpclient</artifactId>
153-
<version>4.5.7</version>
153+
<version>4.5.8</version>
154154
</dependency>
155155
<dependency>
156156
<groupId>log4j</groupId>

‎pom.xml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
<dependency>
173173
<groupId>com.puppycrawl.tools</groupId>
174174
<artifactId>checkstyle</artifactId>
175-
<version>8.18</version>
175+
<version>8.19</version>
176176
</dependency>
177177
</dependencies>
178178
<executions>
@@ -265,19 +265,6 @@
265265
</execution>
266266
</executions>
267267
</plugin>
268-
<plugin>
269-
<groupId>org.apache.maven.plugins</groupId>
270-
<artifactId>maven-source-plugin</artifactId>
271-
<version>3.0.1</version>
272-
<executions>
273-
<execution>
274-
<phase>package</phase>
275-
<configuration>
276-
<goal>aggregate</goal>
277-
</configuration>
278-
</execution>
279-
</executions>
280-
</plugin>
281268
<plugin> <!-- checks owsp vulnerability database -->
282269
<groupId>org.owasp</groupId>
283270
<artifactId>dependency-check-maven</artifactId>

‎server/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@
264264
<dependency>
265265
<groupId>org.apache.httpcomponents</groupId>
266266
<artifactId>httpclient</artifactId>
267-
<version>4.5.7</version>
267+
<version>4.5.8</version>
268268
</dependency>
269269
<dependency>
270270
<groupId>org.graylog2</groupId>
@@ -324,7 +324,7 @@
324324
<dependency>
325325
<groupId>com.blueconic</groupId>
326326
<artifactId>browscap-java</artifactId>
327-
<version>1.2.7</version>
327+
<version>1.2.8</version>
328328
</dependency>
329329
<dependency>
330330
<groupId>org.jetbrains.xodus</groupId>
@@ -344,7 +344,7 @@
344344
<dependency>
345345
<groupId>com.github.ben-manes.caffeine</groupId>
346346
<artifactId>caffeine</artifactId>
347-
<version>2.6.2</version>
347+
<version>2.7.0</version>
348348
</dependency>
349349
<dependency>
350350
<groupId>com.nulab-inc</groupId>

‎webapp/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<plugin>
120120
<groupId>io.leonard.maven.plugins</groupId>
121121
<artifactId>jspc-maven-plugin</artifactId>
122-
<version>3.0.0</version>
122+
<version>3.1.0</version>
123123
<executions>
124124
<execution>
125125
<goals>
@@ -282,17 +282,17 @@
282282
<dependency>
283283
<groupId>org.webjars.npm</groupId>
284284
<artifactId>dojo</artifactId>
285-
<version>1.14.2</version>
285+
<version>1.15.0</version>
286286
</dependency>
287287
<dependency>
288288
<groupId>org.webjars.npm</groupId>
289289
<artifactId>dijit</artifactId>
290-
<version>1.14.2</version>
290+
<version>1.15.0</version>
291291
</dependency>
292292
<dependency>
293293
<groupId>org.webjars.npm</groupId>
294294
<artifactId>dojox</artifactId>
295-
<version>1.14.2</version>
295+
<version>1.15.0</version>
296296
</dependency>
297297
<dependency>
298298
<groupId>org.webjars.npm</groupId>

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

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
~ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2020
-->
2121

22-
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
23+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2324
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
2425

2526
<id>source-reference</id>
@@ -29,26 +30,60 @@
2930
<includeBaseDirectory>false</includeBaseDirectory>
3031
<files>
3132
<file>
32-
<source>${project.basedir}/pom.xml</source>
33+
<source>${project.basedir}/../pom.xml</source>
34+
<outputDirectory>/</outputDirectory>
3335
</file>
3436
<file>
3537
<source>${project.basedir}/../LICENSE</source>
38+
<outputDirectory>/</outputDirectory>
3639
</file>
3740
</files>
3841
<fileSets>
3942
<fileSet>
40-
<outputDirectory>/src</outputDirectory>
41-
<directory>${project.basedir}/src</directory>
43+
<outputDirectory>/server</outputDirectory>
44+
<directory>${project.basedir}/../server</directory>
4245
<includes>
4346
<include>*/**</include>
4447
</includes>
48+
<excludes>
49+
<exclude>target/**</exclude>
50+
<exclude>*.iml</exclude>
51+
</excludes>
4552
</fileSet>
4653
<fileSet>
47-
<outputDirectory>/supplemental</outputDirectory>
48-
<directory>${project.basedir}/supplemental</directory>
54+
<outputDirectory>/webapp</outputDirectory>
55+
<directory>${project.basedir}/../webapp</directory>
4956
<includes>
5057
<include>*/**</include>
5158
</includes>
59+
<excludes>
60+
<exclude>target/**</exclude>
61+
<exclude>*.iml</exclude>
62+
</excludes>
63+
</fileSet>
64+
<fileSet>
65+
<outputDirectory>/client</outputDirectory>
66+
<directory>${project.basedir}/../client</directory>
67+
<includes>
68+
<include>*/**</include>
69+
</includes>
70+
<excludes>
71+
<exclude>*.iml</exclude>
72+
<exclude>target/**</exclude>
73+
<exclude>.node/**</exclude>
74+
<exclude>dist/**</exclude>
75+
<exclude>node_modules/**</exclude>
76+
</excludes>
77+
</fileSet>
78+
<fileSet>
79+
<outputDirectory>/build</outputDirectory>
80+
<directory>${project.basedir}/../build</directory>
81+
<includes>
82+
<include>*/**</include>
83+
</includes>
84+
<excludes>
85+
<exclude>*.iml</exclude>
86+
</excludes>
5287
</fileSet>
5388
</fileSets>
5489

0 commit comments

Comments
 (0)