library upgrades

This commit is contained in:
Jörg Henke
2021-02-26 17:33:18 +01:00
parent 71bb01e05c
commit a2d01b41e3
94 changed files with 2118 additions and 1780 deletions

View File

@ -7,22 +7,25 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.google.code.gson:gson:2.8.5'
classpath 'org.jooq:jooq-codegen:3.12.1'
classpath 'org.postgresql:postgresql:42.2.6'
classpath 'com.google.code.gson:gson:2.8.6'
classpath 'org.jooq:jooq-codegen:3.14.4'
classpath 'org.postgresql:postgresql:42.2.19'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:latest.release'
classpath 'nu.studer:gradle-jooq-plugin:3.0.3'
classpath 'nu.studer.jooq:nu.studer.jooq.gradle.plugin:5.2'
}
}
plugins {
id 'nu.studer.jooq' version '5.2'
}
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'war'
apply plugin: 'eclipse'
apply plugin: 'nu.studer.jooq'
group = 'jottyfan'
version = '1.1.3'
version = '1.1.4'
description = """timetrack"""
@ -43,65 +46,70 @@ repositories {
dependencies {
compile 'org.jboss.weld.servlet:weld-servlet:2.4.8.Final'
compile 'org.apache.myfaces.core:myfaces-api:2.3.4'
compile 'org.apache.myfaces.core:myfaces-impl:2.3.4'
compile 'net.bootsfaces:bootsfaces:1.4.2'
compile 'de.jooqFaces:jooqFaces:0.4.6'
compile 'org.postgresql:postgresql:42.2.6'
compile 'org.jooq:jooq:3.12.1'
compile 'org.jooq:jooq-codegen:3.12.1'
compile 'com.google.code.gson:gson:2.8.5'
compile 'org.apache.myfaces.core:myfaces-api:2.3.8'
compile 'org.apache.myfaces.core:myfaces-impl:2.3.8'
compile 'net.bootsfaces:bootsfaces:1.5.0'
compile 'org.postgresql:postgresql:42.2.19'
compile 'org.jooq:jooq:3.14.4'
compile 'org.jooq:jooq-codegen:3.14.4'
compile 'com.google.code.gson:gson:2.8.6'
compile 'org.jasypt:jasypt:1.9.3'
compile 'javax.servlet:javax.servlet-api:4.0.1'
compile 'org.apache.logging.log4j:log4j-core:2.12.1'
compile 'org.apache.logging.log4j:log4j-api:2.12.1'
compile 'org.apache.logging.log4j:log4j-core:2.14.0'
compile 'org.apache.logging.log4j:log4j-api:2.14.0'
testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.2'
testCompile 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
testCompile 'org.junit.jupiter:junit-jupiter-api:5.8.0-M1'
testCompile 'org.junit.jupiter:junit-jupiter-engine:5.8.0-M1'
runtime 'org.postgresql:postgresql:42.2.6'
runtime 'org.postgresql:postgresql:42.2.19'
jooqRuntime 'org.postgresql:postgresql:42.2.6'
jooqGenerator 'org.postgresql:postgresql:42.2.19'
}
jooq {
edition = 'OSS'
version = '3.12.1'
timetrack (sourceSets.main) {
jdbc {
driver = 'org.postgresql.Driver'
url = 'jdbc:postgresql://localhost:5432/timetrack'
user = "jooq"
password = ""
}
generator {
name = 'org.jooq.codegen.DefaultGenerator'
database {
name = 'org.jooq.meta.postgres.PostgresDatabase'
schemata {
schema {
inputSchema = 'done'
}
schema {
inputSchema = 'profile'
}
schema {
inputSchema = 'contact'
}
schema {
inputSchema = 'note'
}
}
includes = '.*'
}
generate {
relations = true
records = true
}
target {
packageName = 'de.jottyfan.timetrack.db'
directory = 'src/jooq/java'
}
edition = nu.studer.gradle.jooq.JooqEdition.OSS
version = '3.14.4'
configurations {
timetrack {
generateSchemaSourceOnCompilation = false
generationTool {
logging = org.jooq.meta.jaxb.Logging.WARN
jdbc {
driver = 'org.postgresql.Driver'
url = 'jdbc:postgresql://localhost:5432/timetrack'
user = dbUsername
password = dbPassword
}
generator {
name = 'org.jooq.codegen.DefaultGenerator'
database {
name = 'org.jooq.meta.postgres.PostgresDatabase'
schemata {
schema {
inputSchema = 'done'
}
schema {
inputSchema = 'profile'
}
schema {
inputSchema = 'contact'
}
schema {
inputSchema = 'note'
}
}
includes = '.*'
}
generate {
relations = true
records = true
}
target {
packageName = 'de.jottyfan.timetrack.db'
directory = 'src/jooq/java'
}
}
}
}
}
}
@ -113,6 +121,6 @@ war {
}
}
// removes the task dependency from compileJava to generateTimetrackJooqSchemaSource
project.tasks.getByName('compileJava').dependsOn -= 'generateTimetrackJooqSchemaSource'
project.tasks.getByName('compileJava').dependsOn -= 'generateTimetrackJooq'