Upgrade dependencies

.github/workflows/broken_links_checker.yml

@@ -2,9 +2,9 @@ name: Broken Links Checker
 
 on:
   push:
-    branches: [ master, develop ]
+    branches: [ main ]
   pull_request:
-    branches: [ master, develop ]
+    branches: [ main ]
 
 jobs:
   linkChecker:

.github/workflows/build.yml

@@ -2,9 +2,9 @@ name: Java CI with Gradle
 
 on:
   push:
-    branches: [ master, develop ]
+    branches: [ main ]
   pull_request:
-    branches: [ master, develop ]
+    branches: [ main ]
 
 jobs:
   build:
@@ -22,9 +22,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-
-    - name: Fetch all history for all tags and branches
-      run: git fetch --prune --unshallow
+      with:
+        fetch-depth: 0
 
     - uses: actions/setup-java@v3
       with:
@@ -55,7 +54,7 @@ jobs:
     - name: Sonar analysis
       if: ${{ env.DEFAULT_JAVA == matrix.java && env.SONAR_TOKEN != null }}
       run: |
-        ./gradlew sonarqube -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=itsallcode -Dsonar.login=$SONAR_TOKEN --warning-mode=summary
+        ./gradlew sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=itsallcode -Dsonar.login=$SONAR_TOKEN --warning-mode=summary
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [develop, master]
+    branches: [main]
   pull_request:
-    branches: [develop]
+    branches: [main]
   schedule:
     - cron: '0 4 * * 3'
 

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic"
+}

CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.0] - 2023-03-11
+
+- [PR #35](https://github.com/itsallcode/openfasttrace-gradle/pull/35):
+  - Upgrade to [OpenFastTrace 3.7.0](https://github.com/itsallcode/openfasttrace/releases/tag/3.7.0)
+  - Upgrade to Gradle 8. Gradle 7.6 is still supported.
+  - Upgrade other dependencies
+
 ## [1.0.0] - 2022-08-21
 
 ### Changed

CONTRIBUTING.md

@@ -9,7 +9,7 @@ If you are looking for general information about what OpenFastTrace is, please m
 # What Kind of Contributions can I Make?
 
 ## Contributing Code
-If you are a programmer and want to help us improve the implementation, test cases or design of OFT please create a branch of the current `develop` branch of OFT using [git](https://git-scm.com/) and make your changes on that branch.
+If you are a programmer and want to help us improve the implementation, test cases or design of OFT please create a branch of the current `main` branch of OFT using [git](https://git-scm.com/) and make your changes on that branch.
 
 Then please create a pull request and ask for a review by one of the core team members (e.g. `redcatbear` or `kaklakariada`).
 The reviewers will either ask you to work in review findings or if there are none, merge your branch.

README.md

@@ -19,11 +19,11 @@ Gradle plugin for the requirement tracing suite [OpenFastTrace](https://github.c
 
     ```gradle
     plugins {
-      id "org.itsallcode.openfasttrace" version "1.0.0"
+      id "org.itsallcode.openfasttrace" version "1.1.0"
     }
     ```
 
-1. Configure your project, see [examples](https://github.com/itsallcode/openfasttrace-gradle/tree/develop/example-projects)
+1. Configure your project, see [examples](https://github.com/itsallcode/openfasttrace-gradle/tree/main/example-projects)
 1. Run
 
     ```bash
@@ -60,7 +60,7 @@ As a benefit the tags are much shorter and contain only the name and revision:
 // [[tagname:1]]
 ```
 
-See [multi-project/sub1](https://github.com/itsallcode/openfasttrace-gradle/tree/develop/example-projects/multi-project/sub1) for a basic example.
+See [multi-project/sub1](https://github.com/itsallcode/openfasttrace-gradle/tree/main/example-projects/multi-project/sub1) for a basic example.
 
 ### Sharing requirements
 
@@ -101,7 +101,7 @@ publishing {
 }
 ```
 
-See [publish-config](https://github.com/itsallcode/openfasttrace-gradle/tree/develop/example-projects/publish-config) for a basic example.
+See [publish-config](https://github.com/itsallcode/openfasttrace-gradle/tree/main/example-projects/publish-config) for a basic example.
 
 #### Importing external requirements
 
@@ -118,7 +118,7 @@ requirementTracing {
 }
 ```
 
-See [dependency-config](https://github.com/itsallcode/openfasttrace-gradle/tree/develop/example-projects/dependency-config) for a basic example.
+See [dependency-config](https://github.com/itsallcode/openfasttrace-gradle/tree/main/example-projects/dependency-config) for a basic example.
 
 ## Development
 
@@ -163,7 +163,7 @@ Import into eclipse using [buildship](https://projects.eclipse.org/projects/tool
 ### Run local sonar analysis
 
 ```bash
-./gradlew clean sonarqube --info \
+./gradlew clean sonar --info \
     -Dsonar.host.url=https://sonarcloud.io \
     -Dsonar.organization=itsallcode \
     -Dsonar.login=[token]

build.gradle

@@ -1,11 +1,12 @@
 plugins {
     id 'java-gradle-plugin'
     id 'jacoco'
-    id 'com.gradle.plugin-publish' version '1.0.0'
-    id 'org.sonarqube' version '3.4.0.2513'
+    id 'signing'
+    id 'com.gradle.plugin-publish' version '1.1.0'
+    id 'org.sonarqube' version '4.0.0.2929'
     id 'pl.droidsonroids.jacoco.testkit' version '1.0.9'
-    id 'com.github.ben-manes.versions' version '0.42.0'
-    id 'org.sonatype.gradle.plugins.scan' version '2.4.1'
+    id 'com.github.ben-manes.versions' version '0.46.0'
+    id 'org.sonatype.gradle.plugins.scan' version '2.5.5'
 }
 
 repositories {
@@ -14,15 +15,15 @@ repositories {
 
 apply from: 'gradle/workAroundJacocoGradleTestKitIssueOnWindows.gradle'
 
-version = '1.0.0'
+version = '1.1.0'
 group = 'org.itsallcode'
 sourceCompatibility = 11
 targetCompatibility = 11
 
 ext {
     gradlePluginId = 'org.itsallcode.openfasttrace'
-    oftVersion = '3.6.0'
-    junitVersion = '5.9.0'
+    oftVersion = '3.7.0'
+    junitVersion = '5.9.2'
     if (project.hasProperty('oftSourceDir')) {
         oftSourceDir = file(project.oftSourceDir)
         useOftSources = oftSourceDir.exists()
@@ -79,20 +80,16 @@ clean {
     propertyFiles.each { delete it }
 }
 
-pluginBundle {
+gradlePlugin {
     website = 'https://github.com/itsallcode/openfasttrace-gradle'
     vcsUrl = 'https://github.com/itsallcode/openfasttrace-gradle.git'
-    tags = ['requirementstracing', 'requirements', 'tracing', 'reqtracing', 'openfasttrace', 'oft']
-}
-
-gradlePlugin {
-    description = 'Gradle plugin for tracing requirements using OpenFastTrace'
     plugins {
         openFastTracePlugin {
             id = gradlePluginId
             implementationClass = 'org.itsallcode.openfasttrace.gradle.OpenFastTracePlugin'
             displayName = 'OpenFastTrace requirements tracing plugin'
             description = 'Gradle plugin for tracing requirements using OpenFastTrace'
+            tags.addAll(['requirementstracing', 'requirements', 'tracing', 'reqtracing', 'openfasttrace', 'oft'])
         }
     }
 }
@@ -114,7 +111,7 @@ jacocoTestReport {
     }
 }
 
-project.tasks["sonarqube"].dependsOn jacocoTestReport
+project.tasks["sonar"].dependsOn jacocoTestReport
 
 publishPlugins.dependsOn check
 

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/org/itsallcode/openfasttrace/gradle/task/TraceTask.java

@@ -131,7 +131,7 @@ private FilterSettings getFilterSettings()
         getLogger().info("Filter: artifactTypes={}, tags={}, acceptItemsWithoutTag={}",
                 filteredArtifactTypes.get(), filteredTags.get(),
                 filterAcceptsItemsWithoutTag.get());
-        return new FilterSettings.Builder() //
+        return FilterSettings.builder() //
                 .artifactTypes(filteredArtifactTypes.get()) //
                 .tags(filteredTags.get()) //
                 .withoutTags(filterAcceptsItemsWithoutTag.get()).build();

src/test/java/org/itsallcode/openfasttrace/gradle/GradleTestConfig.java

@@ -2,7 +2,7 @@
 
 public enum GradleTestConfig
 {
-    CURRENT_VERSION(null), SEVEN_ZERO("7.0"), SEVEN_FIVE("7.5.1");
+    CURRENT_VERSION(null), SEVEN_SIX("7.6"), EIGHT("8.0.2");
 
     public final String gradleVersion;
 
@@ -13,11 +13,6 @@ private GradleTestConfig(final String gradleVersion)
 
     public boolean supportedWithJvm()
     {
-        final boolean isJava11 = System.getProperty("java.version").startsWith("11");
-        if (this == SEVEN_ZERO)
-        {
-            return isJava11;
-        }
         return true;
     }
 }

src/test/java/org/itsallcode/openfasttrace/gradle/OpenFastTracePluginTest.java

@@ -148,7 +148,7 @@ void testTraceExampleProjectWithCustomConfig(final GradleTestConfig config) thro
                 "traceRequirements");
         assertEquals(TaskOutcome.SUCCESS, buildResult.task(":traceRequirements").getOutcome());
         assertFileContent(PROJECT_CUSTOM_CONFIG_DIR.resolve("build/custom-report.txt"),
-                "not ok - 0/1>0>0/0 - dsn~exampleB~1 (impl, -utest)", //
+                "not ok [ in:  1 /  1 ✔ | out:  0 /  0   ] dsn~exampleB~1 (impl, -utest)", //
                 "not ok - 2 total, 1 defect");
     }