Skip to content

Commit 97cd4e4

Browse files
committed
Merge branch 'release/1.3.2'
2 parents ad0c0ba + de7e9df commit 97cd4e4

File tree

257 files changed

+10244
-1003
lines changed

Some content is hidden

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

257 files changed

+10244
-1003
lines changed

.gitignore

Lines changed: 279 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,289 @@
1-
# Eclipse project files
2-
.classpath
1+
### Code-Java ###
2+
# Language Support for Java(TM) by Red Hat extension for Visual Studio Code - https://marketplace.visualstudio.com/items?itemName=redhat.java
3+
34
.project
5+
.classpath
6+
factoryConfiguration.json
7+
8+
### Eclipse ###
9+
10+
.metadata
11+
bin/
12+
tmp/
13+
*.tmp
14+
*.bak
15+
*.swp
16+
*~.nib
17+
local.properties
418
.settings/
19+
.loadpath
20+
.recommenders
21+
22+
# External tool builders
523
.externalToolBuilders/
6-
.metadata/
724

8-
#IntelliJ project files
9-
.idea
25+
# Locally stored "Eclipse launch configurations"
26+
*.launch
27+
28+
# PyDev specific (Python IDE for Eclipse)
29+
*.pydevproject
30+
31+
# CDT-specific (C/C++ Development Tooling)
32+
.cproject
33+
34+
# CDT- autotools
35+
.autotools
36+
37+
# Java annotation processor (APT)
38+
.factorypath
39+
40+
# PDT-specific (PHP Development Tools)
41+
.buildpath
42+
43+
# sbteclipse plugin
44+
.target
45+
46+
# Tern plugin
47+
.tern-project
48+
49+
# TeXlipse plugin
50+
.texlipse
51+
52+
# STS (Spring Tool Suite)
53+
.springBeans
54+
55+
# Code Recommenders
56+
.recommenders/
57+
58+
# Annotation Processing
59+
.apt_generated/
60+
61+
# Scala IDE specific (Scala & Java development for Eclipse)
62+
.cache-main
63+
.scala_dependencies
64+
.worksheet
65+
66+
### Eclipse Patch ###
67+
# Eclipse Core
68+
69+
# JDT-specific (Eclipse Java Development Tools)
70+
71+
# Annotation Processing
72+
.apt_generated
73+
74+
.sts4-cache/
75+
76+
### Intellij+all ###
77+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
78+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
79+
80+
# User-specific stuff
81+
.idea/**/workspace.xml
82+
.idea/**/tasks.xml
83+
.idea/**/usage.statistics.xml
84+
.idea/**/dictionaries
85+
.idea/**/shelf
86+
87+
# Generated files
88+
.idea/**/contentModel.xml
89+
90+
# Sensitive or high-churn files
91+
.idea/**/dataSources/
92+
.idea/**/dataSources.ids
93+
.idea/**/dataSources.local.xml
94+
.idea/**/sqlDataSources.xml
95+
.idea/**/dynamic.xml
96+
.idea/**/uiDesigner.xml
97+
.idea/**/dbnavigator.xml
98+
99+
# Gradle
100+
.idea/**/gradle.xml
101+
.idea/**/libraries
102+
103+
# Gradle and Maven with auto-import
104+
# When using Gradle or Maven with auto-import, you should exclude module files,
105+
# since they will be recreated, and may cause churn. Uncomment if using
106+
# auto-import.
107+
# .idea/modules.xml
108+
# .idea/*.iml
109+
# .idea/modules
110+
111+
# CMake
112+
cmake-build-*/
113+
114+
# Mongo Explorer plugin
115+
.idea/**/mongoSettings.xml
116+
117+
# File-based project format
118+
*.iws
119+
120+
# IntelliJ
121+
out/
122+
123+
# mpeltonen/sbt-idea plugin
124+
.idea_modules/
125+
126+
# JIRA plugin
127+
atlassian-ide-plugin.xml
128+
129+
# Cursive Clojure plugin
130+
.idea/replstate.xml
131+
132+
# Crashlytics plugin (for Android Studio and IntelliJ)
133+
com_crashlytics_export_strings.xml
134+
crashlytics.properties
135+
crashlytics-build.properties
136+
fabric.properties
137+
138+
# Editor-based Rest Client
139+
.idea/httpRequests
140+
141+
# Android studio 3.1+ serialized cache file
142+
.idea/caches/build_file_checksums.ser
143+
144+
### Intellij+all Patch ###
145+
# Ignores the whole .idea folder and all .iml files
146+
# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
147+
148+
.idea/
149+
150+
# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
151+
10152
*.iml
153+
modules.xml
154+
.idea/misc.xml
155+
*.ipr
156+
157+
### Java ###
158+
# Compiled class file
159+
*.class
160+
161+
# Log file
162+
*.log
163+
164+
# BlueJ files
165+
*.ctxt
166+
167+
# Mobile Tools for Java (J2ME)
168+
.mtj.tmp/
169+
170+
# Package Files #
171+
*.jar
172+
*.war
173+
*.nar
174+
*.ear
175+
*.zip
176+
*.tar.gz
177+
*.rar
11178

12-
# Maven
179+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
180+
hs_err_pid*
181+
182+
### Java-Web ###
183+
## ignoring target file
13184
target/
14185

15-
# Temp files
16-
*~
17-
*.bak
186+
### macOS ###
187+
# General
18188
.DS_Store
189+
.AppleDouble
190+
.LSOverride
19191

20-
bin/
21-
[Ll]ogs/
22-
[tT]mp/
192+
# Icon must end with two \r
193+
Icon
194+
195+
# Thumbnails
196+
._*
197+
198+
# Files that might appear in the root of a volume
199+
.DocumentRevisions-V100
200+
.fseventsd
201+
.Spotlight-V100
202+
.TemporaryItems
203+
.Trashes
204+
.VolumeIcon.icns
205+
.com.apple.timemachine.donotpresent
206+
207+
# Directories potentially created on remote AFP share
208+
.AppleDB
209+
.AppleDesktop
210+
Network Trash Folder
211+
Temporary Items
212+
.apdisk
213+
214+
### Node ###
215+
# Logs
216+
logs
217+
npm-debug.log*
218+
yarn-debug.log*
219+
yarn-error.log*
220+
221+
# Runtime data
222+
pids
223+
*.pid
224+
*.seed
225+
*.pid.lock
226+
227+
# Directory for instrumented libs generated by jscoverage/JSCover
228+
lib-cov
229+
230+
# Coverage directory used by tools like istanbul
231+
coverage
232+
233+
# nyc test coverage
234+
.nyc_output
235+
236+
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
237+
.grunt
238+
239+
# Bower dependency directory (https://bower.io/)
240+
bower_components
241+
242+
# node-waf configuration
243+
.lock-wscript
244+
245+
# Compiled binary addons (https://nodejs.org/api/addons.html)
246+
build/Release
247+
248+
# Dependency directories
249+
node_modules/
250+
jspm_packages/
251+
252+
# TypeScript v1 declaration files
253+
typings/
254+
255+
# Optional npm cache directory
256+
.npm
257+
258+
# Optional eslint cache
259+
.eslintcache
260+
261+
# Optional REPL history
262+
.node_repl_history
263+
264+
# Output of 'npm pack'
265+
*.tgz
266+
267+
# Yarn Integrity file
268+
.yarn-integrity
269+
270+
# dotenv environment variables file
271+
.env
272+
auth0-variables.js
273+
aut0.env
274+
275+
276+
# parcel-bundler cache (https://parceljs.org/)
277+
.cache
278+
279+
# next.js build output
280+
.next
281+
282+
# nuxt.js build output
283+
.nuxt
284+
285+
# vuepress build output
286+
.vuepress/dist
287+
288+
# Serverless directories
289+
.serverless

.gitmodules

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,3 @@
66
path = corelib
77
url = https://github.com/CSUC/corelib.git
88
branch = echoes
9-
[submodule "YASGUI.server"]
10-
path = YASGUI.server
11-
url = https://github.com/CSUC/YASGUI.server.git
12-
branch = echoes
13-
[submodule "database"]
14-
path = database
15-
url = https://github.com/CSUC/database.git
16-
branch = echoes

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
language: java
22
services: mongodb
33
sudo: false
4+
cache:
5+
directories:
6+
- $HOME/.m2
47
jdk:
58
- oraclejdk8
6-
env:
7-
- EDM=external
89
before_install:
910
- git submodule update --init --recursive
10-
script: mvn install -D$EDM -B -V
11+
script: mvn install -B -V
1112
notifications:
1213
email:
1314
recipients:

0 commit comments

Comments
 (0)