Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Поднятие зависимости спринга #2902

Merged
merged 2 commits into from
Oct 15, 2022
Merged

Поднятие зависимости спринга #2902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f6c9e8
feat: spring dependency up
EightM Oct 15, 2022
b232090
feat: default values for config values
EightM Oct 15, 2022
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
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ plugins {
id("io.freefair.maven-central.validate-poms") version "6.5.1"
id("me.qoomon.git-versioning") version "6.3.2"
id("com.github.ben-manes.versions") version "0.42.0"
id("org.springframework.boot") version "2.6.7"
id("org.springframework.boot") version "2.7.4"
id("io.spring.dependency-management") version "1.0.14.RELEASE"
id("io.github.1c-syntax.bslls-dev-tools") version "0.7.0"
id("ru.vyarus.pom") version "2.2.1"
Expand Down
6 changes: 3 additions & 3 deletions ...a/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public class LanguageServerConfiguration {
@JsonProperty("documentLink")
@Setter(value = AccessLevel.NONE)
private DocumentLinkOptions documentLinkOptions = new DocumentLinkOptions();

@JsonProperty("formatting")
@Setter(value = AccessLevel.NONE)
private FormattingOptions formattingOptions = new FormattingOptions();
Expand All @@ -109,11 +109,11 @@ public class LanguageServerConfiguration {
@Setter(value = AccessLevel.NONE)
private File configurationFile;

@Value("${app.configuration.path}")
@Value("${app.configuration.path}:.bsl-language-server.json")
@JsonIgnore
private String configurationFilePath;

@Value(("${app.globalConfiguration.path}"))
@Value(("${app.globalConfiguration.path}:${user.home}/.bsl-language-server.json"))
@JsonIgnore
private String globalConfigPath;

Expand Down