Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pull_request_rules:
- name: Automatic merge on approval
conditions:
- "#approved-reviews-by>=1"
actions:
merge:
method: merge
4 changes: 2 additions & 2 deletions json-modules/json/src/main/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"version": "0.0.1",
"license": "MIT",
"dependencies": {
"typings": "0.6.5",
"jsonforms": "0.0.19",
"typings": "0.7.0",
"jsonforms": "0.0.20",
"bootstrap": "3.3.6"
}
}
4 changes: 2 additions & 2 deletions libraries-data/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
<assembly.plugin.version>2.3</assembly.plugin.version>
<httpclient.version>3.1</httpclient.version>
<storm.version>1.2.2</storm.version>
<kafka.version>3.3.1</kafka.version>
<kafka.version>3.4.0</kafka.version>
<ignite.version>2.4.0</ignite.version>
<gson.version>2.9.1</gson.version>
<cache.version>1.1.1</cache.version>
Expand All @@ -180,4 +180,4 @@
<jmapper.version>1.6.0.1</jmapper.version>
</properties>

</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<spring-boot.version>2.1.13.RELEASE</spring-boot.version>
<!-- downgrading the version as twitterstream and hdfs starter apps does not support later versions -->
<spring-cloud-dependencies.version>Greenwich.SR6</spring-cloud-dependencies.version>
<spring-cloud-starter-stream.version>2.1.2.RELEASE</spring-cloud-starter-stream.version>
<spring-cloud-starter-stream.version>2.1.3.RELEASE</spring-cloud-starter-stream.version>
<!-- used only in dependency management to force this version, not included as a direct dependency -->
<junit.version>4.13.2</junit.version>
<junit-jupiter.version>5.8.1</junit-jupiter.version>
Expand Down