release

Author: djeang

jeka

@@ -57,6 +57,7 @@ CURRENT_SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )"
 
 # Global variables are preferred over passing all arguments
 # in method call, cause they are too many.
+declare MAVEN_CENTRAL="https://repo.maven.apache.org/maven2"
 declare DEFAULT_JAVA_VERSION="21"
 declare JDK_DOWNLOAD_DISTRIB="temurin"
 declare JDK_DOWNLOAD_LIBC_TYPE="glibc"  # default for linux, overridden for other os
@@ -67,6 +68,7 @@ declare JDK_DOWNLOAD_ARCH
 declare IS_VERBOSE # we should not log anything when on the green path, except if '-lsu' arg is present
 declare IS_QUIET # we should log only error msg
 
+declare CLEAN_JEKA_OUTPUT # We should delete the jeka-output dir
 declare LOG_DEBUG # DEBUG
 declare DRY_RUN  # Debugging purpose
 declare DEFAULT_BASE_DIR="."
@@ -168,17 +170,19 @@ download_and_unpack() {
   local url=$1
   local dir=$2
   local file_type=$3  # 'zip' or 'tar.gz'
+  local auth_header=$4
   local temp_file
   temp_file=$(mktemp)
   rm "$temp_file"
 
   ## download
+  debug "download $url"
   if [ -x "$(command -v curl)" ]; then
     local silent_flag="s"
     if [ "$IS_VERBOSE" != "" ]; then
       silent_flag=""
     fi
-    curl -"$silent_flag"Lf --fail --show-error -o "$temp_file" "$url"
+    curl ${auth_header:+ -H "Authorization: $auth_header"} -"$silent_flag"Lf --fail --show-error -o "$temp_file" "$url"
     if [ $? -ne 0 ]; then
         msg "Curl request failed $url"
         msg "Returned code: $?"
@@ -209,13 +213,15 @@ download_and_unpack() {
 # Arguments:
 #   None
 #######################################
-compute_VERBOSE_QUIET() {
+compute_VERBOSE_QUIET_CLEAN() {
   for arg in "${CMD_LINE_ARGS[@]}"
     do
       if [ "$arg" == "--verbose" ] || [ "$arg" == "-v" ] || [ "$arg" == "-d" ] || [ "$arg" == "--debug" ]; then
           IS_VERBOSE="true"
       elif [ "$arg" == "--quiet" ] || [ "$arg" == "-q" ]; then
           IS_QUIET="true"
+      elif [ "$arg" == "--clean" ] || [ "$arg" == "-c" ]; then
+          CLEAN_JEKA_OUTPUT="true"
       fi
     done
 }
@@ -229,7 +235,7 @@ compute_VERBOSE_QUIET() {
 #######################################
 debug() {
   if [ -n "$LOG_DEBUG" ] || [ -n "$IS_VERBOSE" ]; then
-    echo "$*" 1>&2
+    echo "DEBUG: $*" 1>&2
   fi
 }
 
@@ -295,8 +301,6 @@ get_git_cache_dir() {
   echo "$(get_cache_dir)/git"
 }
 
-
-
 #######################################
 # Gets the value of a property declared within a property file
 # Globals:
@@ -465,6 +469,10 @@ find_remote_arg_index() {
 #######################################
 is_remote_arg() {
   local arg="$1"
+   if [[ "$arg" == "--remote" ]]; then
+      result="true"
+      return 0
+  fi
   if [[ "$arg" != -* ]]; then
     result="false"
     return 0
@@ -602,6 +610,11 @@ compute_BASE_DIR() {
   local option=${array[(($index))]}
   local next_index=$((index + 1))
   local remote_arg=${array[$next_index]}
+
+  ## in case of a "-u" arg between "-r" and remote location arg
+  if [[ "$remote_arg" == -* ]]; then
+       remote_arg=${array[$next_index+1]}
+  fi
   local need_update="false"
 
   # check if cmdline contains -u or --update options, prior the -parameters
@@ -624,7 +637,7 @@ compute_BASE_DIR() {
 
 #######################################
 # Computes the location of JeKa distribution directory according the JeKa version
-# used for the current BASE DIR. This may implies to dowload the distribution.
+# used for the current BASE DIR. This may implies to download the distribution.
 # Global Vars:
 #   JEKA_DIST_DIR (write)
 # Arguments:
@@ -645,7 +658,7 @@ compute_JEKA_DIST_DIR() {
   else
     local jeka_version=
     jeka_version=$(get_prop_value_from_base_dir "$base_dir" "jeka.version")
-    if [ -z "$jeka_version" ]; then
+    if [[ -z "$jeka_version" || "$jeka_version" == "." ]]; then
       JEKA_DIST_DIR="$CURRENT_SCRIPT_DIR"  # if no version and distrib location specified, use the current script dir
     else
       local distrib_cache_dir
@@ -659,15 +672,27 @@ compute_JEKA_DIST_DIR() {
         if [[ "$jeka_version" == *"-SNAPSHOT" ]]; then
           jeka_repo="https://oss.sonatype.org/content/repositories/snapshots"
         else
-          jeka_repo="https://repo.maven.apache.org/maven2"
+          jeka_repo=$MAVEN_CENTRAL
         fi
         local distrib_repo
-        distrib_repo=$(get_prop_value_from_base_dir "$base_dir" "jeka.distrib.repo")
+        distrib_repo=$(get_prop_value_from_base_dir "$base_dir" "jeka.repos.download")
+        [ -n "$distrib_repo" ] && distrib_repo=$(echo "$distrib_repo" | cut -d',' -f1 | xargs)
         [ -n "$distrib_repo" ] && jeka_repo=$distrib_repo
 
         local url=$jeka_repo/dev/jeka/jeka-core/$jeka_version/jeka-core-$jeka_version-distrib.zip
+        local auth_header=""
+        auth_header=$(get_prop_value_from_base_dir "$base_dir" "jeka.repos.download.headers.Authorization")
+        if [ -z "$auth_header" ]; then
+          repo_username=$(get_prop_value_from_base_dir "$base_dir" "jeka.repos.download.username")
+          repo_password=$(get_prop_value_from_base_dir "$base_dir" "jeka.repos.download.password")
+          if [[ -n "$repo_username" && -n "$repo_password" ]]; then
+            encoded_credentials=$(echo -n "$repo_username:$repo_password" | base64)
+            auth_header="Basic $encoded_credentials"
+          fi
+        fi
+
         info "Download Jeka distrib from $url in $distrib_cache_dir"
-        download_and_unpack "$url" "$distrib_cache_dir"
+        download_and_unpack "$url" "$distrib_cache_dir" "zip" "$auth_header"
         JEKA_DIST_DIR=$distrib_cache_dir
       fi
     fi
@@ -715,8 +740,9 @@ compute_JEKA_CLASSPATH() {
     jar_file="$dist_dir/$JEKA_JAR_NAME"
   fi
   if [ ! -f "$jar_file" ]; then
-    msg "Cannot find JeKa jar file $jar_file."
-    msg "Are you sure the JeKa distribution you use is properly packaged ?"
+    msg "Cannot find Jeka jar file $jar_file"
+    msg "Are you sure the jeka.version is correctly specified in your project's jeka.properties file ?"
+    msg "Or, if you're executing Jeka from the global distribution, it might not be packaged correctly."
     exit 1
   fi
   JEKA_CLASSPATH="$boot_dir_args$jar_file"
@@ -838,6 +864,8 @@ compute_JAVA_CMD() {
     if [ -z "$jdkPath" ]; then
       get_or_download_jdk "$JAVA_VERSION"
       JAVA_HOME="$DOWNLOAD_JDK_DIR"
+    else
+      JAVA_HOME="$jdkPath"
     fi
   fi
 
@@ -906,9 +934,9 @@ execute_program_if_requested() {
   build_cmd=$(get_prop_value_from_base_dir "$BASE_DIR" "jeka.program.build")
   if [[ -z "$build_cmd" ]]; then
     if [ -d "$BASE_DIR/src" ]; then
-      build_cmd="project: pack -Djeka.skip.tests=true --stderr"
+      build_cmd="project: pack pack.jarType=FAT pack.detectMainClass=true -Djeka.test.skip=true --stderr"
     else
-      build_cmd="base: pack -Djeka.skip.tests=true --stderr"
+      build_cmd="base: pack -Djeka.test.skip=true --stderr"
     fi
   fi
 
@@ -1050,7 +1078,10 @@ filter_out_sysProp() {
 # Script starts here
 ##############################################################
 
-compute_VERBOSE_QUIET
+compute_VERBOSE_QUIET_CLEAN
+if [[ "$CLEAN_JEKA_OUTPUT" == "true" ]] && [ -d "jeka-output" ]; then
+    rm -rf "jeka-output"
+fi
 JEKA_USER_HOME=$(get_jeka_user_home)
 GLOBAL_PROP_FILE="$JEKA_USER_HOME/global.properties"
 

jeka-src/_dev/Custom.java

@@ -13,7 +13,7 @@ class Custom extends KBean {
     @JkPostInit
     private void postInit(BaseKBean baseKBean) {
         JkJekaVersionRanges.setCompatibilityRange(baseKBean.getManifest(),
-                "0.11.33",
+                "0.11.38",
                 "https://raw.githubusercontent.com/jeka-dev/openapi-plugin/master/breaking_versions.txt");
         baseKBean.setVersionSupplier(JkGit.of()::getJkVersionFromTag);
     }