upgrade to gradle 7.3.3 remove jbake-maven-plugin as module from base…

…. use freefair maven plugin
jonbullock · Dec 29, 2021 · f03403f · f03403f
1 parent 24a5727
commit f03403f
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 52 deletions.
diff --git a/build.gradle b/build.gradle
@@ -73,10 +73,10 @@ apply from: "$rootDir/gradle/publishing.gradle"
 subprojects {
 
     apply plugin: 'java'
-    apply plugin: 'nebula.optional-base'
 
     // We do not publish any jars from the jbake-dist project
-    if ( project.name != "jbake-dist" ) {
+    if ( project.name != "jbake-dist" && project.name != "jbake-maven-plugin" ) {
+
         apply from: "$rootDir/gradle/maven-publishing.gradle"
         apply from: "$rootDir/gradle/signing.gradle"
     }
@@ -104,8 +104,8 @@ subprojects {
         implementation "org.slf4j:slf4j-api:$slf4jVersion"
         implementation "org.slf4j:jul-to-slf4j:$slf4jVersion"
         implementation "org.slf4j:jcl-over-slf4j:$slf4jVersion"
-        implementation "ch.qos.logback:logback-classic:$logbackVersion", optional
-        implementation "ch.qos.logback:logback-core:$logbackVersion", optional
+        implementation "ch.qos.logback:logback-classic:$logbackVersion"
+        implementation "ch.qos.logback:logback-core:$logbackVersion"
 
         testImplementation "org.junit-pioneer:junit-pioneer:$junitPioneer"
         testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5Version"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/jbake-core/build.gradle b/jbake-core/build.gradle
@@ -10,32 +10,33 @@ dependencies {
     implementation "commons-io:commons-io:$commonsIoVersion"
     implementation "org.apache.commons:commons-configuration2:$commonsConfigurationVersion"
     implementation "commons-beanutils:commons-beanutils:$commonsBeanutilsVersion"
-    implementation "org.apache.commons:commons-vfs2:$commonsVfs2Version", optional
+    implementation "org.apache.commons:commons-vfs2:$commonsVfs2Version"
     implementation "org.apache.commons:commons-lang3:$commonsLangVersion"
     implementation("com.googlecode.json-simple:json-simple:$jsonSimpleVersion") {
         exclude group: "junit", module: "junit"
     }
     implementation "com.orientechnologies:orientdb-core:$orientDbVersion"
-    implementation "org.asciidoctor:asciidoctorj:$asciidoctorjVersion", optional
-    implementation "org.codehaus.groovy:groovy:$groovyVersion", optional
-    implementation "org.codehaus.groovy:groovy-templates:$groovyVersion", optional
-    implementation "org.codehaus.groovy:groovy-dateutil:$groovyVersion", optional
-    implementation "org.freemarker:freemarker:$freemarkerVersion", optional
-    implementation "org.thymeleaf:thymeleaf:$thymeleafVersion", optional
-    implementation "de.neuland-bfi:jade4j:$jade4jVersion", optional
-    implementation "com.vladsch.flexmark:flexmark:$flexmarkVersion", optional
-    implementation "com.vladsch.flexmark:flexmark-profile-pegdown:$flexmarkVersion", optional
+    implementation "org.asciidoctor:asciidoctorj:$asciidoctorjVersion"
+    implementation "org.codehaus.groovy:groovy:$groovyVersion"
+    implementation "org.codehaus.groovy:groovy-templates:$groovyVersion"
+    implementation "org.codehaus.groovy:groovy-dateutil:$groovyVersion"
+    implementation "org.freemarker:freemarker:$freemarkerVersion"
+    implementation "org.thymeleaf:thymeleaf:$thymeleafVersion"
+    implementation "de.neuland-bfi:jade4j:$jade4jVersion"
+    implementation "com.vladsch.flexmark:flexmark:$flexmarkVersion"
+    implementation "com.vladsch.flexmark:flexmark-profile-pegdown:$flexmarkVersion"
     implementation "org.jsoup:jsoup:$jsoupVersion"
-    implementation "io.pebbletemplates:pebble:$pebbleVersion", optional
-    implementation "org.yaml:snakeyaml:$snakeYamlVersion", optional
+    implementation "io.pebbletemplates:pebble:$pebbleVersion"
+    implementation "org.yaml:snakeyaml:$snakeYamlVersion"
 
     // cli specific dependencies
-    implementation "org.eclipse.jetty:jetty-server:$jettyServerVersion", optional
-    implementation "info.picocli:picocli:$picocli", optional
+    implementation "org.eclipse.jetty:jetty-server:$jettyServerVersion"
+    implementation "info.picocli:picocli:$picocli"
 }
 
 processResources {
     from("src/main/resources") {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         include 'default.properties'
         expand jbakeVersion: project.version,
                timestamp: grgit.head().dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss'['VV']'")),

diff --git a/jbake-dist/build.gradle b/jbake-dist/build.gradle
@@ -33,7 +33,7 @@ dependencies {
     }
 
     smokeTestImplementation "org.eclipse.jgit:org.eclipse.jgit:$jgitVersion"
-    smokeTestImplementation "org.apache.commons:commons-vfs2:$commonsVfs2Version", optional
+    smokeTestImplementation "org.apache.commons:commons-vfs2:$commonsVfs2Version"
 }
 
 task smokeTest(type: Test, dependsOn: installDist) {

diff --git a/jbake-maven-plugin/build.gradle b/jbake-maven-plugin/build.gradle
@@ -1,26 +1,21 @@
 plugins {
-    id 'de.benediktritter.maven-plugin-development' version '0.3.1'
+    id "io.freefair.maven-plugin" version "6.3.0"
 }
 
-//config {
-//    licensing {
-//        exclude 'build/mavenPlugin/**'
-//    }
-//}
+group = "org.jbake.maven"
+version = "2.7.0"
 
-//mavenPlugin {
-//    helpMojoPackage = 'org.jbake.maven.plugin.help'
-//}
+repositories {
+    mavenCentral()
+}
 
 dependencies {
-    implementation project(':jbake-core')
+    implementation 'org.jbake:jbake-core:2.7.0-rc.5'
 
-    implementation "org.apache.maven:maven-plugin-api:$mavenVersion"
-    compileOnly "org.apache.maven:maven-core:$mavenVersion"
-    compileOnly "org.apache.maven.plugin-tools:maven-plugin-annotations:$mavenAnnotationsVersion"
-//    implementation "org.sonatype.plexus:plexus-build-api:0.0.7"
-//    implementation "org.codehaus.plexus:plexus-utils:3.0.22"
+    compileOnly "org.apache.maven:maven-core:3.8.1"
+    compileOnly "org.apache.maven.plugin-tools:maven-plugin-annotations:3.6.2"
 
+    implementation 'commons-io:commons-io:2.6'
     implementation "org.apache.commons:commons-configuration2:2.7"
     implementation "com.sparkjava:spark-core:2.9.3"
 
@@ -37,19 +32,3 @@ dependencies {
 //    implementation "io.pebbletemplates:pebble:$pebbleVersion"
 //    implementation "org.yaml:snakeyaml:$snakeYamlVersion"
 }
-
-
-//license {
-//    exclude '**/build/**/pom.xml'
-//}
-
-processResources {
-    inputs.property('version', project.version)
-    filesMatching(['**/*.properties']) {
-        expand(
-            'version': project.version,
-            'id': 'jbake',
-            'name': project.pluginDisplayName
-        )
-    }
-}
diff --git a/jbake-maven-plugin/settings.gradle b/jbake-maven-plugin/settings.gradle
@@ -0,0 +1 @@
+rootProject.name="jbake-maven-plugin"
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,3 @@
 rootProject.name = 'jbake-base'
 include 'jbake-core'
-include 'jbake-maven-plugin'
 include 'jbake-dist'