#247 -- Update spring version, gradle version
This commit is contained in:
parent
37c1d0db08
commit
23797bae9e
96
build.gradle
96
build.gradle
@ -1,34 +1,19 @@
|
||||
buildscript {
|
||||
ext {
|
||||
versionSpringBoot = '2.1.6.RELEASE'
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: versionSpringBoot
|
||||
}
|
||||
plugins {
|
||||
id 'java'
|
||||
id 'org.springframework.boot' version '3.2.4'
|
||||
id 'io.spring.dependency-management' version '1.1.4'
|
||||
id 'checkstyle'
|
||||
}
|
||||
|
||||
group 'ru.ulstu'
|
||||
version '0.1.0-SNAPSHOT'
|
||||
|
||||
apply plugin: 'application'
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'org.springframework.boot'
|
||||
apply plugin: 'io.spring.dependency-management'
|
||||
apply plugin: 'checkstyle'
|
||||
|
||||
mainClassName = 'ru.ulstu.NgTrackerApplication'
|
||||
|
||||
build.dependsOn checkstyleMain
|
||||
bootRun.dependsOn checkstyleMain
|
||||
|
||||
sourceCompatibility = 11
|
||||
targetCompatibility = 11
|
||||
java {
|
||||
sourceCompatibility = '17'
|
||||
}
|
||||
|
||||
bootRun {
|
||||
systemProperties = System.properties
|
||||
@ -64,7 +49,7 @@ checkstyle {
|
||||
checkstyle
|
||||
}
|
||||
|
||||
dependencies{
|
||||
dependencies {
|
||||
assert project.hasProperty("checkstyleVersion")
|
||||
|
||||
checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
|
||||
@ -76,9 +61,12 @@ task health(dependsOn: [
|
||||
'checkstyleMain'
|
||||
])
|
||||
|
||||
|
||||
jar {
|
||||
baseName = 'ng-tracker'
|
||||
enabled = false
|
||||
}
|
||||
|
||||
bootJar {
|
||||
archiveFileName = String.format('%s-%s.jar', rootProject.name, version)
|
||||
}
|
||||
|
||||
compileJava {
|
||||
@ -91,41 +79,41 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-web'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-security'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-aop'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-mail'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf'
|
||||
compile group: 'nz.net.ultraq.thymeleaf', name: 'thymeleaf-layout-dialect'
|
||||
compile group: 'org.thymeleaf.extras', name: 'thymeleaf-extras-springsecurity5'
|
||||
compile group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner'
|
||||
compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-hibernate5'
|
||||
compile group: 'org.springframework.security', name: 'spring-security-oauth2-client'
|
||||
compile group: 'org.springframework.security', name: 'spring-security-oauth2-jose'
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-security'
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-aop'
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail'
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat'
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa'
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf'
|
||||
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: 'org.springframework.security', name: 'spring-security-oauth2-client'
|
||||
implementation group: 'org.springframework.security', name: 'spring-security-oauth2-jose'
|
||||
|
||||
compile group: 'org.postgresql', name: 'postgresql', version: '42.2.5'
|
||||
implementation group: 'org.postgresql', name: 'postgresql', version: '42.2.5'
|
||||
|
||||
compile group: 'org.liquibase', name: 'liquibase-core', version: '3.6.3'
|
||||
compile group: 'com.mattbertolini', name: 'liquibase-slf4j', version: '2.0.0'
|
||||
implementation group: 'org.liquibase', name: 'liquibase-core', version: '3.6.3'
|
||||
implementation group: 'com.mattbertolini', name: 'liquibase-slf4j', version: '2.0.0'
|
||||
|
||||
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
|
||||
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
|
||||
|
||||
compile group: 'org.webjars', name: 'bootstrap', version: '4.1.0'
|
||||
compile group: 'org.webjars', name: 'bootstrap-select', version: '1.13.3'
|
||||
compile group: 'org.webjars', name: 'jquery', version: '3.3.1-1'
|
||||
compile group: 'org.webjars.npm', name: 'jquery.easing', version: '1.4.1'
|
||||
compile group: 'org.webjars', name: 'font-awesome', version: '4.7.0'
|
||||
implementation group: 'org.webjars', name: 'bootstrap', version: '4.1.0'
|
||||
implementation group: 'org.webjars', name: 'bootstrap-select', version: '1.13.3'
|
||||
implementation group: 'org.webjars', name: 'jquery', version: '3.3.1-1'
|
||||
implementation group: 'org.webjars.npm', name: 'jquery.easing', version: '1.4.1'
|
||||
implementation group: 'org.webjars', name: 'font-awesome', version: '4.7.0'
|
||||
|
||||
compile group: 'io.springfox', name: 'springfox-swagger2', version: '2.6.0'
|
||||
compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.6.0'
|
||||
compile group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.35.0'
|
||||
compile group: 'xalan', name: 'xalan', version: '2.7.2'
|
||||
implementation group: 'io.springfox', name: 'springfox-swagger2', version: '2.6.0'
|
||||
implementation group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.6.0'
|
||||
implementation group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.35.0'
|
||||
implementation group: 'xalan', name: 'xalan', version: '2.7.2'
|
||||
|
||||
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test'
|
||||
testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
|
||||
//compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.3.1'
|
||||
//testCompile group: 'org.seleniumhq.selenium', name: 'selenium-support', version: '3.3.1'
|
||||
//testCompile group: 'com.google.guava', name: 'guava', version: '21.0'
|
||||
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
|
||||
testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
|
||||
}
|
||||
|
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -2,4 +2,6 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
|
@ -6,16 +6,23 @@
|
||||
<body>
|
||||
<div th:fragment="paperLine (paper)" class="text-left paper-row" style="background-color: white;">
|
||||
<div class="row">
|
||||
<div class="col-1 d-flex justify-content-center">
|
||||
<div class="col-1 d-flex justify-content-center align-self-center">
|
||||
<span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title}, small=false)"/>
|
||||
</div>
|
||||
<div class="col-10">
|
||||
<a th:href="@{'../papers/paper?id='+${paper.id}}">
|
||||
<span class="h6" th:if="${#strings.length(paper.title)} > 100"
|
||||
th:text="${#strings.substring(paper.title, 0, 100) + ' ...'}" th:title="${paper.title}"/>
|
||||
<span class="h6" th:if="${#strings.length(paper.title) le 100}" th:text="${paper.title}"
|
||||
th:title="${paper.title}"/>
|
||||
</a>
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<a th:href="@{'../papers/paper?id='+${paper.id}}">
|
||||
<span class="h6" th:if="${#strings.length(paper.title)} > 100"
|
||||
th:text="${#strings.substring(paper.title, 0, 100) + ' ...'}" th:title="${paper.title}"/>
|
||||
<span class="h6" th:if="${#strings.length(paper.title) le 100}" th:text="${paper.title}"
|
||||
th:title="${paper.title}"/>
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-10">
|
||||
<span class="text-muted" th:text="${paper.authorsString}"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-1 d-flex justify-content-center">
|
||||
<input class="id-class" type="hidden" th:value="${paper.id}"/>
|
||||
@ -24,13 +31,6 @@
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-1">
|
||||
</div>
|
||||
<div class="col-10">
|
||||
<span class="text-muted" th:text="${paper.authorsString}"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
Loading…
Reference in New Issue
Block a user