Skip to content

Commit b324cbb

Browse files
mike-d-davydovmike-d-davydov
authored
Merge branch 'master' into feature/update-gitignore
2 parents 420c2bb + f65e92e commit b324cbb

File tree

66 files changed

+4812
-2867
lines changed

Some content is hidden

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

66 files changed

+4812
-2867
lines changed

‎.classpath‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
10+
<attributes>
11+
<attribute name="maven.pomderived" value="true"/>
12+
<attribute name="optional" value="true"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
16+
<attributes>
17+
<attribute name="optional" value="true"/>
18+
<attribute name="maven.pomderived" value="true"/>
19+
<attribute name="test" value="true"/>
20+
</attributes>
21+
</classpathentry>
22+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
23+
<attributes>
24+
<attribute name="maven.pomderived" value="true"/>
25+
<attribute name="test" value="true"/>
26+
<attribute name="optional" value="true"/>
27+
</attributes>
28+
</classpathentry>
29+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
30+
<attributes>
31+
<attribute name="maven.pomderived" value="true"/>
32+
</attributes>
33+
</classpathentry>
34+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
35+
<attributes>
36+
<attribute name="maven.pomderived" value="true"/>
37+
</attributes>
38+
</classpathentry>
39+
<classpathentry kind="src" path="target/generated-sources/annotations">
40+
<attributes>
41+
<attribute name="optional" value="true"/>
42+
<attribute name="maven.pomderived" value="true"/>
43+
<attribute name="ignore_optional_problems" value="true"/>
44+
<attribute name="m2e-apt" value="true"/>
45+
</attributes>
46+
</classpathentry>
47+
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
48+
<attributes>
49+
<attribute name="optional" value="true"/>
50+
<attribute name="maven.pomderived" value="true"/>
51+
<attribute name="ignore_optional_problems" value="true"/>
52+
<attribute name="m2e-apt" value="true"/>
53+
<attribute name="test" value="true"/>
54+
</attributes>
55+
</classpathentry>
56+
<classpathentry kind="output" path="target/classes"/>
57+
</classpath>

‎.editorconfig‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[*]
2+
indent_style = space
3+
indent_size = 2
4+
end_of_line = lf
5+
charset = utf-8
6+
trim_trailing_whitespace = true
7+
insert_final_newline = true

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ name: CI
22

33
on:
44
push:
5-
branches: [ master, develop, 'feature/**' ]
5+
branches: [ master, develop ]
66
pull_request:
77
branches: [ master, develop ]
8+
types: [opened, synchronize, reopened, ready_for_review]
89

910
jobs:
1011
test:
@@ -104,8 +105,6 @@ jobs:
104105
target/spotbugsXml.xml
105106
target/spotbugs.html
106107
107-
108-
109108
- name: Run Checkstyle
110109
run: |
111110
mvn checkstyle:check

‎.gitignore‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@ crashlytics.properties
3131
crashlytics-build.properties
3232
fabric.properties
3333

34-
3534
# Eclipse
3635
.classpath
3736
.project
3837
.settings/
3938
*.launch
40-
.externalToolBuilders/
41-
39+
.externalToolBuilders/

‎.project‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>jpwise</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
22+
</natures>
23+
<filteredResources>
24+
<filter>
25+
<id>1748369190227</id>
26+
<name></name>
27+
<type>30</type>
28+
<matcher>
29+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
31+
</matcher>
32+
</filter>
33+
</filteredResources>
34+
</projectDescription>

‎.settings/org.eclipse.core.resources.prefs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
eclipse.preferences.version=1
2+
encoding//src/main/java=UTF-8
3+
encoding//src/main/resources=UTF-8
4+
encoding//src/test/java=UTF-8
5+
encoding//src/test/resources=UTF-8
6+
encoding/<project>=UTF-8

‎.settings/org.eclipse.jdt.apt.core.prefs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.apt.aptEnabled=false

‎.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
3+
org.eclipse.jdt.core.compiler.annotation.nonnull=javax.annotation.Nonnull
4+
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=javax.annotation.ParametersAreNonnullByDefault
5+
org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable
6+
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
7+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
8+
org.eclipse.jdt.core.compiler.compliance=11
9+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
10+
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
11+
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
12+
org.eclipse.jdt.core.compiler.problem.nullReference=warning
13+
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
14+
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
15+
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
16+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
17+
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
18+
org.eclipse.jdt.core.compiler.processAnnotations=disabled
19+
org.eclipse.jdt.core.compiler.release=disabled
20+
org.eclipse.jdt.core.compiler.source=11

‎.settings/org.eclipse.m2e.core.prefs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

‎.vscode/settings.json‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
11
{
2+
"java.checkstyle.configuration": "${workspaceFolder}/checkstyle.xml",
3+
"java.checkstyle.version": "9.3",
4+
"editor.formatOnSave": true,
5+
"editor.formatOnPaste": true,
6+
"editor.formatOnType": true,
7+
"editor.codeActionsOnSave": {
8+
"source.organizeImports": "explicit",
9+
"source.fixAll": "explicit"
10+
},
211
"java.configuration.updateBuildConfiguration": "automatic",
3-
"java.compile.nullAnalysis.mode": "automatic"
12+
"java.compile.nullAnalysis.mode": "automatic",
13+
"java.import.generatesMetadataFilesAtProjectRoot": true,
14+
"java.sources.organizeImports.starThreshold": 99,
15+
"java.sources.organizeImports.staticStarThreshold": 99,
16+
"[java]": {
17+
"editor.defaultFormatter": null,
18+
"editor.formatOnSave": false,
19+
"editor.formatOnPaste": false,
20+
"editor.formatOnType": false
21+
}
422
}

0 commit comments

Comments
 (0)