Solve the code conflicts from dev-1.1.0 to master. #854
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix complication problems
Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.12 to 42.3.3. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](pgjdbc/pgjdbc@REL42.2.12...REL42.3.3) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.12 to 42.3.3. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](pgjdbc/pgjdbc@REL42.2.12...REL42.3.3) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
Fix the problem of killing workflow.
Fix login log printing problem.
Remove @OverRide of kill method.
Resolve the compilation problem about Pair object and update README about the compatibility information of DSS with integrated third-party application tools.
[release] Prepare for release DSS-1.0.1
Bumps [h2](https://github.com/h2database/h2database) from 1.4.196 to 2.1.210. - [Release notes](https://github.com/h2database/h2database/releases) - [Commits](h2database/h2database@version-1.4.196...version-2.1.210) --- updated-dependencies: - dependency-name: com.h2database:h2 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [xstream](https://github.com/x-stream/xstream) from 1.4.15 to 1.4.19. - [Release notes](https://github.com/x-stream/xstream/releases) - [Commits](https://github.com/x-stream/xstream/commits) --- updated-dependencies: - dependency-name: com.thoughtworks.xstream:xstream dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [gson](https://github.com/google/gson) from 2.8.5 to 2.8.9. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](google/gson@gson-parent-2.8.5...gson-parent-2.8.9) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
…ven/com.google.code.gson-gson-2.8.9 Bump gson from 2.8.5 to 2.8.9
[Fix WeBankFinTech#582] Jackson-annotations-2.12.6.1.jar not found
Fix WeBankFinTech#583 fasterxml.jackson-databind.version fasterxml.jackson-annotations.version update to 2.13.3
Fix Jackson-annotations-2.12.6.1.jar not found
Adapter for linkis-1.1.0 version.
dss1.0.1 adopt to linkis1.1.1
Update the Integrated data application components compatibility.
Update the compatibility of Integrated data application components.
Update the Integrated data application components compatibility.
Update the Integrated data application components compatibility.
Update the compatibility of Integrated data application components.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is the purpose of the change
Solve the code conflicts from dev-1.1.0 to master.
Brief change log