diff --git a/.github/actions/deploy-ubuntu/action.yml b/.github/actions/deploy-ubuntu/action.yml index 50c8e446c4b..5609c91a7fa 100644 --- a/.github/actions/deploy-ubuntu/action.yml +++ b/.github/actions/deploy-ubuntu/action.yml @@ -7,10 +7,13 @@ runs: env: GITHUB_EVENT_HEAD_COMMIT_MESSAGE: ${{ github.event.head_commit.message }} run: | - SUDO=sudo - if [[ "$USER" == "root" ]]; then - SUDO= - cd /root + export SUDO=$(which sudo) + echo "SUDO=$SUDO" >> $GITHUB_ENV + if [[ -z "$SUDO" ]]; then + echo "Fixing HOME to /root (was '$HOME')" + export HOME=/root + echo "HOME=$HOME" >> $GITHUB_ENV + cd $HOME fi mkdir -p .ccache @@ -84,7 +87,7 @@ runs: # $SUDO apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA6932366A755776 $SUDO apt-get update $SUDO apt-get -y install gcc-multilib g++-multilib python3 python2.7 python3-minimal python2.7-minimal rpm libasound2-dev:$ARCH freeglut3-dev:$ARCH libfontconfig-dev:$ARCH libgtk2.0-dev:$ARCH libusb-dev:$ARCH libusb-1.0-0-dev:$ARCH libffi-dev:$ARCH libbz2-dev:$ARCH zlib1g-dev:$ARCH libxcb1-dev:$ARCH - $SUDO apt-get -y install pkg-config ccache clang $TOOLCHAIN openjdk-8-jdk-headless ant python python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake make libtool bison flex perl nasm curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev + $SUDO apt-get -y install pkg-config ccache clang $TOOLCHAIN openjdk-8-jdk-headless ant python2 python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake make libtool bison flex perl nasm curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev rapidjson-dev ln -sf /usr/lib/jvm/java-8-openjdk-amd64 /usr/lib/jvm/default-java find /usr/lib/jvm/default-java/ @@ -262,17 +265,13 @@ runs: export MAKEJ=$(getconf _NPROCESSORS_ONLN) echo Fetching $GITHUB_REPOSITORY@$GITHUB_SHA + git config --global --add safe.directory '*' git init git fetch --depth 1 https://github.com/$GITHUB_REPOSITORY $GITHUB_SHA git checkout $GITHUB_SHA git submodule update --init --recursive git submodule foreach --recursive 'git reset --hard' - if [[ "$USER" == "root" ]]; then - echo "Fixing HOME to /root (was '$HOME')" - export HOME=/root - fi - if [[ -n ${CI_DEPLOY_NEED_GRADLE:-} ]]; then echo Executing Gradle $GRADLE_TASK ${{ matrix.options }} $CI_DEPLOY_OPTIONS on $MAKEJ processors export GRADLE_OPTIONS="-Dorg.gradle.jvmargs=-Xmx2048m -PjavacppPlatform=$CI_DEPLOY_PLATFORM -PjavacppPlatformExtension=${{ matrix.ext }} ${{ matrix.options }} $CI_DEPLOY_OPTIONS --info" @@ -306,7 +305,4 @@ runs: - name: Clean up shell: bash run: | - if [[ "$USER" == "root" ]]; then - cd /root - fi - rm -Rf $(find .m2/repository/ -name '*SNAPSHOT*') + rm -Rf $(find $HOME/.m2/repository/ -name '*SNAPSHOT*') diff --git a/.github/workflows/cpython.yml b/.github/workflows/cpython.yml index f12f3ab303a..ca3961363ce 100644 --- a/.github/workflows/cpython.yml +++ b/.github/workflows/cpython.yml @@ -19,43 +19,38 @@ env: jobs: # linux-armhf: # runs-on: ubuntu-20.04 -# container: ubuntu:bionic # steps: # - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions # linux-arm64: # runs-on: ubuntu-20.04 -# container: ubuntu:bionic # steps: # - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions # linux-ppc64le: # runs-on: ubuntu-20.04 -# container: ubuntu:bionic # steps: # - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions - linux-x86: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# linux-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions - windows-x86: - runs-on: windows-2019 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions +# windows-x86: +# runs-on: windows-2019 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions windows-x86_64: runs-on: windows-2019 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [linux-x86_64, macosx-x86_64, windows-x86_64] # needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] runs-on: ubuntu-20.04 steps: diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml index 3e2737f467f..2402700a78f 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -20,19 +20,16 @@ env: jobs: linux-arm64: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-ppc64le: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions # macosx-x86_64: # runs-on: macos-11 # steps: diff --git a/.github/workflows/dnnl.yml b/.github/workflows/dnnl.yml index 4d24566a984..5f07df38198 100644 --- a/.github/workflows/dnnl.yml +++ b/.github/workflows/dnnl.yml @@ -19,14 +19,12 @@ env: jobs: linux-arm64: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: runs-on: macos-11 steps: diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml index 3bb898be60b..fd35cb5b8af 100644 --- a/.github/workflows/ffmpeg.yml +++ b/.github/workflows/ffmpeg.yml @@ -18,49 +18,43 @@ env: CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }} jobs: - android-arm: - runs-on: ubuntu-20.04 - container: centos:7 - strategy: - matrix: - ext: ["", -gpl] - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# android-arm: +# runs-on: ubuntu-20.04 +# strategy: +# matrix: +# ext: ["", -gpl] +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions android-arm64: runs-on: ubuntu-20.04 - container: centos:7 - strategy: - matrix: - ext: ["", -gpl] - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions - android-x86: - runs-on: ubuntu-20.04 - container: centos:7 strategy: matrix: ext: ["", -gpl] steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions +# android-x86: +# runs-on: ubuntu-20.04 +# strategy: +# matrix: +# ext: ["", -gpl] +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions android-x86_64: runs-on: ubuntu-20.04 - container: centos:7 - strategy: - matrix: - ext: ["", -gpl] - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions - linux-armhf: - runs-on: ubuntu-20.04 - container: ubuntu:bionic strategy: matrix: ext: ["", -gpl] steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions +# linux-armhf: +# runs-on: ubuntu-20.04 +# strategy: +# matrix: +# ext: ["", -gpl] +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-arm64: runs-on: ubuntu-20.04 - container: ubuntu:bionic strategy: matrix: ext: ["", -gpl] @@ -68,28 +62,25 @@ jobs: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-ppc64le: runs-on: ubuntu-20.04 - container: ubuntu:bionic strategy: matrix: ext: ["", -gpl] steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions - linux-x86: - runs-on: ubuntu-20.04 - container: centos:7 - strategy: - matrix: - ext: ["", -gpl] - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# linux-x86: +# runs-on: ubuntu-20.04 +# strategy: +# matrix: +# ext: ["", -gpl] +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 strategy: matrix: ext: ["", -gpl] steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-arm64: runs-on: macos-11 strategy: @@ -104,13 +95,13 @@ jobs: ext: ["", -gpl] steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions - windows-x86: - runs-on: windows-2019 - strategy: - matrix: - ext: ["", -gpl] - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions +# windows-x86: +# runs-on: windows-2019 +# strategy: +# matrix: +# ext: ["", -gpl] +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions windows-x86_64: runs-on: windows-2019 strategy: @@ -119,7 +110,8 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64] +# needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [android-arm64, android-x86_64, linux-arm64, linux-ppc64le, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64] runs-on: ubuntu-20.04 steps: - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions diff --git a/.github/workflows/leptonica.yml b/.github/workflows/leptonica.yml index 4a57821a6c2..f73e1624d5d 100644 --- a/.github/workflows/leptonica.yml +++ b/.github/workflows/leptonica.yml @@ -18,51 +18,42 @@ env: CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }} jobs: - android-arm: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# android-arm: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions android-arm64: runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions - android-x86: - runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions +# android-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions android-x86_64: runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions - linux-armhf: - runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions +# linux-armhf: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-arm64: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-ppc64le: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions - linux-x86: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# linux-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-arm64: runs-on: macos-11 steps: @@ -71,16 +62,17 @@ jobs: runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions - windows-x86: - runs-on: windows-2019 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions +# windows-x86: +# runs-on: windows-2019 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions windows-x86_64: runs-on: windows-2019 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64] +# needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [android-arm64, android-x86_64, linux-arm64, linux-ppc64le, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64] runs-on: ubuntu-20.04 steps: - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions diff --git a/.github/workflows/libffi.yml b/.github/workflows/libffi.yml index 41657a88acf..e37dd707591 100644 --- a/.github/workflows/libffi.yml +++ b/.github/workflows/libffi.yml @@ -17,51 +17,42 @@ env: CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }} jobs: - android-arm: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# android-arm: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions android-arm64: runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions - android-x86: - runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions +# android-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions android-x86_64: runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions - linux-armhf: - runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions +# linux-armhf: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-arm64: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-ppc64le: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions - linux-x86: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# linux-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-arm64: runs-on: macos-11 steps: @@ -70,16 +61,17 @@ jobs: runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions - windows-x86: - runs-on: windows-2019 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions +# windows-x86: +# runs-on: windows-2019 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions windows-x86_64: runs-on: windows-2019 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64] +# needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [android-arm64, android-x86_64, linux-arm64, linux-ppc64le, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64] runs-on: ubuntu-20.04 steps: - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml index 595d9184952..a71bb80332a 100644 --- a/.github/workflows/llvm.yml +++ b/.github/workflows/llvm.yml @@ -17,31 +17,26 @@ env: CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }} jobs: - linux-armhf: - runs-on: ubuntu-20.04 - container: ubuntu:bionic - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions +# linux-armhf: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-arm64: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-ppc64le: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions - linux-x86: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# linux-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-arm64: runs-on: macos-11 steps: @@ -50,12 +45,12 @@ jobs: runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions - windows-x86: - runs-on: windows-2019 - env: - BUILD_DIR: C:\build - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions +# windows-x86: +# runs-on: windows-2019 +# env: +# BUILD_DIR: C:\build +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions windows-x86_64: runs-on: windows-2019 env: @@ -63,7 +58,8 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64] +# needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [linux-arm64, linux-ppc64le, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64] runs-on: ubuntu-20.04 steps: - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions diff --git a/.github/workflows/mkl.yml b/.github/workflows/mkl.yml index 8865511f4dd..89d64a65808 100644 --- a/.github/workflows/mkl.yml +++ b/.github/workflows/mkl.yml @@ -17,30 +17,29 @@ env: CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }} jobs: - linux-x86: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# linux-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions - windows-x86: - runs-on: windows-2019 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions +# windows-x86: +# runs-on: windows-2019 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions windows-x86_64: runs-on: windows-2019 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] +# needs: [linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [linux-x86_64, macosx-x86_64, windows-x86_64] runs-on: ubuntu-20.04 steps: - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions diff --git a/.github/workflows/numpy.yml b/.github/workflows/numpy.yml index 56d4c507c25..4fbf0144f99 100644 --- a/.github/workflows/numpy.yml +++ b/.github/workflows/numpy.yml @@ -20,43 +20,38 @@ env: jobs: # linux-armhf: # runs-on: ubuntu-20.04 -# container: ubuntu:bionic # steps: # - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions # linux-arm64: # runs-on: ubuntu-20.04 -# container: ubuntu:bionic # steps: # - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions # linux-ppc64le: # runs-on: ubuntu-20.04 -# container: ubuntu:bionic # steps: # - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions - linux-x86: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# linux-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions - windows-x86: - runs-on: windows-2019 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions +# windows-x86: +# runs-on: windows-2019 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions windows-x86_64: runs-on: windows-2019 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [linux-x86_64, macosx-x86_64, windows-x86_64] # needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] runs-on: ubuntu-20.04 steps: diff --git a/.github/workflows/openblas.yml b/.github/workflows/openblas.yml index 39c30a8064d..4cbe65c679f 100644 --- a/.github/workflows/openblas.yml +++ b/.github/workflows/openblas.yml @@ -18,26 +18,22 @@ env: CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }} jobs: - android-arm: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# android-arm: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions android-arm64: runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions - android-x86: - runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions +# android-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions android-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions ios-arm64: runs-on: macos-11 steps: @@ -46,31 +42,26 @@ jobs: runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions - linux-armhf: - runs-on: ubuntu-20.04 - container: ubuntu:bionic - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions +# linux-armhf: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-arm64: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-ppc64le: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions - linux-x86: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# linux-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-arm64: runs-on: macos-11 steps: @@ -79,16 +70,17 @@ jobs: runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions - windows-x86: - runs-on: windows-2019 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions +# windows-x86: +# runs-on: windows-2019 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions windows-x86_64: runs-on: windows-2019 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [android-arm, android-arm64, android-x86, android-x86_64, ios-arm64, ios-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64] +# needs: [android-arm, android-arm64, android-x86, android-x86_64, ios-arm64, ios-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [android-arm64, android-x86_64, ios-arm64, ios-x86_64, linux-arm64, linux-ppc64le, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64] runs-on: ubuntu-20.04 steps: - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions diff --git a/.github/workflows/opencl.yml b/.github/workflows/opencl.yml index d9d1a7de6ee..08f7467aa88 100644 --- a/.github/workflows/opencl.yml +++ b/.github/workflows/opencl.yml @@ -19,14 +19,12 @@ env: jobs: linux-arm64: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: runs-on: macos-11 steps: diff --git a/.github/workflows/opencv.yml b/.github/workflows/opencv.yml index d45c24c6329..05dc50eacd8 100644 --- a/.github/workflows/opencv.yml +++ b/.github/workflows/opencv.yml @@ -18,26 +18,22 @@ env: CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }} jobs: - android-arm: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# android-arm: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions android-arm64: runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions - android-x86: - runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions +# android-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions android-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions ios-arm64: runs-on: macos-11 steps: @@ -46,34 +42,29 @@ jobs: runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions - linux-armhf: - runs-on: ubuntu-20.04 - container: ubuntu:bionic - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions +# linux-armhf: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-arm64: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-ppc64le: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions - linux-x86: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# linux-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 strategy: matrix: ext: ["", -gpu] steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-arm64: runs-on: macos-11 steps: @@ -82,10 +73,10 @@ jobs: runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions - windows-x86: - runs-on: windows-2019 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions +# windows-x86: +# runs-on: windows-2019 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions windows-x86_64: runs-on: windows-2019 strategy: @@ -94,7 +85,8 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [android-arm, android-arm64, android-x86, android-x86_64, ios-arm64, ios-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64] +# needs: [android-arm, android-arm64, android-x86, android-x86_64, ios-arm64, ios-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [android-arm64, android-x86_64, ios-arm64, ios-x86_64, linux-arm64, linux-ppc64le, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64] runs-on: ubuntu-20.04 steps: - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions diff --git a/.github/workflows/scipy.yml b/.github/workflows/scipy.yml index f2fa5e08808..96666656ee3 100644 --- a/.github/workflows/scipy.yml +++ b/.github/workflows/scipy.yml @@ -20,43 +20,38 @@ env: jobs: # linux-armhf: # runs-on: ubuntu-20.04 -# container: ubuntu:bionic # steps: # - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions # linux-arm64: # runs-on: ubuntu-20.04 -# container: ubuntu:bionic # steps: # - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions # linux-ppc64le: # runs-on: ubuntu-20.04 -# container: ubuntu:bionic # steps: # - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions - linux-x86: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# linux-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions - windows-x86: - runs-on: windows-2019 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions +# windows-x86: +# runs-on: windows-2019 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions windows-x86_64: runs-on: windows-2019 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [linux-x86_64, macosx-x86_64, windows-x86_64] # needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] runs-on: ubuntu-20.04 steps: diff --git a/.github/workflows/tesseract.yml b/.github/workflows/tesseract.yml index 94811303605..fef3f5c88f7 100644 --- a/.github/workflows/tesseract.yml +++ b/.github/workflows/tesseract.yml @@ -18,51 +18,42 @@ env: CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }} jobs: - android-arm: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# android-arm: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions android-arm64: runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions - android-x86: - runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions +# android-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions android-x86_64: runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions - linux-armhf: - runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions +# linux-armhf: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-arm64: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-ppc64le: runs-on: ubuntu-20.04 - container: ubuntu:bionic steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions - linux-x86: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# linux-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-arm64: runs-on: macos-11 steps: @@ -71,16 +62,17 @@ jobs: runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions - windows-x86: - runs-on: windows-2019 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions +# windows-x86: +# runs-on: windows-2019 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions windows-x86_64: runs-on: windows-2019 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64] +# needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [android-arm64, android-x86_64, linux-arm64, linux-ppc64le, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64] runs-on: ubuntu-20.04 steps: - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions diff --git a/cpython/platform/pom.xml b/cpython/platform/pom.xml index 15b5f7c682f..b224e877491 100644 --- a/cpython/platform/pom.xml +++ b/cpython/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -48,12 +48,12 @@ - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -66,12 +66,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -138,10 +138,10 @@ // requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; // requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; // requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le; - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.windows.x86; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/cpython/pom.xml b/cpython/pom.xml index a1e3eab17c0..f61a403544d 100644 --- a/cpython/pom.xml +++ b/cpython/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/cpython/samples/pom.xml b/cpython/samples/pom.xml index 4c367b47137..d135775e056 100644 --- a/cpython/samples/pom.xml +++ b/cpython/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.cpython simple - 1.5.9 + 1.5.10-SNAPSHOT Simple 1.7 @@ -12,7 +12,7 @@ org.bytedeco cpython-platform - 3.11.3-1.5.9 + 3.11.3-1.5.10-SNAPSHOT diff --git a/cuda/platform/pom.xml b/cuda/platform/pom.xml index c892c4935bc..3842e40d46b 100644 --- a/cuda/platform/pom.xml +++ b/cuda/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ diff --git a/cuda/platform/redist/pom.xml b/cuda/platform/redist/pom.xml index 53e44eb59b8..60c7b509735 100644 --- a/cuda/platform/redist/pom.xml +++ b/cuda/platform/redist/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../../ diff --git a/cuda/pom.xml b/cuda/pom.xml index 75f1637567c..70f5e3f87be 100644 --- a/cuda/pom.xml +++ b/cuda/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/cuda/samples/pom.xml b/cuda/samples/pom.xml index 071edd12d9f..d0117b13a10 100644 --- a/cuda/samples/pom.xml +++ b/cuda/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.cuda mnistcudnn - 1.5.9 + 1.5.10-SNAPSHOT MNISTCUDNN 1.7 @@ -12,14 +12,14 @@ org.bytedeco cuda-platform - 12.1-8.9-1.5.9 + 12.1-8.9-1.5.10-SNAPSHOT org.bytedeco cuda-platform-redist - 12.1-8.9-1.5.9 + 12.1-8.9-1.5.10-SNAPSHOT diff --git a/dnnl/platform/pom.xml b/dnnl/platform/pom.xml index 281f7a5b5a9..d7f919bad10 100644 --- a/dnnl/platform/pom.xml +++ b/dnnl/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ diff --git a/dnnl/pom.xml b/dnnl/pom.xml index 98930c97e25..cd960e88fd0 100644 --- a/dnnl/pom.xml +++ b/dnnl/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/dnnl/samples/pom.xml b/dnnl/samples/pom.xml index 55eef45127c..6215f49150c 100644 --- a/dnnl/samples/pom.xml +++ b/dnnl/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.dnnl samples - 1.5.9 + 1.5.10-SNAPSHOT CpuCnnInferenceInt8 1.7 @@ -12,7 +12,7 @@ org.bytedeco dnnl-platform - 3.1-1.5.9 + 3.1-1.5.10-SNAPSHOT diff --git a/ffmpeg/platform/gpl/pom.xml b/ffmpeg/platform/gpl/pom.xml index ef0e2da6392..0b325c32c93 100644 --- a/ffmpeg/platform/gpl/pom.xml +++ b/ffmpeg/platform/gpl/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../../ diff --git a/ffmpeg/platform/pom.xml b/ffmpeg/platform/pom.xml index c139d6f2a5e..a32bba20f59 100644 --- a/ffmpeg/platform/pom.xml +++ b/ffmpeg/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -30,48 +30,48 @@ ${javacpp.moduleId} ${project.version} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-arm} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-arm64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.linux-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-armhf} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -96,12 +96,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -169,14 +169,14 @@ // requires static org.bytedeco.${javacpp.moduleId}.android.arm64; // requires static org.bytedeco.${javacpp.moduleId}.android.x86; // requires static org.bytedeco.${javacpp.moduleId}.android.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; +// requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le; requires static org.bytedeco.${javacpp.moduleId}.macosx.arm64; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.windows.x86; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/ffmpeg/pom.xml b/ffmpeg/pom.xml index baf626d9b46..3e39a05773e 100644 --- a/ffmpeg/pom.xml +++ b/ffmpeg/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/ffmpeg/samples/pom.xml b/ffmpeg/samples/pom.xml index cfa1d7cf232..637def0bb69 100644 --- a/ffmpeg/samples/pom.xml +++ b/ffmpeg/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.ffmpeg readfewframe - 1.5.9 + 1.5.10-SNAPSHOT ReadFewFrame 1.7 @@ -12,14 +12,14 @@ org.bytedeco ffmpeg-platform - 6.0-1.5.9 + 6.0-1.5.10-SNAPSHOT org.bytedeco ffmpeg-platform-gpl - 6.0-1.5.9 + 6.0-1.5.10-SNAPSHOT diff --git a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/postproc.java b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/postproc.java index 4b1a98dd0e0..cf9cecb576d 100644 --- a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/postproc.java +++ b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/postproc.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2022 Samuel Audet + * Copyright (C) 2013-2023 Samuel Audet * * Licensed either under the Apache License, Version 2.0, or (at your option) * under the terms of the GNU General Public License as published by @@ -38,8 +38,8 @@ global = "org.bytedeco.ffmpeg.global.postproc", value = { // GPL only - @Platform(cinclude = {"", "", ""}, link = "postproc@.56", extension = "-gpl"), - @Platform(value = "windows", preload = "postproc-56", extension = "-gpl") + @Platform(cinclude = {"", "", ""}, link = "postproc@.57", extension = "-gpl"), + @Platform(value = "windows", preload = "postproc-57", extension = "-gpl") } ) public class postproc implements InfoMapper { diff --git a/leptonica/platform/pom.xml b/leptonica/platform/pom.xml index 4d562f0949f..0cfa07ffd3e 100644 --- a/leptonica/platform/pom.xml +++ b/leptonica/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -30,48 +30,48 @@ ${javacpp.moduleId} ${project.version} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-arm} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-arm64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.linux-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-armhf} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -96,12 +96,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -169,14 +169,14 @@ // requires static org.bytedeco.${javacpp.moduleId}.android.arm64; // requires static org.bytedeco.${javacpp.moduleId}.android.x86; // requires static org.bytedeco.${javacpp.moduleId}.android.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; +// requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le; requires static org.bytedeco.${javacpp.moduleId}.macosx.arm64; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.windows.x86; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/leptonica/pom.xml b/leptonica/pom.xml index 0bf0344b2b4..14e57000ebb 100644 --- a/leptonica/pom.xml +++ b/leptonica/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/leptonica/samples/pom.xml b/leptonica/samples/pom.xml index 0c634ac662d..ac774b2843e 100644 --- a/leptonica/samples/pom.xml +++ b/leptonica/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.leptonica sudokutest - 1.5.9 + 1.5.10-SNAPSHOT SudokuTest 1.7 @@ -12,7 +12,7 @@ org.bytedeco leptonica-platform - 1.83.0-1.5.9 + 1.83.0-1.5.10-SNAPSHOT diff --git a/libffi/platform/pom.xml b/libffi/platform/pom.xml index d30a3b351b8..2abc78ed2ad 100644 --- a/libffi/platform/pom.xml +++ b/libffi/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -30,48 +30,48 @@ ${javacpp.moduleId} ${project.version} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-arm} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-arm64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.linux-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-armhf} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -96,12 +96,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -169,14 +169,14 @@ // requires static org.bytedeco.${javacpp.moduleId}.android.arm64; // requires static org.bytedeco.${javacpp.moduleId}.android.x86; // requires static org.bytedeco.${javacpp.moduleId}.android.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; +// requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le; requires static org.bytedeco.${javacpp.moduleId}.macosx.arm64; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.windows.x86; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/libffi/pom.xml b/libffi/pom.xml index dc6f1dfcf6d..5ad39c058fa 100644 --- a/libffi/pom.xml +++ b/libffi/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/libffi/samples/pom.xml b/libffi/samples/pom.xml index 692823f9660..10d164e16ef 100644 --- a/libffi/samples/pom.xml +++ b/libffi/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.libffi simpleexample - 1.5.9 + 1.5.10-SNAPSHOT SimpleExample 1.7 @@ -12,7 +12,7 @@ org.bytedeco libffi-platform - 3.4.4-1.5.9 + 3.4.4-1.5.10-SNAPSHOT diff --git a/llvm/platform/pom.xml b/llvm/platform/pom.xml index 8e46cf00c08..8c2d9153f6c 100644 --- a/llvm/platform/pom.xml +++ b/llvm/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -30,24 +30,24 @@ ${javacpp.moduleId} ${project.version} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.linux-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-armhf} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -72,12 +72,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -141,14 +141,14 @@ ${project.build.directory}/${project.artifactId}.jar module org.bytedeco.${javacpp.moduleId}.platform { - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; +// requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le; requires static org.bytedeco.${javacpp.moduleId}.macosx.arm64; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.windows.x86; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/llvm/pom.xml b/llvm/pom.xml index 3089a8774a5..1e076f0c4e2 100644 --- a/llvm/pom.xml +++ b/llvm/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/llvm/samples/clang/pom.xml b/llvm/samples/clang/pom.xml index f1214d9cfcd..7bfbce5753d 100644 --- a/llvm/samples/clang/pom.xml +++ b/llvm/samples/clang/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.llvm ClangASTVisitorExample - 1.5.9 + 1.5.10-SNAPSHOT ClangASTVisitorExample 1.7 @@ -12,7 +12,7 @@ org.bytedeco llvm-platform - 16.0.4-1.5.9 + 16.0.4-1.5.10-SNAPSHOT diff --git a/llvm/samples/llvm/pom.xml b/llvm/samples/llvm/pom.xml index d482cba86ff..1decde7d905 100644 --- a/llvm/samples/llvm/pom.xml +++ b/llvm/samples/llvm/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.llvm samples - 1.5.9 + 1.5.10-SNAPSHOT Factorial 1.7 @@ -12,12 +12,12 @@ org.bytedeco llvm-platform - 16.0.4-1.5.9 + 16.0.4-1.5.10-SNAPSHOT org.bytedeco libffi-platform - 3.4.4-1.5.9 + 3.4.4-1.5.10-SNAPSHOT diff --git a/llvm/samples/polly/pom.xml b/llvm/samples/polly/pom.xml index 8f0a00bd318..5f8722df777 100644 --- a/llvm/samples/polly/pom.xml +++ b/llvm/samples/polly/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.llvm MatMulBenchmark - 1.5.9 + 1.5.10-SNAPSHOT MatMulBenchmark 1.8 @@ -13,22 +13,22 @@ org.bytedeco llvm-platform - 16.0.4-1.5.9 + 16.0.4-1.5.10-SNAPSHOT org.bytedeco libffi-platform - 3.4.4-1.5.9 + 3.4.4-1.5.10-SNAPSHOT org.bytedeco mkl-platform - 2023.1-1.5.9 + 2023.1-1.5.10-SNAPSHOT org.bytedeco mkl-platform-redist - 2023.1-1.5.9 + 2023.1-1.5.10-SNAPSHOT diff --git a/mkl/platform/pom.xml b/mkl/platform/pom.xml index d37b22d9836..2fa2fa3c7fe 100644 --- a/mkl/platform/pom.xml +++ b/mkl/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -30,12 +30,12 @@ ${javacpp.moduleId} ${project.version} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -48,12 +48,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -117,10 +117,10 @@ ${project.build.directory}/${project.artifactId}.jar module org.bytedeco.${javacpp.moduleId}.platform { - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.windows.x86; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/mkl/platform/redist/pom.xml b/mkl/platform/redist/pom.xml index 694d52a6179..30d22321d88 100644 --- a/mkl/platform/redist/pom.xml +++ b/mkl/platform/redist/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../../ diff --git a/mkl/pom.xml b/mkl/pom.xml index 0e31ddb20d1..2b8c4ca1a7e 100644 --- a/mkl/pom.xml +++ b/mkl/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/mkl/samples/pom.xml b/mkl/samples/pom.xml index 36206aacd9f..69567ec94a7 100644 --- a/mkl/samples/pom.xml +++ b/mkl/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.mkl mkl - 1.5.9 + 1.5.10-SNAPSHOT DGEMMExample 1.7 @@ -12,14 +12,14 @@ org.bytedeco mkl-platform - 2023.1-1.5.9 + 2023.1-1.5.10-SNAPSHOT org.bytedeco mkl-platform-redist - 2023.1-1.5.9 + 2023.1-1.5.10-SNAPSHOT diff --git a/numpy/platform/pom.xml b/numpy/platform/pom.xml index 6f1d6ce9152..1b12a17f340 100644 --- a/numpy/platform/pom.xml +++ b/numpy/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -53,12 +53,12 @@ - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -71,12 +71,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -143,10 +143,10 @@ // requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; // requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; // requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le; - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.windows.x86; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/numpy/pom.xml b/numpy/pom.xml index 5227fa7de44..30a752789b9 100644 --- a/numpy/pom.xml +++ b/numpy/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/numpy/samples/pom.xml b/numpy/samples/pom.xml index 7a6d6b987a6..d4631f1e76f 100644 --- a/numpy/samples/pom.xml +++ b/numpy/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.numpy matmul - 1.5.9 + 1.5.10-SNAPSHOT MatMul 1.7 @@ -12,14 +12,14 @@ org.bytedeco numpy-platform - 1.24.3-1.5.9 + 1.24.3-1.5.10-SNAPSHOT org.bytedeco mkl-platform-redist - 2023.1-1.5.9 + 2023.1-1.5.10-SNAPSHOT diff --git a/openblas/platform/pom.xml b/openblas/platform/pom.xml index 7d291fbf9d5..ddf3b7941b4 100644 --- a/openblas/platform/pom.xml +++ b/openblas/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -30,24 +30,24 @@ ${javacpp.moduleId} ${project.version} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-arm} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-arm64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -66,24 +66,24 @@ ${project.version} ${javacpp.platform.ios-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.linux-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-armhf} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -108,12 +108,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -183,14 +183,14 @@ // requires static org.bytedeco.${javacpp.moduleId}.android.x86_64; requires static org.bytedeco.${javacpp.moduleId}.ios.arm64; requires static org.bytedeco.${javacpp.moduleId}.ios.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; +// requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le; requires static org.bytedeco.${javacpp.moduleId}.macosx.arm64; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.windows.x86; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/openblas/pom.xml b/openblas/pom.xml index f3ddadd02e3..b2bf7c3b1ca 100644 --- a/openblas/pom.xml +++ b/openblas/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/openblas/samples/pom.xml b/openblas/samples/pom.xml index c93e64016e7..f27ff6958bb 100644 --- a/openblas/samples/pom.xml +++ b/openblas/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.openblas openblas - 1.5.9 + 1.5.10-SNAPSHOT ExampleDGELSrowmajor 1.7 @@ -12,7 +12,7 @@ org.bytedeco openblas-platform - 0.3.23-1.5.9 + 0.3.23-1.5.10-SNAPSHOT diff --git a/opencl/platform/pom.xml b/opencl/platform/pom.xml index a01428bbe91..f309400e200 100644 --- a/opencl/platform/pom.xml +++ b/opencl/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ diff --git a/opencl/pom.xml b/opencl/pom.xml index 63e69d39ed7..277bc9c08c1 100644 --- a/opencl/pom.xml +++ b/opencl/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/opencl/samples/pom.xml b/opencl/samples/pom.xml index 4d095a6a3c0..c1e2a817f10 100644 --- a/opencl/samples/pom.xml +++ b/opencl/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.opencl vecadd - 1.5.9 + 1.5.10-SNAPSHOT VecAdd 1.7 @@ -12,7 +12,7 @@ org.bytedeco opencl-platform - 3.0-1.5.9 + 3.0-1.5.10-SNAPSHOT diff --git a/opencv/platform/gpu/pom.xml b/opencv/platform/gpu/pom.xml index e78cc43c23a..169aff9626d 100644 --- a/opencv/platform/gpu/pom.xml +++ b/opencv/platform/gpu/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../../ diff --git a/opencv/platform/pom.xml b/opencv/platform/pom.xml index b39c359c9dc..552e20b21d0 100644 --- a/opencv/platform/pom.xml +++ b/opencv/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ diff --git a/opencv/pom.xml b/opencv/pom.xml index a4b616c73c6..0bbde0443d7 100644 --- a/opencv/pom.xml +++ b/opencv/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/opencv/samples/pom.xml b/opencv/samples/pom.xml index 30ff7073ff3..f72ba72dcfc 100644 --- a/opencv/samples/pom.xml +++ b/opencv/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.opencv stitching - 1.5.9 + 1.5.10-SNAPSHOT Stitching 1.7 @@ -12,35 +12,35 @@ org.bytedeco opencv-platform - 4.7.0-1.5.9 + 4.7.0-1.5.10-SNAPSHOT org.bytedeco opencv-platform-gpu - 4.7.0-1.5.9 + 4.7.0-1.5.10-SNAPSHOT org.bytedeco cuda-platform-redist - 12.1-8.9-1.5.9 + 12.1-8.9-1.5.10-SNAPSHOT org.bytedeco mkl-platform-redist - 2023.1-1.5.9 + 2023.1-1.5.10-SNAPSHOT org.bytedeco numpy-platform - 1.24.3-1.5.9 + 1.24.3-1.5.10-SNAPSHOT diff --git a/scipy/platform/pom.xml b/scipy/platform/pom.xml index dd320c7cca8..ac85f1c5442 100644 --- a/scipy/platform/pom.xml +++ b/scipy/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -48,12 +48,12 @@ - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -66,12 +66,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -138,10 +138,10 @@ // requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; // requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; // requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le; - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.windows.x86; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/scipy/pom.xml b/scipy/pom.xml index a3a81bb78d6..e933654e384 100644 --- a/scipy/pom.xml +++ b/scipy/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/scipy/samples/pom.xml b/scipy/samples/pom.xml index 86f53e0c93b..16c7b67bfef 100644 --- a/scipy/samples/pom.xml +++ b/scipy/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.scipy sparselinalg - 1.5.9 + 1.5.10-SNAPSHOT SparseLinalg 1.7 @@ -12,14 +12,14 @@ org.bytedeco scipy-platform - 1.10.1-1.5.9 + 1.10.1-1.5.10-SNAPSHOT org.bytedeco mkl-platform-redist - 2023.1-1.5.9 + 2023.1-1.5.10-SNAPSHOT diff --git a/tesseract/platform/pom.xml b/tesseract/platform/pom.xml index 2b179210e92..115aebf39e5 100644 --- a/tesseract/platform/pom.xml +++ b/tesseract/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -30,48 +30,48 @@ ${javacpp.moduleId} ${project.version} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-arm} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-arm64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.linux-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-armhf} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -96,12 +96,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -169,14 +169,14 @@ // requires static org.bytedeco.${javacpp.moduleId}.android.arm64; // requires static org.bytedeco.${javacpp.moduleId}.android.x86; // requires static org.bytedeco.${javacpp.moduleId}.android.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; +// requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le; requires static org.bytedeco.${javacpp.moduleId}.macosx.arm64; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.windows.x86; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/tesseract/pom.xml b/tesseract/pom.xml index 328a0ce929a..9837705aeba 100644 --- a/tesseract/pom.xml +++ b/tesseract/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/tesseract/samples/pom.xml b/tesseract/samples/pom.xml index ec26d76b9f9..e9b18e85ddb 100644 --- a/tesseract/samples/pom.xml +++ b/tesseract/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.tesseract BasicExample - 1.5.9 + 1.5.10-SNAPSHOT BasicExample 1.7 @@ -12,7 +12,7 @@ org.bytedeco tesseract-platform - 5.3.1-1.5.9 + 5.3.1-1.5.10-SNAPSHOT