Merge branch 'master' into 3-parse-rule

# Conflicts:
#	src/main/java/ru/ulstu/fc/rule/controller/RuleController.java
#	src/main/java/ru/ulstu/fc/rule/model/Variable.java
#	src/main/java/ru/ulstu/fc/rule/repository/VariableRepository.java
#	src/main/java/ru/ulstu/fc/rule/service/FuzzyInferenceService.java
#	src/main/java/ru/ulstu/fc/rule/service/VariableService.java
#	src/main/resources/templates/default.html
#	src/main/resources/templates/listRules.html
This commit is contained in:
Anton Romanov 2025-02-24 21:40:59 +04:00
commit 936f4386b7

View File

@ -1,67 +1,43 @@
buildscript {
ext {
versionSpringBoot = '2.3.9.RELEASE'
plugins {
id 'java'
id 'org.springframework.boot' version '3.4.2'
id 'io.spring.dependency-management' version '1.1.7'
}
group = 'ru.ulstu'
version = '0.0.1-SNAPSHOT'
java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
}
repositories {
mavenLocal()
mavenCentral()
}
dependencies {
classpath group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: versionSpringBoot
}
}
group 'ru.ulstu'
version '0.0.1'
apply plugin: 'java'
apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management'
sourceCompatibility = 11
targetCompatibility = 11
jar {
archiveBaseName = 'fuzzy-controller'
}
compileJava {
options.encoding = "UTF-8"
}
repositories {
mavenLocal()
mavenCentral()
maven {
url="https://repository.ow2.org/nexus/content/repositories/public"
url = uri("http://repo.athene.tech/repository/maven-central/")
allowInsecureProtocol(true)
}
}
configurations {
implementation.exclude module: "spring-boot-starter-tomcat"
implementation.exclude module: "follow-redirects"
implementation.exclude module: "is-buffer"
}
dependencies {
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-jetty'
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf'
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation'
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa'
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-webflux'
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-security'
implementation group: 'org.json', name: 'json', version: '20220320'
implementation group: 'nz.net.ultraq.thymeleaf', name: 'thymeleaf-layout-dialect'
implementation group: 'org.thymeleaf.extras', name: 'thymeleaf-extras-springsecurity6'
implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-hibernate5'
implementation group: 'com.h2database', name:'h2'
implementation group: 'commons-io', name: 'commons-io', version: '2.6'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation group: 'io.springfox', name: 'springfox-boot-starter', version: '3.0.0'
implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: '2.8.4'
implementation group: 'com.ibm.icu', name: 'icu4j', version: '63.1'
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5.9.0.202009080501-r'