romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

#247 Remove primefaces dependency #248

Merged
romanov73 merged 9 commits from 247-restore-mvc into dev 2024-05-02 13:10:01 +04:00
Conversation 0 Commits 9 Files Changed 141 +59 -69
3 changed files with 59 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 23797bae9e - Show all commits

94
build.gradle
View File

@ -1,34 +1,19 @@
buildscript { plugins {
ext { id 'java'
versionSpringBoot = '2.1.6.RELEASE' id 'org.springframework.boot' version '3.2.4'
} id 'io.spring.dependency-management' version '1.1.4'
id 'checkstyle'
repositories {
mavenLocal()
mavenCentral()
}
dependencies {
classpath group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: versionSpringBoot
}
} }
group 'ru.ulstu' group 'ru.ulstu'
version '0.1.0-SNAPSHOT' 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 build.dependsOn checkstyleMain
bootRun.dependsOn checkstyleMain bootRun.dependsOn checkstyleMain
sourceCompatibility = 11 java {
targetCompatibility = 11 sourceCompatibility = '17'
}
bootRun { bootRun {
systemProperties = System.properties systemProperties = System.properties
@ -76,9 +61,12 @@ task health(dependsOn: [
'checkstyleMain' 'checkstyleMain'
]) ])
jar { jar {
baseName = 'ng-tracker' enabled = false
}
bootJar {
archiveFileName = String.format('%s-%s.jar', rootProject.name, version)
} }
compileJava { compileJava {
@ -91,41 +79,41 @@ repositories {
} }
dependencies { dependencies {
compile group: 'org.springframework.boot', name: 'spring-boot-starter-web' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-security' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-security'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-aop' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-aop'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-mail' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf'
compile group: 'nz.net.ultraq.thymeleaf', name: 'thymeleaf-layout-dialect' implementation group: 'nz.net.ultraq.thymeleaf', name: 'thymeleaf-layout-dialect'
compile group: 'org.thymeleaf.extras', name: 'thymeleaf-extras-springsecurity5' implementation group: 'org.thymeleaf.extras', name: 'thymeleaf-extras-springsecurity6'
compile group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner' implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner'
compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-hibernate5' implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-hibernate5'
compile group: 'org.springframework.security', name: 'spring-security-oauth2-client' implementation group: 'org.springframework.security', name: 'spring-security-oauth2-client'
compile group: 'org.springframework.security', name: 'spring-security-oauth2-jose' 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' implementation group: 'org.liquibase', name: 'liquibase-core', version: '3.6.3'
compile group: 'com.mattbertolini', name: 'liquibase-slf4j', version: '2.0.0' 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' implementation group: 'org.webjars', name: 'bootstrap', version: '4.1.0'
compile group: 'org.webjars', name: 'bootstrap-select', version: '1.13.3' implementation group: 'org.webjars', name: 'bootstrap-select', version: '1.13.3'
compile group: 'org.webjars', name: 'jquery', version: '3.3.1-1' implementation group: 'org.webjars', name: 'jquery', version: '3.3.1-1'
compile group: 'org.webjars.npm', name: 'jquery.easing', version: '1.4.1' implementation 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: 'font-awesome', version: '4.7.0'
compile group: 'io.springfox', name: 'springfox-swagger2', version: '2.6.0' implementation group: 'io.springfox', name: 'springfox-swagger2', version: '2.6.0'
compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.6.0' implementation group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.6.0'
compile group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.35.0' implementation group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.35.0'
compile group: 'xalan', name: 'xalan', version: '2.7.2' 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' //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: 'org.seleniumhq.selenium', name: 'selenium-support', version: '3.3.1'
//testCompile group: 'com.google.guava', name: 'guava', version: '21.0' //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
View File

@ -2,4 +2,6 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

16
src/main/resources/templates/papers/fragments/paperLineFragment.html
View File

@ -6,10 +6,12 @@
<body> <body>
<div th:fragment="paperLine (paper)" class="text-left paper-row" style="background-color: white;"> <div th:fragment="paperLine (paper)" class="text-left paper-row" style="background-color: white;">
<div class="row"> <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)"/> <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title}, small=false)"/>
</div> </div>
<div class="col-10"> <div class="col-10">
<div class="row">
<div class="col-12">
<a th:href="@{'../papers/paper?id='+${paper.id}}"> <a th:href="@{'../papers/paper?id='+${paper.id}}">
<span class="h6" th:if="${#strings.length(paper.title)} > 100" <span class="h6" th:if="${#strings.length(paper.title)} > 100"
th:text="${#strings.substring(paper.title, 0, 100) + ' ...'}" th:title="${paper.title}"/> th:text="${#strings.substring(paper.title, 0, 100) + ' ...'}" th:title="${paper.title}"/>
@ -17,6 +19,11 @@
th:title="${paper.title}"/> th:title="${paper.title}"/>
</a> </a>
</div> </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"> <div class="col-1 d-flex justify-content-center">
<input class="id-class" type="hidden" th:value="${paper.id}"/> <input class="id-class" type="hidden" th:value="${paper.id}"/>
<a class="remove-paper pull-right d-none" href="#" data-confirm="Удалить статью?"> <a class="remove-paper pull-right d-none" href="#" data-confirm="Удалить статью?">
@ -24,13 +31,6 @@
</a> </a>
</div> </div>
</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> </div>
</body> </body>
</html> </html>