Merge branch 'master' into SDAP-8

Project: http://git-wip-us.apache.org/repos/asf/incubator-sdap-nexus/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-sdap-nexus/commit/2010cd28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-sdap-nexus/tree/2010cd28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-sdap-nexus/diff/2010cd28

Branch: refs/heads/master
Commit: 2010cd289db0fc2d5929483302596feaad804608
Parents: d31b33f 31f7ac2
Author: fgreg <[email protected]>
Authored: Wed Jan 17 11:05:48 2018 -0800
Committer: GitHub <[email protected]>
Committed: Wed Jan 17 11:05:48 2018 -0800

----------------------------------------------------------------------
 analysis/.gitignore                             | 202 ++++++++++++++++++-
 analysis/.idea/analysis.iml                     |  11 +
 analysis/.idea/encodings.xml                    |   6 +
 analysis/.idea/misc.xml                         |   4 +
 analysis/.idea/modules.xml                      |   8 +
 client/.gitignore                               | 196 ++++++++++++++++++
 client/.idea/client.iml                         |  11 +
 client/.idea/encodings.xml                      |   6 +
 client/.idea/misc.xml                           |   4 +
 client/.idea/modules.xml                        |   8 +
 data-access/.gitignore                          | 189 ++++++++++++++++-
 data-access/.idea/data-access.iml               |  11 +
 data-access/.idea/encodings.xml                 |   6 +
 data-access/.idea/misc.xml                      |   4 +
 data-access/.idea/modules.xml                   |   8 +
 data-access/.idea/vcs.xml                       |   6 +
 nexus-ingest/nexus-sink/.gitignore              | 125 +++++++++++-
 .../gradle/wrapper/gradle-wrapper.properties    |   2 +-
 nexus-ingest/nexus-sink/gradlew.bat             |  90 +++++++++
 19 files changed, 876 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-sdap-nexus/blob/2010cd28/nexus-ingest/nexus-sink/.gitignore
----------------------------------------------------------------------
diff --cc nexus-ingest/nexus-sink/.gitignore
index 09e7ad7,dec601d..89bc702
--- a/nexus-ingest/nexus-sink/.gitignore
+++ b/nexus-ingest/nexus-sink/.gitignore
@@@ -1,18 -1,124 +1,123 @@@
- gradlew.bat
 -
+ build/*
+ !build/reports
+ 
+ build/reports/*
+ !build/reports/license
+ !build/reports/project
+ ### JetBrains template
+ # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, 
CLion, Android Studio and Webstorm
+ # Reference: 
https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+ 
+ # User-specific stuff:
+ .idea/**/workspace.xml
+ .idea/**/tasks.xml
+ .idea/dictionaries
+ 
+ # Sensitive or high-churn files:
+ .idea/**/dataSources/
+ .idea/**/dataSources.ids
+ .idea/**/dataSources.xml
+ .idea/**/dataSources.local.xml
+ .idea/**/sqlDataSources.xml
+ .idea/**/dynamic.xml
+ .idea/**/uiDesigner.xml
  
- .gradle/
+ # Gradle:
+ .idea/**/gradle.xml
+ .idea/**/libraries
  
- .idea/
- *.ipr
+ # CMake
+ cmake-build-debug/
+ 
+ # Mongo Explorer plugin:
+ .idea/**/mongoSettings.xml
+ 
+ ## File-based project format:
  *.iws
  
+ ## Plugin-specific files:
+ 
+ # IntelliJ
+ out/
+ 
+ # mpeltonen/sbt-idea plugin
+ .idea_modules/
+ 
+ # JIRA plugin
+ atlassian-ide-plugin.xml
+ 
+ # Cursive Clojure plugin
+ .idea/replstate.xml
+ 
+ # Crashlytics plugin (for Android Studio and IntelliJ)
+ com_crashlytics_export_strings.xml
+ crashlytics.properties
+ crashlytics-build.properties
+ fabric.properties
+ ### macOS template
+ # General
  .DS_Store
+ .AppleDouble
+ .LSOverride
  
- gradle.properties
+ # Icon must end with two \r
+ Icon
  
- build/*
- !build/reports
+ # Thumbnails
+ ._*
+ 
+ # Files that might appear in the root of a volume
+ .DocumentRevisions-V100
+ .fseventsd
+ .Spotlight-V100
+ .TemporaryItems
+ .Trashes
+ .VolumeIcon.icns
+ .com.apple.timemachine.donotpresent
+ 
+ # Directories potentially created on remote AFP share
+ .AppleDB
+ .AppleDesktop
+ Network Trash Folder
+ Temporary Items
+ .apdisk
+ ### Java template
+ # Compiled class file
+ *.class
+ 
+ # Log file
+ *.log
+ 
+ # BlueJ files
+ *.ctxt
+ 
+ # Mobile Tools for Java (J2ME)
+ .mtj.tmp/
+ 
+ # Package Files #
+ *.jar
+ *.war
+ *.ear
+ *.zip
+ *.tar.gz
+ *.rar
+ 
+ # virtual machine crash logs, see 
http://www.java.com/en/download/help/error_hotspot.xml
+ hs_err_pid*
+ 
+ ### Gradle template
+ .gradle
+ /build/
+ 
+ # Ignore Gradle GUI config
+ gradle-app.setting
+ 
+ # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+ !gradle-wrapper.jar
+ 
+ # Cache of project
+ .gradletasknamecache
+ 
+ # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+ # gradle/wrapper/gradle-wrapper.properties
  
- build/reports/*
- !build/reports/license
- !build/reports/project

Reply via email to