diff --git a/README.md b/README.md index 2b5854f..53c8eb0 100644 --- a/README.md +++ b/README.md @@ -64,11 +64,17 @@ bash mvnw com.dkanejs.maven.plugins:docker-compose-maven-plugin:1.0.1:up ___akka-actor project___ + * java 8 based project * scala 2.12 - * akka 2.5.14 + * akka-actor 2.5.14 + * lombok (slf4j + logback logging) + * vavr (javaslang) * support fatjar * support sbt build system + * support maven build system * support gradle build system + * support application scripts when using gradle + * support testing with junit 4 / 5 * docker / docker-compose support type options: @@ -77,14 +83,19 @@ type options: - `scala-gradle-akka-actor` - `scala-sbt-akka-actor` -___scala akka-persistence project___ +___akka-persistence project___ + * java 8 based project * scala 2.12 - * akka 2.5.14 / akka-persistence + * akka-actor 2.5.14 / akka-persistence * support fatjar * support gradle build system * docker / docker-compose support +type options: + +- `scala-gradle-akka-persistence` + ___java-ee thymeleaf project___ * Java EE 8 based web project @@ -103,7 +114,7 @@ ___vertx project___ * java 8 based Vert.x web project * support fatjar - * support kotlin or java + * support kotlin 1.2.61 * support maven build system * support gradle build system * docker / docker-compose support @@ -119,7 +130,7 @@ ___spring cloud function web project___ * spring-boot 2 / spring framework 5 * support fatjar * support executable bash jar - * support kotlin or java + * support kotlin 1.2.61 * support maven build system * support gradle build system * docker / docker-compose support @@ -135,7 +146,7 @@ ___spring-boot 2 / spring framework 5 project___ * spring-boot 2 / spring framework 5 * support fatjar * support executable bash jar - * support kotlin or java + * support kotlin 1.2.61 * support maven build system * support gradle build system * vavr (javaslang) @@ -154,7 +165,7 @@ ___spring-boot 1 / spring framework 4 project___ * spring-boot 1 / spring framework 4 * support fatjar * support executable bash jar - * support kotlin or java + * support kotlin 1.2.61 * support maven build system * support gradle build system * vavr (javaslang) @@ -167,20 +178,6 @@ type options: - `java-spring-boot-1.x` - `kotlin-spring-boot-1.x` -___kotlin parent multi project___ - - * java 8 based parent multi project - * support kotlin - * support fatjar - * support executable bash jar - * support kotlin - * support maven build system - * support gradle build system - * vavr (javaslang) - * lombok (slf4j + logback logging) - * support testing with junit 4 / 5 - * docker / docker-compose support - ___java-ee-faces project___ * javaee 8.0 project @@ -190,10 +187,11 @@ ___java-ee-faces project___ * support gradle build system * docker / docker-compose support (Glassfish 5.0 / JBOSS EAP 7.1) -___java-ee CDI full multi project___ +___java-ee EAR multi project___ * javaee 8.0 project * EAR with EJB + CDI configured + * EAR without CDI at all, but could be easily added (`java-ee-cdi-multi-project`) * EJB3 (business services module: ejb-services) * EJB3 (JPA repositories module: ejb-data with embedded H2database for simplicity) * JAX-RS REST API @@ -205,64 +203,10 @@ ___java-ee CDI full multi project___ * support gradle build system * docker / docker-compose support (JBOSS EAP 7.1) -___java-ee EJB full multi project___ - - * javaee 8.0 project - * EAR without CDI at all, but could be easily added (see java-ee-cdi-multi-project) - * EJB3 (business services module: ejb-services) - * EJB3 (JPA repositories module: ejb-data with embedded H2database for simplicity) - * JAX-RS REST API - * WEB/HTML5 static content - * Servlet and JSP with EJB usage - * lombok (slf4j + logback logging) - * vavr (javaslang) - * support maven build system - * support gradle build system - * docker / docker-compose support (JBOSS EAP 7.1) - -___kotlin java-ee project___ - - * javaee 8.0 project - * lombok (slf4j + logback logging) - * vavr (javaslang) - * support kotlin - * support maven build system - * support gradle build system - * support testing with junit 4 / 5 - * docker / docker-compose support (JBOSS EAP 7.1) - -___kotlin fat project___ - - * java 8 based project - * support kotlin - * support fatjar - * support maven build system - * support gradle build system - * slf4j + logback logging - * support application scripts when using gradle - * docker / docker-compose support - -___scala akka-persistence gradle project___ - - * scala 2.12 based project - * akka-persistence - * lombok (slf4j + logback logging) - * support gradle build system and application executable scripts - * support testing using junit 4, scalactic, scalatest, specs2 - * docker / docker-compose support +type options: -___java-akka project___ - - * java 8 based project - * akka-actor - * lombok (slf4j + logback logging) - * vavr (javaslang) - * support fatjar - * support maven build system - * support gradle build system - * support application scripts when using gradle - * support testing with junit 4 / 5 - * docker / docker-compose support +- `java-ee-cdi-full-multi-project` +- `java-ee-ejb-full-multi-project` ___java-ee (micro-profile) project___ @@ -270,7 +214,7 @@ ___java-ee (micro-profile) project___ * javaee 8.0 using wildfly-swarm micro-profile * support fatjar * support executable bash jar - * support kotlin + * support kotlin 1.2.61 * support maven build system * support gradle build system * vavr (javaslang) @@ -278,16 +222,9 @@ ___java-ee (micro-profile) project___ * support testing with junit 4 / 5 * docker / docker-compose support -___scala project___ +type options: - * scala 2.12 based project - * lombok (slf4j + logback logging) - * support fatjar - * support maven build system - * support gradle build system - * support application executable scripts when using gradle - * support testing using junit 4, scalactic, scalatest, specs2 - * docker / docker-compose support +- `kotlin-wildfly-swarm` ___java-ee project___ @@ -295,41 +232,55 @@ ___java-ee project___ * javaee 8.0 * lombok (slf4j + logback logging) * vavr (javaslang) + * support kotlin 1.2.61 * support maven build system * support gradle build system * support testing with junit 4 / 5 * docker / docker-compose support (JBOSS EAP 7) -___java parent multi project___ +type options: - * java 8 based parent multi project - * vavr (javaslang) - * support maven build system - * support gradle build system - * docker / docker-compose support +- `java-ee` +- `kotlin-ee` -___scala_2.11 project___ +___parent multi project___ - * scala 2.11 based project - * lombok (slf4j + logback logging) + * java 8 based parent multi project * support fatjar + * support kotlin 1.2.61 + * support executable bash jar * support maven build system * support gradle build system - * support application scripts (gradle shadow plugin) - * support testing using junit 4, scalactic, scalatest, specs2 + * vavr (javaslang) + * lombok (slf4j + logback logging) + * support testing with junit 4 / 5 * docker / docker-compose support -___java project___ +type options: + +- `java-parent-multi-project` +- `kotlin-parent-multi-project` + +___simple fat project___ * java 8 based project * lombok (slf4j + logback logging) * vavr (javaslang) * support fatjar + * support scala 2.12 / 2.11 * support maven build system * support gradle build system - * support application scripts when using gradle - * support testing with junit 4 / 5 * docker / docker-compose support + * support application scripts when using gradle + * support application executable scripts when using gradle + * support testing using junit 4, scalactic, scalatest, specs2 + +type options: + +- `java` +- `kotlin` +- `scala` +- `scala-2.11` ## Also inside all projects available diff --git a/generators/app/templates/java-akka-actor/build.gradle b/generators/app/templates/java-akka-actor/build.gradle index 9745f69..3188fed 100644 --- a/generators/app/templates/java-akka-actor/build.gradle +++ b/generators/app/templates/java-akka-actor/build.gradle @@ -17,7 +17,6 @@ buildscript { dependencies { classpath "org.asciidoctor:asciidoctorj-pdf:$asciidoctorjPdfVersion" - classpath "org.junit.platform:junit-platform-gradle-plugin:$junitPlatformVersion" } } @@ -50,10 +49,8 @@ apply from: "$projectDir/gradle/ide.gradle" apply from: "$projectDir/gradle/clean.gradle" apply from: "$projectDir/gradle/repositories.gradle" -apply plugin: 'org.junit.platform.gradle.plugin' - -group = 'com.github.daggerok' version = '0.0.1' +group = 'com.github.daggerok' sourceCompatibility = targetCompatibility = "$javaVersion" apply plugin: 'io.franzbecker.gradle-lombok' diff --git a/generators/app/templates/java-ee-cdi-full-multi-project/build.gradle b/generators/app/templates/java-ee-cdi-full-multi-project/build.gradle index be9f834..8c0cbe2 100644 --- a/generators/app/templates/java-ee-cdi-full-multi-project/build.gradle +++ b/generators/app/templates/java-ee-cdi-full-multi-project/build.gradle @@ -41,8 +41,8 @@ allprojects { apply plugin: 'base' apply plugin: 'maven' - group = 'com.github.daggerok' version = '0.0.1' + group = 'com.github.daggerok' defaultTasks 'clean', 'build' } diff --git a/generators/app/templates/java-ee-ejb-full-multi-project/build.gradle b/generators/app/templates/java-ee-ejb-full-multi-project/build.gradle index c91a3e6..2b1405f 100644 --- a/generators/app/templates/java-ee-ejb-full-multi-project/build.gradle +++ b/generators/app/templates/java-ee-ejb-full-multi-project/build.gradle @@ -41,8 +41,8 @@ allprojects { apply plugin: 'base' apply plugin: 'maven' - group = 'com.github.daggerok' version = '0.0.1' + group = 'com.github.daggerok' defaultTasks 'clean', 'build' } diff --git a/generators/app/templates/java-ee-faces/build.gradle b/generators/app/templates/java-ee-faces/build.gradle index fe9df1b..c62232f 100644 --- a/generators/app/templates/java-ee-faces/build.gradle +++ b/generators/app/templates/java-ee-faces/build.gradle @@ -15,7 +15,6 @@ buildscript { dependencies { classpath "org.asciidoctor:asciidoctorj-pdf:$asciidoctorjPdfVersion" - classpath "org.junit.platform:junit-platform-gradle-plugin:$junitPlatformVersion" } } @@ -46,10 +45,8 @@ apply from: "$projectDir/gradle/ide.gradle" apply from: "$projectDir/gradle/clean.gradle" apply from: "$projectDir/gradle/repositories.gradle" -apply plugin: 'org.junit.platform.gradle.plugin' - -group = 'com.github.daggerok' version = '0.0.1' +group = 'com.github.daggerok' sourceCompatibility = targetCompatibility = "$javaVersion" apply plugin: 'io.franzbecker.gradle-lombok' diff --git a/generators/app/templates/java-parent-multi-project/build.gradle b/generators/app/templates/java-parent-multi-project/build.gradle index 347c7f8..88fec30 100644 --- a/generators/app/templates/java-parent-multi-project/build.gradle +++ b/generators/app/templates/java-parent-multi-project/build.gradle @@ -52,8 +52,8 @@ allprojects { apply plugin: 'base' apply plugin: 'maven' - group = 'com.github.daggerok' version = '0.0.1' + group = 'com.github.daggerok' defaultTasks 'clean', 'build' } diff --git a/generators/app/templates/kotlin-parent-multi-project/build.gradle b/generators/app/templates/kotlin-parent-multi-project/build.gradle index b3f9151..246e32a 100644 --- a/generators/app/templates/kotlin-parent-multi-project/build.gradle +++ b/generators/app/templates/kotlin-parent-multi-project/build.gradle @@ -61,8 +61,8 @@ allprojects { apply plugin: 'base' apply plugin: 'maven' - group = 'com.github.daggerok' version = '0.0.1' + group = 'com.github.daggerok' defaultTasks 'clean', 'build' } diff --git a/generators/app/templates/kotlin-wildfly-swarm/build.gradle b/generators/app/templates/kotlin-wildfly-swarm/build.gradle index a9f9a86..4d3e92e 100644 --- a/generators/app/templates/kotlin-wildfly-swarm/build.gradle +++ b/generators/app/templates/kotlin-wildfly-swarm/build.gradle @@ -19,7 +19,6 @@ buildscript { dependencies { classpath "org.asciidoctor:asciidoctorj-pdf:$asciidoctorjPdfVersion" - classpath "org.junit.platform:junit-platform-gradle-plugin:$junitPlatformVersion" classpath "org.wildfly.swarm:wildfly-swarm-gradle-plugin:$wildflySwarmVersion" } } @@ -51,7 +50,6 @@ plugins { } apply plugin: 'wildfly-swarm' -apply plugin: 'org.junit.platform.gradle.plugin' /* wrapper { @@ -64,8 +62,8 @@ apply from: "$projectDir/gradle/ide.gradle" apply from: "$projectDir/gradle/clean.gradle" apply from: "$projectDir/gradle/repositories.gradle" -group = 'com.github.daggerok' version = '0.0.1' +group = 'com.github.daggerok' sourceCompatibility = targetCompatibility = "$javaVersion" apply plugin: 'org.jetbrains.kotlin.jvm' @@ -128,31 +126,30 @@ compileJava.dependsOn(processResources) lombok.version = project.lombokVersion dependencies { - - compile 'org.wildfly.swarm:microprofile' - compile 'org.wildfly.swarm:logging' - compile 'org.wildfly.swarm:ejb' - testCompile 'org.wildfly.swarm:arquillian' + implementation 'org.wildfly.swarm:microprofile' + implementation 'org.wildfly.swarm:logging' + implementation 'org.wildfly.swarm:ejb' + testImplementation 'org.wildfly.swarm:arquillian' //compile("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion") - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion" providedCompile "javax:javaee-api:$javaeeVersion" providedCompile 'com.h2database:h2:1.4.196' compile "org.hibernate:hibernate-core:$hibernateCoreVersion" - //compile 'javax.json:javax.json-api:1.0' - //compile 'org.glassfish:javax.json:1.0.4' - //compile 'org.jboss.resteasy:resteasy-json-p-provider:3.0.7.Final' + //implementation 'javax.json:javax.json-api:1.0' + //implementation 'org.glassfish:javax.json:1.0.4' + //implementation 'org.jboss.resteasy:resteasy-json-p-provider:3.0.7.Final' - compile "org.slf4j:slf4j-api:$slf4jVersion" - compile "org.slf4j:slf4j-jdk14:$slf4jVersion" + implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "org.slf4j:slf4j-jdk14:$slf4jVersion" - compile "io.vavr:vavr:$vavrVersion" + implementation "io.vavr:vavr:$vavrVersion" // junit 4 - testCompile 'junit:junit:4.12' + testImplementation 'junit:junit:4.12' // junit 5 testImplementation("org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion") // hamcrest asserts, like: assertThat diff --git a/generators/app/templates/scala-2.11/build.gradle b/generators/app/templates/scala-2.11/build.gradle index a526dd2..e5bc2c4 100644 --- a/generators/app/templates/scala-2.11/build.gradle +++ b/generators/app/templates/scala-2.11/build.gradle @@ -50,8 +50,8 @@ apply from: "$projectDir/gradle/clean.gradle" apply from: "$projectDir/gradle/repositories.gradle" -group = 'com.github.daggerok' version = '0.0.1' +group = 'com.github.daggerok' sourceCompatibility = targetCompatibility = "$javaVersion" mainClassName = 'daggerok.App' @@ -85,17 +85,14 @@ defaultTasks 'clean', 'build' compileJava.dependsOn(processResources) dependencies { - - compile "org.slf4j:slf4j-api:$slf4jVersion" - compile "ch.qos.logback:logback-classic:$logbackVersion" - -testCompile "junit:junit:$junit4Version" - - compile "org.scala-lang:scala-library:$scalaVersion" - - testCompile "org.scalactic:scalactic_$scalatestVersion" - testCompile "org.scalatest:scalatest_$scalatestVersion" - testCompile "org.specs2:specs2-junit_${scalaCompatVersion}:$specs2JunitVersion" + implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "ch.qos.logback:logback-classic:$logbackVersion" + implementation "org.scala-lang:scala-library:$scalaVersion" + + testImplementation "junit:junit:$junit4Version" + testImplementation "org.scalactic:scalactic_$scalatestVersion" + testImplementation "org.scalatest:scalatest_$scalatestVersion" + testImplementation "org.specs2:specs2-junit_${scalaCompatVersion}:$specs2JunitVersion" } apply from: "$projectDir/gradle/findbugs.gradle" diff --git a/generators/app/templates/scala-gradle-akka-actor/build.gradle b/generators/app/templates/scala-gradle-akka-actor/build.gradle index 8c9c09b..3e5e570 100644 --- a/generators/app/templates/scala-gradle-akka-actor/build.gradle +++ b/generators/app/templates/scala-gradle-akka-actor/build.gradle @@ -53,8 +53,8 @@ apply from: "$projectDir/gradle/ide.gradle" apply from: "$projectDir/gradle/clean.gradle" apply from: "$projectDir/gradle/repositories.gradle" -group = 'com.github.daggerok' version = '0.0.1' +group = 'com.github.daggerok' sourceCompatibility = targetCompatibility = "$javaVersion" mainClassName = 'daggerok.App' @@ -87,10 +87,10 @@ compileJava.dependsOn(processResources) lombok.version = project.lombokVersion dependencies { - compile "com.typesafe.akka:akka-actor_$scalaCompatVersion:$akkaVersion" - compile "org.slf4j:slf4j-api:$slf4jVersion" - compile "ch.qos.logback:logback-classic:$logbackVersion" - compile "org.scala-lang:scala-library:$scalaVersion" + implementation "com.typesafe.akka:akka-actor_$scalaCompatVersion:$akkaVersion" + implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "ch.qos.logback:logback-classic:$logbackVersion" + implementation "org.scala-lang:scala-library:$scalaVersion" testImplementation "junit:junit:$junit4Version" testImplementation "org.specs2:specs2-junit_$scalaCompatVersion:$specs2junitVersion" diff --git a/generators/app/templates/scala-gradle-akka-persistence/build.gradle b/generators/app/templates/scala-gradle-akka-persistence/build.gradle index 56210c9..02abf1a 100644 --- a/generators/app/templates/scala-gradle-akka-persistence/build.gradle +++ b/generators/app/templates/scala-gradle-akka-persistence/build.gradle @@ -30,6 +30,7 @@ plugins { id 'maven' id 'eclipse' id 'application' + id 'io.franzbecker.gradle-lombok' version '1.14' id 'com.github.johnrengelman.shadow' version '2.0.2' id 'com.avast.gradle.docker-compose' version '0.6.13' id 'com.jfrog.artifactory' version '4.7.5' apply false @@ -52,8 +53,8 @@ apply from: "$projectDir/gradle/ide.gradle" apply from: "$projectDir/gradle/clean.gradle" apply from: "$projectDir/gradle/repositories.gradle" -group = 'com.github.daggerok' version = '0.0.1' +group = 'com.github.daggerok' sourceCompatibility = targetCompatibility = "$javaVersion" mainClassName = 'daggerok.App' @@ -83,23 +84,20 @@ defaultTasks 'clean', 'installDist' compileJava.dependsOn(processResources) -dependencies { +lombok { + version = project.lombokVersion +} - compile "com.typesafe.akka:akka-persistence_$scalaCompatVersion:$akkaVersion", +dependencies { + implementation "com.typesafe.akka:akka-persistence_$scalaCompatVersion:$akkaVersion", "org.fusesource.leveldbjni:leveldbjni-all:$leveldbjniVersion", - "org.iq80.leveldb:leveldb:$leveldbVersion" - - compile "org.slf4j:slf4j-api:$slf4jVersion", - "ch.qos.logback:logback-classic:$logbackVersion" - - compileOnly "org.projectlombok:lombok:$lombokVersion" - testCompileOnly "org.projectlombok:lombok:$lombokVersion" - - testCompile "junit:junit:$junit4Version" - - compile "org.scala-lang:scala-library:$scalaVersion" + "org.iq80.leveldb:leveldb:$leveldbVersion", + "org.slf4j:slf4j-api:$slf4jVersion", + "ch.qos.logback:logback-classic:$logbackVersion", + "org.scala-lang:scala-library:$scalaVersion" - testCompile "org.specs2:specs2-junit_$scalaCompatVersion:$specs2junitVersion", + testImplementation "junit:junit:$junit4Version", + "org.specs2:specs2-junit_$scalaCompatVersion:$specs2junitVersion", "org.scalactic:scalactic_$scalacticVersion", "org.scalatest:scalatest_$scalatestVersion" } diff --git a/generators/app/templates/scala/build.gradle b/generators/app/templates/scala/build.gradle index 97590f4..05384e7 100644 --- a/generators/app/templates/scala/build.gradle +++ b/generators/app/templates/scala/build.gradle @@ -26,6 +26,7 @@ plugins { id 'maven' id 'eclipse' id 'application' + id 'io.franzbecker.gradle-lombok' version '1.14' id 'com.github.johnrengelman.shadow' version '2.0.2' id 'com.avast.gradle.docker-compose' version '0.6.13' id 'com.jfrog.artifactory' version '4.7.5' apply false @@ -35,7 +36,6 @@ plugins { id 'cn.bestwu.propdeps-maven' version '0.0.10' apply false id 'cn.bestwu.propdeps-idea' version '0.0.10' apply false id 'cn.bestwu.propdeps' version '0.0.10' apply false - id 'io.franzbecker.gradle-lombok' version '1.14' } /* @@ -49,8 +49,8 @@ apply from: "$projectDir/gradle/ide.gradle" apply from: "$projectDir/gradle/clean.gradle" apply from: "$projectDir/gradle/repositories.gradle" -group = 'com.github.daggerok' version = '0.0.1' +group = 'com.github.daggerok' sourceCompatibility = targetCompatibility = "$javaVersion" mainClassName = 'daggerok.App' @@ -71,7 +71,9 @@ jar { } */ -lombok.version = project.lombokVersion +lombok { + version = project.lombokVersion +} allprojects { apply plugin: 'maven-publish' @@ -99,17 +101,14 @@ defaultTasks 'clean', 'build' compileJava.dependsOn(processResources) dependencies { - - compile "org.slf4j:slf4j-api:$slf4jVersion" - compile "ch.qos.logback:logback-classic:$logbackVersion" - - testCompile "junit:junit:$junit4Version" - - compile "org.scala-lang:scala-library:$scalaVersion" - - testCompile "org.scalactic:scalactic_$scalatestVersion" - testCompile "org.scalatest:scalatest_$scalatestVersion" - testCompile "org.specs2:specs2-junit_$scalaCompatVersion:$specs2JunitVersion" + implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "ch.qos.logback:logback-classic:$logbackVersion" + implementation "org.scala-lang:scala-library:$scalaVersion" + + testImplementation "junit:junit:$junit4Version" + testImplementation "org.scalactic:scalactic_$scalatestVersion" + testImplementation "org.scalatest:scalatest_$scalatestVersion" + testImplementation "org.specs2:specs2-junit_$scalaCompatVersion:$specs2JunitVersion" } apply from: "$projectDir/gradle/findbugs.gradle" diff --git a/package-lock.json b/package-lock.json index 12c8c62..d1f6f20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "generator-jvm", - "version": "1.18.28", + "version": "1.18.29", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b41549a..d9405c1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "generator-jvm", - "version": "1.18.28", + "version": "1.18.29", "description": "Helps you quick and easy generate JVM-based (java, java ee, kotlin, scala) projects with gradle and maven build systems, docker and docker-compose for rapid development", "homepage": "https://github.com/daggerok/generator-jvm", "author": {