From 7b56c38acbaf46d58fa67de35d4871aecfbe3441 Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Sun, 12 Jun 2022 11:47:35 +0800 Subject: [PATCH] added lys platform --- build.gradle | 55 +++++++++++++++--------------------- gradle.properties | 2 ++ jpacrepo-api/build.gradle | 6 ++-- jpacrepo-client/build.gradle | 11 +++----- jpacrepo-impl/build.gradle | 6 ++-- 5 files changed, 33 insertions(+), 47 deletions(-) diff --git a/build.gradle b/build.gradle index 64206f5..756c0f3 100644 --- a/build.gradle +++ b/build.gradle @@ -18,11 +18,16 @@ allprojects { url = 'https://woggioni.net/mvn/' content { includeGroup 'net.woggioni' + includeGroup 'com.lys' } } mavenCentral() } + dependencies { + implementation platform(group: 'com.lys', name: 'lys-dependencies', version: getProperty('lys.version')) + } + lombok { version = getProperty('lombok.version') } @@ -39,12 +44,10 @@ allprojects { dependencies { implementation project(':jpacrepo-impl') - implementation group: 'net.woggioni', name: 'jwo', version: getProperty('jwo.version') - implementation group: 'org.slf4j', name: 'slf4j-api', version: getProperty('slf4j.version') + implementation group: 'net.woggioni', name: 'jwo' + implementation group: 'org.slf4j', name: 'slf4j-api' - compileOnly group: 'org.hibernate', - name: 'hibernate-jpamodelgen', - version: getProperty('hibernate.version') + compileOnly group: 'org.hibernate', name: 'hibernate-jpamodelgen' // compileOnly group: 'jakarta.persistence', // name: 'jakarta.persistence-api', version: getProperty('jakarta.persistence.version') // compileOnly group: 'jakarta.annotation', @@ -53,43 +56,29 @@ dependencies { // compileOnly group: 'jakarta.platform', // name: 'jakarta.jakartaee-web-api', // version: getProperty('jakarta.ee.version') - compileOnly group: 'jakarta.platform', - name: 'jakarta.jakartaee-api', - version: getProperty('jakarta.ee.version') - implementation group: 'org.apache.commons', - name: 'commons-compress', - version: getProperty('apache.commons.compress.version') - implementation group: 'net.java.dev.jna', name: 'jna', version: getProperty('jna.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' // 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') - testImplementation group: 'jakarta.platform', - name: 'jakarta.jakartaee-api', - version: getProperty('jakarta.ee.version') + 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', version: getProperty('jboss.ejb.client.version') - testImplementation group: 'org.jboss.weld.se', - name: 'weld-se-core', version: getProperty('weld.version') - testImplementation group: 'com.h2database', - name: 'h2', version: getProperty('h2.version') - testImplementation group: 'org.hibernate', - name: 'hibernate-core', - version: getProperty('hibernate.version') - testImplementation group: 'org.jboss.resteasy', - name: 'resteasy-client', version: getProperty('resteasy.version') - testImplementation group: 'org.jboss.resteasy', - name: 'resteasy-jackson2-provider', version: getProperty('resteasy.version') - testRuntimeOnly group: 'org.slf4j', - name: 'slf4j-simple', version: getProperty('slf4j.version') - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: getProperty('junit.jupiter.version') - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: getProperty('junit.jupiter.version') - testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: getProperty('junit.jupiter.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' } wrapper { diff --git a/gradle.properties b/gradle.properties index 2616bde..12f0f19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,8 @@ net.woggioni.gradle.envelope.version=1.0-SNAPSHOT jpacrepo.version=2.0-SNAPSHOT +lys.version=0.1-SNAPSHOT + lombok.version=1.18.22 slf4j.version=1.7.32 xz.version=1.9 diff --git a/jpacrepo-api/build.gradle b/jpacrepo-api/build.gradle index 866de4e..df1e33b 100644 --- a/jpacrepo-api/build.gradle +++ b/jpacrepo-api/build.gradle @@ -3,10 +3,8 @@ plugins { } dependencies { - compileOnly group: 'jakarta.platform', - name: 'jakarta.jakartaee-api', - version: getProperty('jakarta.ee.version') - compileOnly group: 'javax.xml.bind', name: 'jaxb-api', version: getProperty('jaxb.api.version') + compileOnly group: 'jakarta.platform', name: 'jakarta.jakartaee-api' + compileOnly group: 'javax.xml.bind', name: 'jaxb-api' } tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) { JavaCompile j -> diff --git a/jpacrepo-client/build.gradle b/jpacrepo-client/build.gradle index f611353..30f63c0 100644 --- a/jpacrepo-client/build.gradle +++ b/jpacrepo-client/build.gradle @@ -7,14 +7,11 @@ import net.woggioni.gradle.envelope.EnvelopeJarTask dependencies { - implementation group: 'org.slf4j', name: 'slf4j-api', version: getProperty('slf4j.version') - implementation group: 'org.apache.logging.log4j', - name: 'log4j-slf4j-impl', - version: getProperty('log4j.version') - implementation project(':jpacrepo-api') - runtimeOnly group: 'org.jboss', - name: 'jboss-ejb-client', version: getProperty('jboss.ejb.client.version') + implementation group: 'org.slf4j', name: 'slf4j-api' + implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl' + + runtimeOnly group: 'org.jboss', name: 'jboss-ejb-client' } diff --git a/jpacrepo-impl/build.gradle b/jpacrepo-impl/build.gradle index 67b3b98..1b15c6f 100644 --- a/jpacrepo-impl/build.gradle +++ b/jpacrepo-impl/build.gradle @@ -7,10 +7,10 @@ dependencies { name: 'jakarta.jakartaee-api', version: getProperty('jakarta.ee.version') - implementation group: 'org.tukaani', name: 'xz', version: getProperty('xz.version') - implementation group: 'org.slf4j', name: 'slf4j-api', version: getProperty('slf4j.version') + implementation group: 'org.tukaani', name: 'xz' + implementation group: 'org.slf4j', name: 'slf4j-api' implementation group: 'net.woggioni', name: 'jzstd', version: getProperty('jzstd.version') - implementation group: 'net.woggioni', name: 'jwo', version: getProperty('jwo.version') + implementation group: 'net.woggioni', name: 'jwo' implementation group: 'org.apache.commons', name: 'commons-compress', version: getProperty('apache.commons.compress.version')