bump version to: 4.0.1-dev

.gitignore

@@ -1 +1,4 @@
 __pycache__/
+.idea/
+.gradle/
+build/

.gitlab-ci.yml

@@ -11,7 +11,7 @@ stages:
 
 
 .ddadevops: &ddo
-  image: "domaindrivenarchitecture/ddadevops:4.5.5-dev2023-08-17-09-15-42"
+  image: "domaindrivenarchitecture/ddadevops:4.7.2"
   before_script:
     - export RELEASE_ARTIFACT_TOKEN=$MEISSA_REPO_BUERO_RW
     - export PROTECTED_TOKEN_EXAMPLE=$PROTECTED_TOKEN_EXAMPLE
@@ -22,7 +22,6 @@ build_on_main:
   stage: build_on_main
   script:
     - echo "buld on main"
-    - pyb publish_artifacts
 
 
 build_on_tag:

README.md

@@ -1,3 +1,45 @@
+This repo shows examples how dda-devops-build (https://repo.prod.meissa.de/meissa/dda-devops-build) can be used.
+As a starting point, you may want to have a look at file [build.py](build.py) in this repo 
+and the tasks which are defined in this file. 
+
+# Usage
+
+## Examples
+
+### Build
+
+You can trigger the build-task by 
+```
+pyb dev
+```
+
+### Releases
+
+With task `patch` you can create a patch-level release with one command, i.e. perform the following actions:
+* create a commit for a patch-leve release version
+  * e.g. if current project version is 1.1.1-dev, the update version will be the release version 1.1.1
+  * the commit contains all build files specified in the build.py (primary as well as secondary build files), 
+    where the primary build file contains the version number to be used for all build files
+* create a tag for the release commit (e.g. tag 1.1.1 for the corresponding commit)
+* a second commit for the next snapshot version (1.1.2-dev)
+* push both commits and the tag to the remote git repo
+
+```
+pyb patch
+```
+
+Similarly you can create a minor or major version with:
+
+```
+pyb minor
+```
+resp.
+```
+pyb major
+```
+
+
+
 # Release Testing
 ## NoRelease
 
@@ -23,4 +65,4 @@ For more details about our repository model see: https://repo.prod.meissa.de/mei
 ## License
 
 Copyright © 2021 meissa GmbH
-Licensed under the [Apache License, Version 2.0](LICENSE) (the "License")
+Licensed under the [Apache License, Version 2.0](LICENSE) (the "License")

build.gradle

@@ -0,0 +1,13 @@
+plugins {
+    id "java"
+}
+
+
+version = "4.0.1-SNAPSHOT"
+group = "org.domaindrivenarchitecture.buildtest"
+
+
+repositories {
+    mavenCentral()
+}
+

build.py

@@ -1,3 +1,4 @@
+import os
 from os import environ
 from pybuilder.core import task, init
 from ddadevops import *
@@ -6,9 +7,29 @@ name = "buildtest"
 MODULE = "release"
 PROJECT_ROOT_PATH = "."
 
+version = "4.0.1-dev"
+
 
 @init
-def initialize(project):
+def initialize0(project):
+    """
+    to avoid prompt for gopass if no artifacts need to be uploaded
+    usage: with option "-E ng" , e.g. "pyb -E artifacts patch_local"
+    """
+    os.environ["RELEASE_ARTIFACT_TOKEN"] = "dummy"  # avoids prompt for RELEASE_ARTIFACT_TOKEN
+
+
+@init(environments=["artifacts"])
+def initialize1(project):
+    """
+    prompt for gopass if no artifacts need to be uploaded
+    usage: with option "-E artifacts" , e.g. "pyb -E artifacts patch_local"
+    """
+    del os.environ["RELEASE_ARTIFACT_TOKEN"]
+
+
+@init
+def initialize2(project):
     input = {
         "name": name,
         "module": MODULE,
@@ -17,33 +38,54 @@ def initialize(project):
         "build_types": [],
         "mixin_types": ["RELEASE"],
         "release_primary_build_file": "build_to_test.py",
-        "release_secondary_build_files": ["package.json", "project.clj"],
-        "release_artifacts": [],
+        "release_secondary_build_files": ["package.json", "project.clj", "build.gradle", "build.py"],
+        "release_artifacts": ["README.md"],
         "release_artifact_server_url": "https://repo.prod.meissa.de",
         "release_organisation": "meissa",
         "release_repository_name": name,
     }
 
-    project.build_depends_on("ddadevops>=4.0.0-dev")
-
+    project.build_depends_on("ddadevops>=4.10.7")
     build = ReleaseMixin(project, input)
     build.initialize_build_dir()
 
 
 @task
 def patch(project):
+    """
+    updates version to next patch level, creates a tag, creates new SNAPSHOT version,
+    commits build files (primary and secondary) and pushes to remote
+    """
     linttest(project, "PATCH")
     release(project)
 
 
+@task
+def patch_local(project):
+    """
+    updates version to next patch level,
+    commits build files (primary and secondary), DOES NOT push to remote
+    """
+    linttest(project, "PATCH")
+    prepare(project)
+
+
 @task
 def minor(project):
+    """
+    updates version to next minor level, creates a tag, creates new SNAPSHOT version,
+    commits build files (primary and secondary) and pushes to remote
+    """
     linttest(project, "MINOR")
     release(project)
 
 
 @task
 def major(project):
+    """
+    updates version to next major level, creates a tag, creates new SNAPSHOT version,
+    commits build files (primary and secondary) and pushes to remote
+    """
     linttest(project, "MAJOR")
     release(project)
 
@@ -67,6 +109,7 @@ def tag(project):
 
 @task
 def publish_artifacts(project):
+    """ creates a release in <release_artifact_server_url> and uploads artifacts """
     build = get_devops_build(project)
     print("PROTECTED_TOKEN_EXAMPLE" in environ)
     print(environ.get("PROTECTED_TOKEN_EXAMPLE"))

build_to_test.py

@@ -33,7 +33,7 @@ default_task = "dev"
 name = "ddadevops"
 MODULE = "not-used"
 PROJECT_ROOT_PATH = "."
-version = "2.0.2-dev"
+version = "4.0.1-dev"
 summary = "tools to support builds combining gopass, terraform, dda-pallet, aws & hetzner-cloud"
 description = __doc__
 authors = [Author("meissa GmbH", "buero@meissa-gmbh.de")]

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,249 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

package.json

@@ -2,7 +2,7 @@
     "name": "c4k-jira",
     "description": "Generate c4k yaml for a jira deployment.",
     "author": "meissa GmbH",
-    "version": "2.0.2-dev",
+    "version": "4.0.1-SNAPSHOT",
     "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-jira#readme",
     "repository": "https://www.npmjs.com/package/c4k-jira",
     "license": "APACHE2",

project.clj

@@ -1,12 +1,12 @@
-(defproject org.domaindrivenarchitecture/c4k-jira "1.0.8-dev"
+(defproject org.domaindrivenarchitecture/c4k-jira "3.3.1-dev"
   :description "jira c4k-installation package"
   :url "https://domaindrivenarchitecture.org"
   :license {:name "Apache License, Version 2.0"
             :url "https://www.apache.org/licenses/LICENSE-2.0.html"}
   :dependencies [[org.clojure/clojure "2.0.1-dev"]
                  [org.clojure/tools.reader "2.0.2-dev"]
-                 [org.domaindrivenarchitecture/c4k-common-clj "2.0.3"]
-                 [hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]]
+                 [org.domaindrivenarchitecture/c4k-common-clj "2.0.3-dev"]
+                 [hickory "2.0.4-dev" :exclusions [viebel/codox-klipse-theme]]]
   :target-path "target/%s/"
   :source-paths ["src/main/cljc"
                  "src/main/clj"]
@@ -17,15 +17,15 @@
                         ["releases" {:sign-releases false :url "https://clojars.org/repo"}]]
   :profiles {:test {:test-paths ["src/test/cljc"]
                     :resource-paths ["src/test/resources"]
-                    :dependencies [[dda/data-test "0.1.1"]]}
-             :dev {:plugins [[lein-shell "0.5.0"]]}
+                    :dependencies [[dda/data-test "2.0.5-dev"]]}
+             :dev {:plugins [[lein-shell "2.0.6-dev"]]}
              :uberjar {:aot :all
                        :main dda.c4k-jira.uberjar
                        :uberjar-name "c4k-jira-standalone.jar"
-                       :dependencies [[org.clojure/tools.cli "1.0.214"]
-                                      [ch.qos.logback/logback-classic "1.4.5"
+                       :dependencies [[org.clojure/tools.cli "2.0.7-dev"]
+                                      [ch.qos.logback/logback-classic "2.0.8-dev"
                                        :exclusions [com.sun.mail/javax.mail]]
-                                      [org.slf4j/jcl-over-slf4j "2.0.6"]]}}
+                                      [org.slf4j/jcl-over-slf4j "3.0.1-dev"]]}}
   :release-tasks [["test"]
                   ["vcs" "assert-committed"]
                   ["change" "version" "leiningen.release/bump-version" "release"]