heremaps · Dec 10, 2024 · Dec 10, 2024 · Dec 10, 2024 · Dec 11, 2024 · Dec 11, 2024
diff --git a/.github/scripts/deploy.sh b/.github/scripts/deploy.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 set -ev
 
+if [[ $(git log -1 --pretty=format:"%s") =~ "[skip release]" ]]; then
+  echo 'Stopping the script because [skip release] was found in commit message'
+  exit 0
+fi
+
 export GPG_TTY=$(tty)
 export SONATYPE_USERNAME=$OSSRH_USERNAME
 export SONATYPE_PASSWORD=$OSSRH_PASSWORD

diff --git a/.github/scripts/push-tag.sh b/.github/scripts/push-tag.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 set -ev
 
+if [[ $(git log -1 --pretty=format:"%s") =~ "[skip release]" ]]; then
+  echo 'Stopping the script because [skip release] was found in commit message'
+  exit 0
+fi
+
 # Prepare release
 git config user.name "GitHub Action"
 git config user.email "ARTIFACT_SERVICE_SUPPORT@here.com"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,29 +20,21 @@ jobs:
         ref: master
         fetch-depth: 0
 
-    - name: Check Skip Commit
-      id: checkskip
-      run: if [[ $(git log -1 --pretty=format:"%s") =~ "\[skip release\]" ]]; then false; else true; fi
-
     - name: Set up JDK 8
-      if: steps.checkskip.conclusion == 'success'
       uses: actions/setup-java@v3
       with:
         java-version: '8'
         distribution: 'adopt'
     - name: Cache SBT
-      if: steps.checkskip.conclusion == 'success'
       uses: actions/cache@v3
       with:
         path: |
           ~/.ivy2/cache
           ~/.sbt
         key: ${{ runner.os }}-sbt-${{ hashFiles('**/build.sbt', 'project/**') }}
     - name: Push git tag
-      if: steps.checkskip.conclusion == 'success'
       run: ./.github/scripts/push-tag.sh
     - name: Deploy
-      if: steps.checkskip.conclusion == 'success'
       env:
         OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
         OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2019-2024 HERE Europe B.V.
+Copyright (C) 2019-2025 HERE Europe B.V.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/build.sbt b/build.sbt
@@ -86,7 +86,6 @@ lazy val `sbt-bom` = project
       scriptedLaunchOpts.value ++
         Seq("-Dplugin.version=" + version.value)
     },
-    scriptedBufferLog := false,
     libraryDependencies ++= Seq(
       "org.scalatest" %% "scalatest" % "3.2.15" % Test,
       "org.scalamock" %% "scalamock" % "5.2.0" % Test

diff --git a/plugin/src/main/scala/com/here/bom/Bom.scala b/plugin/src/main/scala/com/here/bom/Bom.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/main/scala/com/here/bom/internal/BomReader.scala b/plugin/src/main/scala/com/here/bom/internal/BomReader.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/main/scala/com/here/bom/internal/DependencyResolutionProxy.scala b/plugin/src/main/scala/com/here/bom/internal/DependencyResolutionProxy.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/main/scala/com/here/bom/internal/IvyPomLocator.scala b/plugin/src/main/scala/com/here/bom/internal/IvyPomLocator.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/main/scala/com/here/bom/internal/NormalizedArtifact.scala b/plugin/src/main/scala/com/here/bom/internal/NormalizedArtifact.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/sbt-test/psv/custom_ivy_home_config/project/Dependencies.scala b/plugin/src/sbt-test/psv/custom_ivy_home_config/project/Dependencies.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/sbt-test/psv/custom_ivy_home_config/src/main/scala/CustomIvyTestApp.scala b/plugin/src/sbt-test/psv/custom_ivy_home_config/src/main/scala/CustomIvyTestApp.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/sbt-test/psv/custom_ivy_home_config/test b/plugin/src/sbt-test/psv/custom_ivy_home_config/test
@@ -1,4 +1,3 @@
-> set scriptedBufferLog := false
 > eval System.setProperty("ivy.home", "/tmp/custom-ivy-home")
 > eval System.setProperty("sbt.ivy.home", "/tmp/custom-sbt-ivy-home")
 # check that build failed for the different custom home locations

diff --git a/plugin/src/sbt-test/psv/custom_ivy_home_config_related_path/project/Dependencies.scala b/plugin/src/sbt-test/psv/custom_ivy_home_config_related_path/project/Dependencies.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...rc/sbt-test/psv/custom_ivy_home_config_related_path/src/main/scala/CustomIvyTestApp.scala b/...rc/sbt-test/psv/custom_ivy_home_config_related_path/src/main/scala/CustomIvyTestApp.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/sbt-test/psv/custom_ivy_home_config_related_path/test b/plugin/src/sbt-test/psv/custom_ivy_home_config_related_path/test
@@ -1,4 +1,3 @@
-> set scriptedBufferLog := false
 > eval System.setProperty("ivy.home", "./custom-ivy-home")
 > eval System.setProperty("sbt.ivy.home", "./custom-ivy-home")
 # check that build succeeded

diff --git a/plugin/src/sbt-test/psv/simple_1.3.0/project/Dependencies.scala b/plugin/src/sbt-test/psv/simple_1.3.0/project/Dependencies.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/sbt-test/psv/simple_1.3.0/src/main/scala/Demo.scala b/plugin/src/sbt-test/psv/simple_1.3.0/src/main/scala/Demo.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/sbt-test/psv/simple_1.6.1/project/Dependencies.scala b/plugin/src/sbt-test/psv/simple_1.6.1/project/Dependencies.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/sbt-test/psv/simple_1.6.1/src/main/scala/Demo.scala b/plugin/src/sbt-test/psv/simple_1.6.1/src/main/scala/Demo.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/sbt-test/psv/test_downloaded_deps/src/main/scala/TestApp.scala b/plugin/src/sbt-test/psv/test_downloaded_deps/src/main/scala/TestApp.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/sbt-test/psv/test_downloaded_deps/test b/plugin/src/sbt-test/psv/test_downloaded_deps/test
@@ -1,4 +1,3 @@
-> set scriptedBufferLog := false
 > eval System.setProperty("sbt.ivy.home", System.getProperty("java.io.tmpdir")+"/test-sbt-bom-cache")
 > eval System.setProperty("ivy.home", System.getProperty("java.io.tmpdir")+"/test-sbt-bom-cache")
 > set ivyPaths := IvyPaths.apply(file(System.getProperty("java.io.tmpdir")+"/test-sbt-bom-cache"), file(System.getProperty("java.io.tmpdir")+"/test-sbt-bom-cache"))

diff --git a/plugin/src/sbt-test/psv/with_project_version/src/main/scala/Demo.scala b/plugin/src/sbt-test/psv/with_project_version/src/main/scala/Demo.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/sbt-test/sv/password-protected-repo_1.6.1/project/Dependencies.scala b/plugin/src/sbt-test/sv/password-protected-repo_1.6.1/project/Dependencies.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/sbt-test/sv/password-protected-repo_1.6.1/src/main/scala/Demo.scala b/plugin/src/sbt-test/sv/password-protected-repo_1.6.1/src/main/scala/Demo.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/test/scala/com/here/bom/BomSpec.scala b/plugin/src/test/scala/com/here/bom/BomSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/test/scala/com/here/bom/internal/BomReaderSpec.scala b/plugin/src/test/scala/com/here/bom/internal/BomReaderSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/plugin/src/test/scala/com/here/bom/internal/IvyPomLocatorSpec.scala b/plugin/src/test/scala/com/here/bom/internal/IvyPomLocatorSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 HERE Europe B.V.
+ * Copyright (C) 2019-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.