switch from Java EE to Jakarta EE

This commit is contained in:
2022-11-15 20:07:36 +08:00
parent 9b94bffff0
commit d9bf885b2d
27 changed files with 210 additions and 180 deletions

View File

@@ -1,6 +1,6 @@
plugins {
id 'net.woggioni.gradle.lombok' apply false
id 'net.woggioni.gradle.wildfly'
alias(catalog.plugins.lombok) apply false
alias(catalog.plugins.wildfly)
id 'war'
id 'maven-publish'
}
@@ -33,7 +33,7 @@ allprojects {
}
tasks.withType(JavaCompile) {
options.release = 11
options.release = 17
}
tasks.withType(Test) {
@@ -44,46 +44,35 @@ allprojects {
dependencies {
implementation project(':jpacrepo-impl')
implementation group: 'net.woggioni', name: 'jwo'
implementation group: 'org.slf4j', name: 'slf4j-api'
compileOnly group: 'org.hibernate', name: 'hibernate-jpamodelgen'
// compileOnly group: 'jakarta.persistence',
// name: 'jakarta.persistence-api', version: getProperty('jakarta.persistence.version')
// compileOnly group: 'jakarta.annotation',
// name: 'jakarta.annotation-api',
// version: getProperty('jakarta.annotation.version')
// compileOnly group: 'jakarta.platform',
// name: 'jakarta.jakartaee-web-api',
// version: getProperty('jakarta.ee.version')
compileOnly group: 'jakarta.platform', name: 'jakarta.jakartaee-api'
implementation group: 'org.apache.commons', name: 'commons-compress'
implementation group: 'net.java.dev.jna', name: 'jna'
implementation catalog.jwo
implementation catalog.slf4j.api
// compileOnly group: 'jakarta.inject',
// name: 'jakarta.inject-api', version: getProperty('jakarta.inject.version')
// compileOnly group: 'jakarta.enterprise', name: 'jakarta.enterprise.cdi-api', version: getProperty('jakarta.cdi.version')
compileOnly catalog.hibernate.jpamodelgen
compileOnly catalog.jakarta.enterprise.cdi.api
compileOnly catalog.jakarta.servlet.api
compileOnly catalog.jakarta.ejb.api
compileOnly catalog.jakarta.ws.rs.api
compileOnly catalog.jakarta.xml.bind.api
compileOnly catalog.jakarta.enterprise.concurrent.api
testImplementation group: 'jakarta.platform', name: 'jakarta.jakartaee-api'
// testImplementation group: 'jakarta.platform',
// name: 'jakarta.jakartaee-web-api',
// version: getProperty('jakarta.ee.version')
testImplementation group: 'org.jboss', name: 'jboss-ejb-client'
testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core'
testImplementation group: 'com.h2database', name: 'h2'
testImplementation group: 'org.hibernate', name: 'hibernate-core'
testImplementation group: 'org.jboss.resteasy', name: 'resteasy-client'
testImplementation group: 'org.jboss.resteasy', name: 'resteasy-jackson2-provider'
testRuntimeOnly group: 'org.slf4j', name: 'slf4j-simple'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine'
}
implementation catalog.commons.compress
implementation catalog.jna
wrapper {
distributionType = Wrapper.DistributionType.BIN
gradleVersion = getProperty('gradle.version')
testImplementation catalog.jackson.module.jakarta.xmlbind.annotations
testImplementation catalog.jboss.ejb.client
testImplementation catalog.weld.se.core
testImplementation catalog.h2
testImplementation catalog.hibernate.core
testImplementation catalog.resteasy.client
testImplementation catalog.resteasy.jackson2.provider
testImplementation catalog.jackson.datatype.jsr310
testRuntimeOnly catalog.slf4j.simple
testImplementation catalog.junit.jupiter.api
testImplementation catalog.junit.jupiter.params
testRuntimeOnly catalog.junit.jupiter.engine
}
File nimDir = project.file('nim')