Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package javapackages-tools for openSUSE:Factory checked in at 2024-10-06 17:51:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old) and /work/SRC/openSUSE:Factory/.javapackages-tools.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "javapackages-tools" Sun Oct 6 17:51:08 2024 rev:43 rq:1205748 version:6.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes 2024-10-04 17:08:35.431940221 +0200 +++ /work/SRC/openSUSE:Factory/.javapackages-tools.new.19354/javapackages-tools.changes 2024-10-06 17:51:10.491117377 +0200 @@ -1,0 +2,21 @@ +Fri Oct 4 17:08:37 UTC 2024 - Fridrich Strba <fstrba@suse.com> + +- Upgrade to upstream version 6.3.2 + * Changes + + spec: Update Obsoletes versions + + Search for JAVACMD under JAVA_HOME only if it's set + + Obsolete set_jvm and set_jvm_dirs functions + + Drop unneeded _set_java_home function + + Remove JAVA_HOME check from check_java_env function + + Bump codecov/codecov-action from 2.0.2 to 4.6.0 + + Bump actions/setup-python from 4 to 5 + + Bump actions/checkout from 2 to 4 + + Add custom dependabot config + + Remove the test for JAVA_HOME and error if it is not set + + java-functions: Remove unneeded local variables + + Fix build status shield +- Removed patch: + * 0001-Double-quote-to-avoid-substitution-during-build.patch + + Fixed differently in this version + +------------------------------------------------------------------- Old: ---- 0001-Double-quote-to-avoid-substitution-during-build.patch 6.3.1.tar.gz New: ---- 6.3.2.tar.gz BETA DEBUG BEGIN: Old:- Removed patch: * 0001-Double-quote-to-avoid-substitution-during-build.patch + Fixed differently in this version BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javapackages-tools.spec ++++++ --- /var/tmp/diff_new_pack.g4jCgk/_old 2024-10-06 17:51:12.491200493 +0200 +++ /var/tmp/diff_new_pack.g4jCgk/_new 2024-10-06 17:51:12.495200659 +0200 @@ -30,7 +30,7 @@ %else Name: javapackages-tools %endif -Version: 6.3.1 +Version: 6.3.2 Release: 0 Summary: Macros and scripts for Java packaging support License: BSD-3-Clause @@ -45,7 +45,6 @@ #PATCH-FIX-SUSE: SUSE did not bump epoch of openjdk packages, whereas Fedora did # Avoid generating unresolvable requires Patch2: suse-no-epoch.patch -Patch3: 0001-Double-quote-to-avoid-substitution-during-build.patch BuildRequires: fdupes BuildRequires: perl ++++++ 6.3.1.tar.gz -> 6.3.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.1/.github/dependabot.yml new/javapackages-6.3.2/.github/dependabot.yml --- old/javapackages-6.3.1/.github/dependabot.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/javapackages-6.3.2/.github/dependabot.yml 2024-10-04 12:02:35.000000000 +0200 @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.1/.github/workflows/ci.yml new/javapackages-6.3.2/.github/workflows/ci.yml --- old/javapackages-6.3.1/.github/workflows/ci.yml 2024-09-29 20:41:29.000000000 +0200 +++ new/javapackages-6.3.2/.github/workflows/ci.yml 2024-10-04 12:02:35.000000000 +0200 @@ -26,9 +26,9 @@ runs-on: ubuntu-24.04 steps: - name: Checkout git repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' - name: Install required Python packages @@ -38,4 +38,4 @@ - name: Run check script run: ./check - name: Upload coverage report to Codecov - uses: codecov/codecov-action@v2.0.2 + uses: codecov/codecov-action@v4.6.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.1/README.md new/javapackages-6.3.2/README.md --- old/javapackages-6.3.1/README.md 2024-09-29 20:41:29.000000000 +0200 +++ new/javapackages-6.3.2/README.md 2024-10-04 12:02:35.000000000 +0200 @@ -1,4 +1,4 @@ -[](https://github.com/fedora-java/javapackages/actions/workflows/ci.yml?query=branch%3Amaster) [](https://codecov.io/gh/fedora-java/javapackages) +[](https://github.com/fedora-java/javapackages/actions/workflows/ci.yml?query=branch%3Amaster) [](https://codecov.io/gh/fedora-java/javapackages) Java Packages Tools is a collection of tools that make it easier to build RPM packages containing software running on the Java platform. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.1/java-utils/java-functions new/javapackages-6.3.2/java-utils/java-functions --- old/javapackages-6.3.1/java-utils/java-functions 2024-09-29 20:41:29.000000000 +0200 +++ new/javapackages-6.3.2/java-utils/java-functions 2024-10-04 12:02:35.000000000 +0200 @@ -124,33 +124,9 @@ } -# Test default JRE/JVM roots if nothing is defined yet -_set_java_home() -{ - local IFS=: - local jvmdir - - if [ -n "${JAVA_HOME}" ]; then - return - fi - - unset JAVA_HOME -} - -# Set the java virtual machine +# Obsolete, does nothing set_jvm() { - local IFS=: - local javaconfdirs - - _set_java_home - - if [ -z "${JAVA_HOME}" ]; then - javaconfdirs="${JAVACONFDIRS:-@{javaconfdir}}" - _err "JAVA_HOME is not set and default java installation was not found. JAVA_HOME for system applications can be set in java.conf in ${javaconfdirs}" - exit 1 - fi - return 0 } @@ -159,8 +135,6 @@ { local IFS - _set_java_home - # get local classpath first set -- "${@}" ${ADDITIONAL_JARS} LOCAL_CLASSPATH=$("@{bindir}/build-classpath" "${@}") @@ -178,22 +152,22 @@ return fi - set_jvm - # Add all sorts of jvm layouts here - for cmd in jre/sh/java jre/bin/java bin/java; do - JAVACMD="${JAVA_HOME}/${cmd}" - if [ -x "${JAVACMD}" ]; then - _log "Using configured JAVACMD: $JAVACMD" - if [ -n "${JAVACMD_OPTS}" ]; then - _log "Using java-wrapper with extra options: ${JAVACMD_OPTS}" - export _JP_JAVACMD="${JAVACMD}" - export _JP_JAVACMD_OPTS="${JAVACMD_OPTS}" - JAVACMD="@{javadir}-utils/java-wrapper" - fi - return 0 - fi - done + if [ -n "${JAVA_HOME}" ]; then + for cmd in jre/sh/java jre/bin/java bin/java; do + JAVACMD="${JAVA_HOME}/${cmd}" + if [ -x "${JAVACMD}" ]; then + _log "Using configured JAVACMD: $JAVACMD" + if [ -n "${JAVACMD_OPTS}" ]; then + _log "Using java-wrapper with extra options: ${JAVACMD_OPTS}" + export _JP_JAVACMD="${JAVACMD}" + export _JP_JAVACMD_OPTS="${JAVACMD_OPTS}" + JAVACMD="@{javadir}-utils/java-wrapper" + fi + return 0 + fi + done + fi JAVACMD=$(which java 2>/dev/null || :) if [ -x "${JAVACMD}" ]; then @@ -251,11 +225,9 @@ eval "exec \"\${JAVACMD}\" ${FLAGS} -classpath \"\${CLASSPATH}\" ${OPTIONS} \"\${MAIN_CLASS}\" \"\${@}\"" } -# Set JVM-related directories +# Obsolete, does nothing set_jvm_dirs() { - _set_java_home - return 0 } @@ -390,12 +362,6 @@ ## Checks java environment check_java_env() { - # This is usually set by set_jvm - if [ -z "${JAVA_HOME}" ]; then - _err "JAVA_HOME must be set" - return 1 - fi - if [ -z "${JAVACMD}" ]; then _err "JAVACMD must be set" return 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.1/javapackages-tools.spec new/javapackages-6.3.2/javapackages-tools.spec --- old/javapackages-6.3.1/javapackages-tools.spec 2024-09-29 20:41:29.000000000 +0200 +++ new/javapackages-6.3.2/javapackages-tools.spec 2024-10-04 12:02:35.000000000 +0200 @@ -64,7 +64,7 @@ Requires: mvn(org.apache.maven.plugins:maven-resources-plugin) Requires: mvn(org.apache.maven.plugins:maven-surefire-plugin) # Remove in Fedora 45 -Obsoletes: maven-local < 7 +Obsoletes: maven-local < 6.3.0 Obsoletes: maven-local-openjdk8 < 6.2.0-29 Obsoletes: maven-local-openjdk11 < 6.2.0-29 Obsoletes: maven-local-openjdk17 < 6.2.0-29 @@ -95,14 +95,14 @@ %package -n javapackages-local-openjdk21 Summary: Non-essential macros and scripts for Java packaging support -Obsoletes: javapackages-local < 7 +Obsoletes: javapackages-local < 6.3.0 Provides: javapackages-local = %{version}-%{release} Requires: javapackages-common = %{version}-%{release} Requires: xmvn-tools # Java build systems don't have hard requirement on java-devel, so it should be there Requires: java-21-openjdk-devel Requires: xmvn-generator -Obsoletes: javapackages-generators < 7 +Obsoletes: javapackages-generators < 6.3.0 %description -n javapackages-local-openjdk21 This package provides non-essential macros and scripts to support Java packaging. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.1/macros.d/macros.jpackage new/javapackages-6.3.2/macros.d/macros.jpackage --- old/javapackages-6.3.1/macros.d/macros.jpackage 2024-09-29 20:41:29.000000000 +0200 +++ new/javapackages-6.3.2/macros.d/macros.jpackage 2024-10-04 12:02:35.000000000 +0200 @@ -59,7 +59,6 @@ BASE_JARS="%(echo %4 | sed -e 's,:, ,g')"\ \ # Set parameters\ -set_jvm\ set_classpath \\$BASE_JARS\ set_flags \\$BASE_FLAGS\ set_options \\$BASE_OPTIONS\