Merge upstream

.github/workflows/gradle.yml

@@ -1,12 +1,10 @@
 name: Gradle
-
 on:
   pull_request:
     branches:
       - main
       - master
       - dev
-
 jobs:
   gradle:
     strategy:
@@ -16,17 +14,12 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
-
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@v4
       with:
         distribution: temurin
-        java-version: 8
-
+        java-version: 11
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v3
-      with:
-        gradle-version: wrapper
-
     - name: Build with Gradle
       run: ./gradlew build

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}

Dockerfile

@@ -1,7 +1,7 @@
-FROM gradle:4.7.0-jdk8-alpine AS build
+FROM gradle:5.6.2-jdk8 AS build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
-RUN gradle build -x test --no-daemon 
+RUN gradle build -x test --no-daemon
 
 FROM openjdk:8-jre-slim
 

README.md

@@ -6,7 +6,7 @@
 
 A static code analysis tool for CFML.
 
-License: [BSD](http://www.opensource.org/licenses/bsd-license.html)
+License: [BSD](https://opensource.org/licenses/bsd-license.html)
 
 Current Version: 1.5.x
 
@@ -43,15 +43,15 @@ The master branch is considered our stable codebase. Most of the development hap
 
 ## Using CFLint - Quickstart Guide
 
-Get the latest version from [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Ccflint) or the [CFLint GitHub release page](https://github.com/cflint/CFLint/releases) or build the project.
+Get the latest version from [Maven Central](https://search.maven.org/search?q=cflint) or the [CFLint GitHub release page](https://github.com/cflint/CFLint/releases) or build the project.
 
 If you want to use CFLint from within another Maven project, use:
 
 ```xml
 <dependency>
     <groupId>com.github.cflint</groupId>
-    <artifactId>CFLint</artifactId>
-    <version>1.4.0</version>
+    <artifactId>cflint</artifactId>
+    <version>1.4.1</version>
 </dependency>
 ```
 
@@ -60,7 +60,7 @@ Or always use the latest:
 ```xml
 <dependency>
     <groupId>com.github.cflint</groupId>
-    <artifactId>CFLint</artifactId>
+    <artifactId>cflint</artifactId>
     <version>LATEST</version>
 </dependency>
 ```
@@ -69,7 +69,7 @@ With the binaries retrieved one or the other way, you can now use CFLint on the
 
 ### Use the "-all"-version of the jar-file
 
-    CFLint-1.5.0-all.jar
+CFLint-1.5.0-all.jar
 
 ### Scan a folder with the complete set of rules
 
@@ -234,7 +234,7 @@ The exception is debug mode. In debug mode, CFLint will always ignore user setti
 
 The flag `-html` instructs CFLint to create an HTML document. The full syntax is:
 
-    -html -html <outputFileName>
+    -html -htmlfile <outputFileName>
 
 ### XML
 
@@ -549,7 +549,7 @@ Note: The back slashes must be escaped twice, once for JSON, once for regular ex
 
 Raise issues here on GitHub and we will look at them.
 
-The [CFML Slack team](http://cfml-slack.herokuapp.com/) has a `#cflint` channel you can join and talk to most of the regular contributors and other users.
+The [CFML Slack team](https://cfml-slack.herokuapp.com/) has a `#cflint` channel you can join and talk to most of the regular contributors and other users.
 
 # How to contribute
 

build.gradle

@@ -2,29 +2,45 @@ buildscript {
     repositories {
         mavenLocal()
         jcenter {
-            url "https://jcenter.bintray.com/"
+            url = "https://jcenter.bintray.com/"
         }
         maven {
-            url "https://oss.sonatype.org/content/repositories/snapshots/"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
         }
         maven {
-            url "https://plugins.gradle.org/m2/"
+            url = "https://plugins.gradle.org/m2/"
+        }
+        maven { 
+            url = "https://cfmlprojects.org/artifacts" 
         }
         maven {
-            url "https://cfmlprojects.org/artifacts"
+            url "https://plugins.gradle.org/m2/"
         }
     }
     dependencies {
         classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.22.0"
         classpath "gradle.plugin.se.bjurr.gitchangelog:git-changelog-gradle-plugin:1.64"
+        // classpath "net.thebugmc.gradle:sonatype-central-portal-publisher:1.2.3"
     }
 }
 
 plugins {
     id 'java'
-    id 'com.github.johnrengelman.shadow' version '5.2.0'
+    id 'com.github.johnrengelman.shadow' version '7.1.1'
     id 'eclipse'
+    id 'signing'
+    // id 'net.thebugmc.gradle.sonatype-central-portal-publisher' version '1.2.3'
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+        vendor = JvmVendorSpec.ADOPTIUM
+    }
+
+    withJavadocJar()
+    withSourcesJar()
 }
 
 // Helper functions and constants
@@ -56,22 +72,31 @@ def getLatestTag = { ->
 
 apply plugin: "base"
 apply plugin: "signing"
-apply plugin: "com.bmuschko.nexus"
+//apply plugin: "com.bmuschko.nexus"
 
 apply plugin: 'java'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 apply from: 'cobertura.gradle'
-apply from: 'deploy.gradle'
-apply plugin: "se.bjurr.gitchangelog.git-changelog-gradle-plugin"
+//apply from: 'deploy.gradle'
+apply plugin: 'se.bjurr.gitchangelog.git-changelog-gradle-plugin'
+// apply plugin: "net.thebugmc.gradle.sonatype-central-portal-publisher"
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 1.11
+targetCompatibility = 1.11
 
 repositories {
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
-    maven { url "https://repo.maven.apache.org/maven2" }
-    maven { url "https://oss.sonatype.org/content/repositories/releases" }
-    maven { url "https://cfmlprojects.org/artifacts" }
+    maven { 
+        url = "https://oss.sonatype.org/content/repositories/snapshots" 
+    }
+    maven { 
+        url = "https://repo.maven.apache.org/maven2" 
+    }
+    maven { 
+        url = "https://oss.sonatype.org/content/repositories/releases" 
+    }
+    maven { 
+        url = "https://cfmlprojects.org/artifacts" 
+    }
 }
 dependencies {
     implementation group: 'com.github.cfparser', name: 'cfml.parsing', version: '2.11.0'
@@ -105,9 +130,9 @@ jar {
         attributes(
             'Main-Class': 'com.cflint.cli.CFLintCLI',
             'Implementation-Version': version,
-            'Bundle-Name': 'CFLint',
-            'Bundle-SymbolicName': 'com.cflint.CFLint',
-            'Bundle-Description': 'CFLint',
+            'Bundle-Name': 'cflint',
+            'Bundle-SymbolicName': 'io.cfmleditor.cflint',
+            'Bundle-Description': 'cflint',
             'Bundle-ManifestVersion': 2,
             'Bundle-Version': version
         )
@@ -117,14 +142,15 @@ jar {
 task fatJar(type: Jar) {
 
     manifest.from jar.manifest
-    classifier = 'all'
+    archiveClassifier.set('all')
     from {
-        configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) }
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     } {
         exclude "META-INF/*.SF"
         exclude "META-INF/*.DSA"
         exclude "META-INF/*.RSA"
     }
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     with jar
 }
 
@@ -154,3 +180,39 @@ task githubChangelogGenerator {
         println p.text
     }
 }
+
+tasks.register('stuffZip', Zip) {
+    archiveBaseName = 'stuff'
+    from 'src/stuff'
+}
+
+// signing {
+//     sign stuffZip
+// }
+
+
+// centralPortal {
+//     pom {
+//         name = 'cfmleditor-cflint'
+//         description = 'cflint'
+//         url = "https://github.com/cfmleditor/CFLint/"
+//         licenses {
+//             license {
+//                 name = "bsd-3-clause"
+//                 url = "https://opensource.org/license/bsd-3-clause"
+//             }
+//         }
+//         developers {
+//             developer {
+//                 name = "Gareth Edwards"
+//                 email = "[email protected]"
+//                 organization = "cfmleditor"
+//                 organizationUrl = "https://github.com/cfmleditor/"
+//             }
+//         }
+//         scm {
+//             url = "https://github.com/cfmleditor/CFLint/"
+//         }
+//     }
+//     publishingType = USER_MANAGED
+// }

cobertura.gradle

@@ -1,7 +1,7 @@
 logger.info "Configuring Cobertura Plugin"
 
 configurations{
-  coberturaRuntime {extendsFrom testRuntime}
+  coberturaRuntime {extendsFrom testRuntimeOnly}
 }
 
 dependencies {
@@ -15,7 +15,7 @@ def classesCopy="${classes}-copy"
 
 task cobertura(type: Test){
   dependencies {
-    testRuntime 'net.sourceforge.cobertura:cobertura:1.9.4'
+    testRuntimeOnly 'net.sourceforge.cobertura:cobertura:1.9.4'
   }
 
   systemProperty "net.sourceforge.cobertura.datafile", serFile

gradle.properties

@@ -1,6 +1,12 @@
-#Tue, 06 Oct 2015 20:08:05 -0600
-group=com.github.cflint
-version=1.5.0-SNAPSHOT
-name=CFLint
+#Mon, 18 Mar 2024 11:40:59 +1000
+group=io.github.cfmleditor
+version=1.5.6-SNAPSHOT
+name=cflint
 release=false
-snapshot=false
+snapshot=true
+signing.keyId=
+signing.password=
+signing.secretKeyRingFile=
+# sonatype credentials
+centralPortal.username=
+centralPortal.password=

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists