Skip to content

Commit b2eecf3

Browse files
MatzElectronicsMatzElectronics
authored
Merge pull request #36 from parallaxinc/1.2
Update local repo
2 parents d6034e6 + d2b10e5 commit b2eecf3

File tree

94 files changed

+5737
-1381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+5737
-1381
lines changed

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ nb*
1212
# /src/main/java/com/parallax/server/blocklyprop/db/generated/*
1313
#
1414

15+
*.sh
16+
17+
1518
#################
1619
## NetBeans
1720
#################
@@ -243,3 +246,8 @@ pip-log.txt
243246

244247
#Mr Developer
245248
.mr.developer.cfg
249+
250+
###########
251+
## MacOS
252+
###########
253+
._.DS_Store

‎LICENSE‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2018 Parallax Inc.
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎db-updates/0014-add-project-settings.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
/*
2-
* To change this license header, choose License Headers in Project Properties.
3-
* To change this template file, choose Tools | Templates
4-
* and open the template in the editor.
5-
*/
61
/**
72
* Author: Jim Ewald
83
* Created: Aug 27, 2018
94
*
105
* Add a field to the project table to store a JSON encoded group of project
116
* settings.
7+
*
8+
* Add a field to the user profile to store JSON encoded settings related to
9+
* specific user.
1210
*/
1311

1412
ALTER TABLE blocklyprop.project ADD settings TEXT NULL;
13+
ALTER TABLE cloudsession.user ADD settings TEXT NULL;
14+
1515

‎pom.xml‎

Lines changed: 67 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<artifactId>BlocklyProp</artifactId>
66
<version>1.0-SNAPSHOT</version>
77
<packaging>war</packaging>
8+
89
<properties>
910
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1011
<maven.compiler.source>1.8</maven.compiler.source>
@@ -16,18 +17,11 @@
1617

1718
<!-- jOOQ version 3.7 and above requires Java 1.8.x JDK -->
1819
<jooq-version>3.7.4</jooq-version>
19-
20+
<gson.version>2.8.5</gson.version>
2021
<shiro-version>1.3.2</shiro-version>
2122
<metrics-version>3.1.0</metrics-version>
2223
<jersey.version>1.19</jersey.version>
2324
</properties>
24-
25-
<repositories>
26-
<repository>
27-
<id>netbeans.maven2.repository</id>
28-
<url>http://bits.netbeans.org/maven2/</url>
29-
</repository>
30-
</repositories>
3125

3226
<build>
3327
<resources>
@@ -40,29 +34,30 @@
4034
</resources>
4135

4236
<plugins>
43-
<!--
44-
codehaus.org shut down on 6/2015.
45-
This is now the MojoHaus Project http://www.mojohaus.org/
46-
-->
4737
<plugin>
38+
<!-- Read external property resource files -->
4839
<groupId>org.codehaus.mojo</groupId>
4940
<artifactId>properties-maven-plugin</artifactId>
50-
<version>1.0-alpha-2</version>
41+
<version>1.0.0</version>
5142
<executions>
5243
<execution>
5344
<phase>initialize</phase>
5445
<goals>
46+
<!-- Reads property files or properties from URLs as Project properties -->
5547
<goal>read-project-properties</goal>
5648
</goals>
49+
<configuration>
50+
<files>
51+
<!-- Location of the property file(s) -->
52+
<file>build.properties</file>
53+
</files>
54+
<!--
55+
<properties combine.self="append" />
56+
<outputFile combine.self="append" />
57+
-->
58+
</configuration>
5759
</execution>
5860
</executions>
59-
<configuration>
60-
<files>
61-
<file>build.properties</file>
62-
</files>
63-
<properties combine.self="append" />
64-
<outputFile combine.self="append" />
65-
</configuration>
6661
</plugin>
6762

6863
<plugin>
@@ -101,7 +96,9 @@
10196
<!-- Include the <execution> element to generate a new set of -->
10297
<!-- source files that represent the current state of the -->
10398
<!-- target database schema. -->
104-
<!-- <executions>
99+
100+
<!--
101+
<executions>
105102
<execution>
106103
<id>jooq-codegen</id>
107104
<phase>generate-sources</phase>
@@ -110,11 +107,11 @@
110107
</goals>
111108
</execution>
112109
</executions>
113-
-->
110+
-->
111+
114112
<!-- Comment out the <executions> block to disable jooq -->
115113
<!-- from generating database code -->
116-
117-
114+
118115
<dependencies>
119116
<dependency>
120117
<groupId>mysql</groupId>
@@ -201,6 +198,14 @@
201198
</generator>
202199
</configuration>
203200
</plugin>
201+
<plugin>
202+
<groupId>org.apache.maven.plugins</groupId>
203+
<artifactId>maven-surefire-plugin</artifactId>
204+
<version>2.22.1</version>
205+
<configuration>
206+
<skipTests>true</skipTests>
207+
</configuration>
208+
</plugin>
204209
</plugins>
205210
</build>
206211

@@ -223,6 +228,12 @@
223228
</profiles>
224229

225230
<dependencies>
231+
<dependency>
232+
<groupId>org.codehaus.mojo</groupId>
233+
<artifactId>properties-maven-plugin</artifactId>
234+
<version>1.0.0</version>
235+
</dependency>
236+
226237
<!-- Servlet and jsp libs provided by tomcat -->
227238
<dependency>
228239
<groupId>javax.servlet</groupId>
@@ -253,31 +264,23 @@
253264
</dependency>
254265

255266
<!-- Dependencies for logging -->
256-
<!-- sl4fj is a facade for various logging frameworks -->
257267
<dependency>
258268
<groupId>org.slf4j</groupId>
259269
<artifactId>slf4j-api</artifactId>
260-
<version>1.7.21</version>
270+
<version>1.7.25</version>
261271
</dependency>
262272

263273
<dependency>
264274
<groupId>ch.qos.logback</groupId>
265275
<artifactId>logback-classic</artifactId>
266-
<version>1.1.8</version>
276+
<version>1.2.3</version>
267277
</dependency>
278+
268279
<dependency>
269280
<groupId>ch.qos.logback</groupId>
270281
<artifactId>logback-core</artifactId>
271-
<version>1.1.8</version>
272-
</dependency>
273-
274-
<!--
275-
<dependency>
276-
<groupId>org.slf4j</groupId>
277-
<artifactId>slf4j-log4j12</artifactId>
278-
<version>1.7.21</version>
282+
<version>1.2.3</version>
279283
</dependency>
280-
-->
281284
<!-- END Logging Dependencies -->
282285

283286
<!-- Dependencies for Guice -->
@@ -293,13 +296,11 @@
293296
<version>4.0</version>
294297
</dependency>
295298

296-
297299
<dependency>
298300
<groupId>com.google.inject.extensions</groupId>
299301
<artifactId>guice-persist</artifactId>
300302
<version>4.0</version>
301303
</dependency>
302-
303304
<!-- END Guice Dependencies -->
304305

305306
<!-- Dependencies for JOOQ -->
@@ -309,12 +310,6 @@
309310
<version>${jooq-version}</version>
310311
</dependency>
311312

312-
<!--<dependency>
313-
<groupId>org.jooq</groupId>
314-
<artifactId>jooq-meta</artifactId>
315-
<version>${jooq-version}</version>
316-
</dependency>-->
317-
318313
<dependency>
319314
<groupId>com.adamlewis</groupId>
320315
<artifactId>guice-persist-jooq</artifactId>
@@ -327,7 +322,6 @@
327322
<artifactId>joda-time</artifactId>
328323
<version>2.9.9</version>
329324
</dependency>
330-
331325
<!-- END JOOQ Dependencies -->
332326

333327
<!-- Dependencies for Shiro -->
@@ -360,10 +354,23 @@
360354
<dependency>
361355
<groupId>commons-collections</groupId>
362356
<artifactId>commons-collections</artifactId>
363-
<version>3.2.1</version>
357+
<version>3.2.2</version>
358+
</dependency>
359+
360+
<!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils -->
361+
<dependency>
362+
<groupId>commons-beanutils</groupId>
363+
<artifactId>commons-beanutils</artifactId>
364+
<version>1.9.2</version>
365+
</dependency>
366+
367+
<!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
368+
<dependency>
369+
<groupId>commons-logging</groupId>
370+
<artifactId>commons-logging</artifactId>
371+
<version>1.2</version>
364372
</dependency>
365373

366-
<!-- -->
367374
<dependency>
368375
<groupId>org.apache.commons</groupId>
369376
<artifactId>commons-dbcp2</artifactId>
@@ -388,7 +395,6 @@
388395
<artifactId>commons-validator</artifactId>
389396
<version>1.6</version>
390397
</dependency>
391-
392398
<!-- END Apache commons Dependencies -->
393399

394400
<!-- Rest API -->
@@ -397,21 +403,25 @@
397403
<artifactId>jersey-server</artifactId>
398404
<version>${jersey.version}</version>
399405
</dependency>
406+
400407
<dependency>
401408
<groupId>com.sun.jersey</groupId>
402409
<artifactId>jersey-json</artifactId>
403410
<version>${jersey.version}</version>
404411
</dependency>
412+
405413
<dependency>
406414
<groupId>org.codehaus.jackson</groupId>
407415
<artifactId>jackson-core-asl</artifactId>
408416
<version>1.9.13</version>
409417
</dependency>
418+
410419
<dependency>
411420
<groupId>org.codehaus.jackson</groupId>
412421
<artifactId>jackson-mapper-asl</artifactId>
413422
<version>1.9.13</version>
414423
</dependency>
424+
415425
<dependency>
416426
<groupId>org.codehaus.jackson</groupId>
417427
<artifactId>jackson-jaxrs</artifactId>
@@ -429,22 +439,8 @@
429439
<artifactId>cuubez-api-visualizer</artifactId>
430440
<version>1.0.1</version>
431441
</dependency>
432-
433442
<!-- END Rest API -->
434443

435-
<!-- Raven / Sentry API -->
436-
<dependency>
437-
<groupId>com.getsentry.raven</groupId>
438-
<artifactId>raven</artifactId>
439-
<version>7.8.1</version>
440-
</dependency>
441-
442-
<dependency>
443-
<groupId>com.getsentry.raven</groupId>
444-
<artifactId>raven-logback</artifactId>
445-
<version>7.8.1</version>
446-
</dependency>
447-
448444
<!-- Lucene search engine -->
449445
<dependency>
450446
<groupId>org.apache.lucene</groupId>
@@ -497,13 +493,6 @@
497493
<version>3.1.2</version>
498494
</dependency>
499495

500-
<!--
501-
<dependency>
502-
<groupId>io.dropwizard.metrics</groupId>
503-
<artifactId>metrics-log4j</artifactId>
504-
<version>${metrics-version}</version>
505-
</dependency>
506-
-->
507496
<dependency>
508497
<groupId>io.dropwizard.metrics</groupId>
509498
<artifactId>metrics-servlet</artifactId>
@@ -519,7 +508,7 @@
519508
<dependency>
520509
<groupId>com.google.code.gson</groupId>
521510
<artifactId>gson</artifactId>
522-
<version>2.3.1</version>
511+
<version>${gson.version}</version>
523512
</dependency>
524513

525514
<dependency>
@@ -557,23 +546,15 @@
557546
<dependency>
558547
<groupId>junit</groupId>
559548
<artifactId>junit</artifactId>
560-
<version>4.11</version>
549+
<version>4.12</version>
561550
<scope>test</scope>
562551
</dependency>
563-
564-
<!-- https://mvnrepository.com/artifact/org.netbeans.api/org-netbeans-modules-nbjunit -->
565-
<!-- <dependency>
566-
<groupId>org.netbeans.api</groupId>
567-
<artifactId>org-netbeans-modules-nbjunit</artifactId>
568-
<version>RELEASE801</version>
569-
</dependency>
570-
-->
571-
<!-- https://mvnrepository.com/artifact/org.netbeans.api/org-netbeans-modules-jellytools-platform -->
572-
<!-- <dependency>
573-
<groupId>org.netbeans.api</groupId>
574-
<artifactId>org-netbeans-modules-jellytools-platform</artifactId>
575-
<version>RELEASE801</version>
576-
</dependency>
577-
-->
552+
553+
<!-- https://mvnrepository.com/artifact/org.jetbrains/annotations -->
554+
<dependency>
555+
<groupId>org.jetbrains</groupId>
556+
<artifactId>annotations</artifactId>
557+
<version>17.0.0</version>
558+
</dependency>
578559
</dependencies>
579560
</project>

0 commit comments

Comments
 (0)