Skip to content

Commit f84454b

Browse files
Merge pull request #25 from contentstack/include_fallback
Include fallback
2 parents 1b135c9 + 9d20708 commit f84454b

File tree

6 files changed

+448
-133
lines changed

6 files changed

+448
-133
lines changed

.github/workflows/maven-publish.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v2
17-
- name: Set up JDK 1.8
18-
uses: actions/setup-java@v1
19-
with:
20-
java-version: 1.8
21-
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
22-
settings-path: ${{ github.workspace }} # location for the settings.xml file
16+
- uses: actions/checkout@v2
17+
- name: Set up JDK 1.8
18+
uses: actions/setup-java@v1
19+
with:
20+
java-version: 1.8
21+
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
22+
settings-path: ${{ github.workspace }} # location for the settings.xml file
2323

24-
- name: Build with Maven
25-
run: mvn -B package --file pom.xml
24+
- name: Build with Maven
25+
run: mvn -B package --file pom.xml
2626

27-
- name: Publish to GitHub Packages Apache Maven
28-
run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml
29-
env:
30-
GITHUB_TOKEN: ${{ github.token }}
27+
- name: Publish to GitHub Packages Apache Maven
28+
run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml
29+
env:
30+
GITHUB_TOKEN: ${{ github.token }}

.github/workflows/maven.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ name: Java CI with Maven
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ master, include_fallback ]
99
pull_request:
10-
branches: [ master ]
10+
branches: [ master, include_fallback ]
1111

1212
jobs:
1313
build:
1414

1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v2
19-
- name: Set up JDK 1.8
20-
uses: actions/setup-java@v1
21-
with:
22-
java-version: 1.8
23-
- name: Build with Maven
24-
run: mvn -B package --file pom.xml
18+
- uses: actions/checkout@v2
19+
- name: Set up JDK 1.8
20+
uses: actions/setup-java@v1
21+
with:
22+
java-version: 1.8
23+
- name: Build with Maven
24+
run: mvn -B package --file pom.xml

.gitignore

+254-18
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,260 @@
1-
# Package Files #
2-
#*.jar
3-
*.ear
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
43

5-
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
6-
hs_err_pid*
7-
!/src/main/java/Test.java
4+
.project
5+
.classpath
6+
factoryConfiguration.json
87

9-
# OS generated files #
10-
.DS_Store
11-
.DS_Store?
8+
### Eclipse ###
9+
.metadata
10+
bin/
11+
tmp/
12+
*.tmp
13+
*.bak
14+
*.swp
15+
*~.nib
16+
local.properties
17+
.settings/
18+
.loadpath
19+
.recommenders
20+
21+
# External tool builders
22+
.externalToolBuilders/
23+
24+
# Locally stored "Eclipse launch configurations"
25+
*.launch
26+
27+
# PyDev specific (Python IDE for Eclipse)
28+
*.pydevproject
29+
30+
# CDT-specific (C/C++ Development Tooling)
31+
.cproject
32+
33+
# CDT- autotools
34+
.autotools
35+
36+
# Java annotation processor (APT)
37+
.factorypath
38+
39+
# PDT-specific (PHP Development Tools)
40+
.buildpath
41+
42+
# sbteclipse plugin
43+
.target
44+
45+
# Tern plugin
46+
.tern-project
47+
48+
# TeXlipse plugin
49+
.texlipse
50+
51+
# STS (Spring Tool Suite)
52+
.springBeans
53+
54+
# Code Recommenders
55+
.recommenders/
56+
57+
# Annotation Processing
58+
.apt_generated/
59+
.apt_generated_test/
1260

61+
# Scala IDE specific (Scala & Java development for Eclipse)
62+
.cache-main
63+
.scala_dependencies
64+
.worksheet
1365

14-
# Compiled source files #
15-
*.iml
16-
/target/
17-
/out/
18-
/profiles.xml/
19-
*.class
66+
# Uncomment this line if you wish to ignore the project description file.
67+
# Typically, this file would be tracked if it contains build/dependency configurations:
68+
#.project
69+
70+
### Eclipse Patch ###
71+
# Spring Boot Tooling
72+
.sts4-cache/
73+
74+
### Intellij ###
75+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
76+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
77+
78+
# User-specific stuff
79+
.idea/**/workspace.xml
80+
.idea/**/tasks.xml
81+
.idea/**/usage.statistics.xml
82+
.idea/**/dictionaries
83+
.idea/**/shelf
84+
85+
# Generated files
86+
.idea/**/contentModel.xml
87+
88+
# Sensitive or high-churn files
89+
.idea/**/dataSources/
90+
.idea/**/dataSources.ids
91+
.idea/**/dataSources.local.xml
92+
.idea/**/sqlDataSources.xml
93+
.idea/**/dynamic.xml
94+
.idea/**/uiDesigner.xml
95+
.idea/**/dbnavigator.xml
96+
97+
# Gradle
98+
.idea/**/gradle.xml
99+
.idea/**/libraries
100+
101+
# Gradle and Maven with auto-import
102+
# When using Gradle or Maven with auto-import, you should exclude module files,
103+
# since they will be recreated, and may cause churn. Uncomment if using
104+
# auto-import.
105+
# .idea/artifacts
106+
# .idea/compiler.xml
107+
# .idea/jarRepositories.xml
108+
# .idea/modules.xml
109+
# .idea/*.iml
110+
# .idea/modules
111+
# *.iml
112+
# *.ipr
113+
114+
# CMake
115+
cmake-build-*/
116+
117+
# Mongo Explorer plugin
118+
.idea/**/mongoSettings.xml
119+
120+
# File-based project format
121+
*.iws
122+
123+
# IntelliJ
20124
out/
125+
126+
# mpeltonen/sbt-idea plugin
127+
.idea_modules/
128+
129+
# JIRA plugin
130+
atlassian-ide-plugin.xml
131+
132+
# Cursive Clojure plugin
133+
.idea/replstate.xml
134+
135+
# Crashlytics plugin (for Android Studio and IntelliJ)
136+
com_crashlytics_export_strings.xml
137+
crashlytics.properties
138+
crashlytics-build.properties
139+
fabric.properties
140+
141+
# Editor-based Rest Client
142+
.idea/httpRequests
143+
144+
# Android studio 3.1+ serialized cache file
145+
.idea/caches/build_file_checksums.ser
146+
147+
### Intellij Patch ###
148+
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
149+
150+
# *.iml
151+
# modules.xml
152+
# .idea/misc.xml
153+
# *.ipr
154+
155+
# Sonarlint plugin
156+
# https://plugins.jetbrains.com/plugin/7973-sonarlint
157+
.idea/**/sonarlint/
158+
159+
# SonarQube Plugin
160+
# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
161+
.idea/**/sonarIssues.xml
162+
163+
# Markdown Navigator plugin
164+
# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
165+
.idea/**/markdown-navigator.xml
166+
.idea/**/markdown-navigator-enh.xml
167+
.idea/**/markdown-navigator/
168+
169+
# Cache file creation bug
170+
# See https://youtrack.jetbrains.com/issue/JBR-2257
171+
.idea/$CACHE_FILE$
172+
173+
# CodeStream plugin
174+
# https://plugins.jetbrains.com/plugin/12206-codestream
175+
.idea/codestream.xml
176+
177+
### Java-Web ###
178+
## ignoring target file
179+
target/
180+
181+
### macOS ###
182+
# General
183+
.DS_Store
184+
.AppleDouble
185+
.LSOverride
186+
187+
# Icon must end with two \r
188+
Icon
189+
190+
# Thumbnails
191+
._*
192+
193+
# Files that might appear in the root of a volume
194+
.DocumentRevisions-V100
195+
.fseventsd
196+
.Spotlight-V100
197+
.TemporaryItems
198+
.Trashes
199+
.VolumeIcon.icns
200+
.com.apple.timemachine.donotpresent
201+
202+
# Directories potentially created on remote AFP share
203+
.AppleDB
204+
.AppleDesktop
205+
Network Trash Folder
206+
Temporary Items
207+
.apdisk
208+
209+
### Maven ###
210+
pom.xml.tag
211+
pom.xml.releaseBackup
212+
pom.xml.versionsBackup
213+
pom.xml.next
214+
release.properties
215+
dependency-reduced-pom.xml
216+
buildNumber.properties
217+
.mvn/timing.properties
218+
# https://github.com/takari/maven-wrapper#usage-without-binary-jar
219+
.mvn/wrapper/maven-wrapper.jar
220+
221+
### VisualStudioCode ###
222+
.vscode/*
223+
!.vscode/settings.json
224+
!.vscode/tasks.json
225+
!.vscode/launch.json
226+
!.vscode/extensions.json
227+
*.code-workspace
228+
229+
### VisualStudioCode Patch ###
230+
# Ignore all local history of files
231+
.history
232+
233+
### Gradle ###
234+
.gradle
21235
build/
22-
.idea/
23-
*.log
24-
CSLoggerLevel/
236+
237+
# Ignore Gradle GUI config
238+
gradle-app.setting
239+
240+
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
241+
!gradle-wrapper.jar
242+
243+
# Cache of project
244+
.gradletasknamecache
245+
246+
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
247+
# gradle/wrapper/gradle-wrapper.properties
248+
249+
### Gradle Patch ###
250+
**/build/
251+
252+
# End of https://www.toptal.com/developers/gitignore/api/macos,code-java,java-web,maven,gradle,intellij,visualstudiocode,eclipse
253+
.idea/compiler.xml
254+
.idea/encodings.xml
255+
.idea/jarRepositories.xml
256+
.idea/misc.xml
257+
.idea/modules.xml
258+
.idea/vcs.xml
259+
java.iml
260+
src/main/resources/

0 commit comments

Comments
 (0)