Commit 339bbf0545203806494d57b73ec6088320afca33

Authored by atao
2 parents 78facb88 8db04d1f

Merge branch 'master' into branch_0808

Showing 1 changed file with 70 additions and 57 deletions
.gitignore
1 1 # Created by .ignore support plugin (hsz.mobi)
2   -### JetBrains template
3   -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
4   -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
5   -
6   -# User-specific stuff:
7   -.idea/**/workspace.xml
8   -.idea/**/tasks.xml
9   -.idea/dictionaries
10   -
11   -# Sensitive or high-churn files:
12   -.idea/**/dataSources/
13   -.idea/**/dataSources.ids
14   -.idea/**/dataSources.xml
15   -.idea/**/dataSources.local.xml
16   -.idea/**/sqlDataSources.xml
17   -.idea/**/dynamic.xml
18   -.idea/**/uiDesigner.xml
19   -
20   -# Gradle:
21   -.idea/**/gradle.xml
22   -.idea/**/libraries
23   -
24   -# Mongo Explorer plugin:
25   -.idea/**/mongoSettings.xml
26   -
27   -## File-based project format:
28   -*.iws
29   -
30   -## Plugin-specific files:
31   -
32   -# IntelliJ
33   -/out/
34   -
35   -# mpeltonen/sbt-idea plugin
36   -.idea_modules/
37   -
38   -# JIRA plugin
39   -atlassian-ide-plugin.xml
40   -
41   -# Crashlytics plugin (for Android Studio and IntelliJ)
42   -com_crashlytics_export_strings.xml
43   -crashlytics.properties
44   -crashlytics-build.properties
45   -fabric.properties
46   -### Maven template
47   -target/
48   -pom.xml.tag
49   -pom.xml.releaseBackup
50   -pom.xml.versionsBackup
51   -pom.xml.next
52   -release.properties
53   -dependency-reduced-pom.xml
54   -buildNumber.properties
55   -.mvn/timing.properties
56   -
57   -# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
58   -!/.mvn/wrapper/maven-wrapper.jar
59 2 ### macOS template
60 3 *.DS_Store
61 4 .AppleDouble
... ... @@ -83,5 +26,75 @@ Icon
83 26 Network Trash Folder
84 27 Temporary Items
85 28 .apdisk
  29 +### Maven template
  30 +target/
  31 +pom.xml.tag
  32 +pom.xml.releaseBackup
  33 +pom.xml.versionsBackup
  34 +pom.xml.next
  35 +release.properties
  36 +dependency-reduced-pom.xml
  37 +buildNumber.properties
  38 +.mvn/timing.properties
  39 +
  40 +# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
  41 +!/.mvn/wrapper/maven-wrapper.jar
  42 +### Eclipse template
  43 +
  44 +.metadata
  45 +bin/
  46 +tmp/
  47 +*.tmp
  48 +*.bak
  49 +*.swp
  50 +*~.nib
  51 +local.properties
  52 +.settings/
  53 +.loadpath
  54 +.recommenders
  55 +
  56 +# Eclipse Core
  57 +.project
  58 +
  59 +# External tool builders
  60 +.externalToolBuilders/
  61 +
  62 +# Locally stored "Eclipse launch configurations"
  63 +*.launch
  64 +
  65 +# PyDev specific (Python IDE for Eclipse)
  66 +*.pydevproject
  67 +
  68 +# CDT-specific (C/C++ Development Tooling)
  69 +.cproject
  70 +
  71 +# JDT-specific (Eclipse Java Development Tools)
  72 +.classpath
  73 +
  74 +# Java annotation processor (APT)
  75 +.factorypath
  76 +
  77 +# PDT-specific (PHP Development Tools)
  78 +.buildpath
  79 +
  80 +# sbteclipse plugin
  81 +.target
  82 +
  83 +# Tern plugin
  84 +.tern-project
  85 +
  86 +# TeXlipse plugin
  87 +.texlipse
  88 +
  89 +# STS (Spring Tool Suite)
  90 +.springBeans
  91 +
  92 +# Code Recommenders
  93 +.recommenders/
86 94  
  95 +# Scala IDE specific (Scala & Java development for Eclipse)
  96 +.cache-main
  97 +.scala_dependencies
  98 +.worksheet
  99 +.idea
87 100 *.iml
... ...