diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8123193b8e..1c3cdd91f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ name: Java CI on: - push: + pull_request: jobs: build: @@ -14,22 +14,25 @@ jobs: uses: actions/setup-java@v3 with: - java-version: '11' - distribution: 'adopt' + java-version: "11" + distribution: "adopt" # NEATO ! CACHE !!!! - cache: 'maven' + cache: "maven" - - name: Dependency Test + - name: Install Missing Dependencies + run: sudo apt-get install -y libv4l-0 libopencv-dev python3-opencv + + - name: Dependency Test # installs all dependencies run: mvn test -Dtest=org.myrobotlab.framework.DependencyTest -q - - name: Build with Maven - run: mvn --batch-mode -Dtest=!**/OpenCV* test -q + - name: Build with Maven # currently cannot test opencv + run: mvn clean test surefire-report:report jacoco:report -q - name: Get next version uses: reecetech/version-increment@2023.9.3 id: version with: scheme: semver - increment: patch + increment: patch - name: Package with Maven run: "mvn package -DskipTests -Dversion=${{ steps.version.outputs.version }} -q" @@ -52,6 +55,21 @@ jobs: generate_release_notes: true body_path: ./release-template.md + # - name: Publish Test Report + # if: success() || failure() + # uses: scacap/action-surefire-report@v1 + + - name: Add Coverage to PR + id: jacoco + uses: madrapps/jacoco-report@v1.6.1 + with: + paths: | + ${{ github.workspace }}/target/site/jacoco/jacoco.xml + token: ${{ secrets.ACCESS_TOKEN }} + debug-mode: true + min-coverage-overall: 40 + min-coverage-changed-files: 60 + - name: Release if: github.ref == 'refs/heads/develop' id: release @@ -63,4 +81,3 @@ jobs: tag_name: ${{ steps.version.outputs.version }} generate_release_notes: true body_path: ./release-template.md - diff --git a/.vscode/settings.json b/.vscode/settings.json index 1085af6d43..c0d2e88e12 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,12 +1,38 @@ -{ - "files.exclude": { - "**/.classpath": true, - "**/.project": true, - "**/.settings": true, - "**/.factorypath": true, - "**/target": true - }, - "files.associations": { - "cstddef": "cpp" +{ "files.exclude": { + "**/.classpath": true, + "**/.project": true, + "**/.settings": true, + "**/.factorypath": true, + "**/target": true + }, + "files.associations": { + "cstddef": "cpp" + }, + "terminal.integrated.scrollback": 9999, + "jest.rootPath": "app", + "jest.jestCommandLine": "npx jest --runInBand --verbose", + "jest.autoRun": "off", + "jest.monitorLongRun": 120000, + "jest.showCoverageOnLoad": false, + "jest.coverageFormatter": "GutterFormatter", + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.organizeImports": true + }, + "typescript.tsdk": "./app/node_modules/typescript/lib", + "typescript.enablePromptUseWorkspaceTsdk": true, + "editor.tabSize": 2, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" } -} \ No newline at end of file + } + \ No newline at end of file diff --git a/pom.xml b/pom.xml index e6b9aa346c..1d26af2bea 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,5 @@ - + --> 4.0.0 org.myrobotlab mrl @@ -71,234 +84,228 @@ MyRobotLab Open Source Creative Machine Control - false - - + - - ${maven.build.timestamp} - yyyyMMddHHmm - ${version} - ${git.branch} - ${NODE_NAME} - ${NODE_LABELS} - - - + + ${maven.build.timestamp} + yyyyMMddHHmm + ${project.version} + ${git.branch} + ${NODE_NAME} + ${NODE_LABELS} + + + 11 11 UTF-8 - - - - - central - central - https://repo.maven.apache.org/maven2 - - - - myrobotlab - myrobotlab - https://repo.myrobotlab.org/artifactory/myrobotlab - - - - sarxos - sarxos - https://oss.sonatype.org/content/repositories/snapshots - - - - eclipse-release - eclipse-release - https://repo.eclipse.org/content/groups/releases - - - - oss-snapshots-repo - oss-snapshots-repo - https://oss.sonatype.org/content/groups/public - - - - dv8tion - dv8tion - https://m2.dv8tion.net/releases - - - - + + + + + central + central + https://repo.maven.apache.org/maven2 + + + + myrobotlab + myrobotlab + https://repo.myrobotlab.org/artifactory/myrobotlab + + + + sarxos + sarxos + https://oss.sonatype.org/content/repositories/snapshots + + + + eclipse-release + eclipse-release + https://repo.eclipse.org/content/groups/releases + + + + oss-snapshots-repo + oss-snapshots-repo + https://oss.sonatype.org/content/groups/public + + + + dv8tion + dv8tion + https://m2.dv8tion.net/releases + + + + - - - javazoom - jlayer - 1.0.1 - provided - - - com.googlecode.soundlibs - mp3spi - 1.9.5.4 - provided - - - com.googlecode.soundlibs - vorbisspi - 1.0.3.3 - provided - - - - - - - - - - org.boofcv - boofcv-all - 0.40.1 - provided - - - - - - ChessBoard - ChessBoard - 1.0.0 - provided - - - - - - it.sauronsoftware.cron4j - cron4j - 2.2.5 - provided - - - - - - net.sf.opencsv - opencsv - 2.3 - provided - - - - - org.nanohttpd - nanohttpd - 2.2.0 - - - - - org.bytedeco - javacpp - 1.5.7 - provided - - - org.deeplearning4j - deeplearning4j-core - 1.0.0-M2.1 - provided + + + javazoom + jlayer + 1.0.1 + provided + + + com.googlecode.soundlibs + mp3spi + 1.9.5.4 + provided + + + com.googlecode.soundlibs + vorbisspi + 1.0.3.3 + provided + + + + + + + + + + org.boofcv + boofcv-all + 0.40.1 + provided + + + + + + ChessBoard + ChessBoard + 1.0.0 + provided + + + + + + it.sauronsoftware.cron4j + cron4j + 2.2.5 + provided + + + + + + net.sf.opencsv + opencsv + 2.3 + provided + + + + + + org.bytedeco + javacpp + 1.5.7 + provided + + + org.deeplearning4j + deeplearning4j-core + 1.0.0-M2.1 + provided org.slf4j slf4j-api - - - org.deeplearning4j - deeplearning4j-zoo - 1.0.0-M2.1 - provided - - - org.deeplearning4j - deeplearning4j-nn - 1.0.0-M2.1 - provided - - - org.deeplearning4j - deeplearning4j-modelimport - 1.0.0-M2.1 - provided - - - miniXCEPTION - miniXCEPTION - 0.0 - provided - zip - - - org.nd4j - nd4j-native-platform - 1.0.0-M2.1 - provided - - - com.twelvemonkeys.imageio - imageio-core - 3.1.1 - provided - - - - - - net.dv8tion - JDA - 4.3.0_277 - provided + + + org.deeplearning4j + deeplearning4j-zoo + 1.0.0-M2.1 + provided + + + org.deeplearning4j + deeplearning4j-nn + 1.0.0-M2.1 + provided + + + org.deeplearning4j + deeplearning4j-modelimport + 1.0.0-M2.1 + provided + + + miniXCEPTION + miniXCEPTION + 0.0 + provided + zip + + + org.nd4j + nd4j-native-platform + 1.0.0-M2.1 + provided + + + com.twelvemonkeys.imageio + imageio-core + 3.1.1 + provided + + + + + + net.dv8tion + JDA + 4.3.0_277 + provided net.java.dev.jna jna - - - - - - com.github.docker-java - docker-java - 3.2.13 - provided + + + + + + com.github.docker-java + docker-java + 3.2.13 + provided io.netty * - - - - - - - org.apache.tika - tika-core - 2.8.0 - provided + + + + + + + org.apache.tika + tika-core + 2.8.0 + provided org.slf4j @@ -321,12 +328,12 @@ * - - - org.apache.tika - tika-parser-audiovideo-module - 2.8.0 - provided + + + org.apache.tika + tika-parser-audiovideo-module + 2.8.0 + provided org.slf4j @@ -349,304 +356,304 @@ * - - - org.apache.opennlp - opennlp-tools - 1.6.0 - provided - - - net.objecthunter - exp4j - 0.4.8 - provided - - - org.sweble.wikitext - swc-engine - 3.1.7 - provided - - - org.sweble.wom3 - sweble-wom3-core - 3.1.7 - provided - - - com.thoughtworks.xstream - xstream - 1.4.19 - provided - - - - - - pl.allegro.tech - embedded-elasticsearch - 2.7.0 - provided - - - - - - javax.mail - mail - 1.4.7 - provided - - - - - - com.github.pnavais - state-machine - 1.2.0 - provided - - - - - - org.eclipse.jgit - org.eclipse.jgit - 6.6.1.202309021850-r - provided - - - - - - com.google.cloud - google-cloud-vision - 2.1.3 - provided - - - - - - - - - - com.google.cloud - google-cloud-translate - 2.2.0 - provided - - - com.google.auth - google-auth-library-credentials - 1.3.0 - provided - - - - - - org.jsoup - jsoup - 1.15.3 - provided - - - org.apache.commons - commons-lang3 - 3.3.2 - provided - - - - - - - - - - - - - - - - - - - - - - - - - - jfugue - jfugue - 5.0.7 - provided - - - - - - org.jmonkeyengine - jme3-core - 3.3.2-stable - provided - - - org.jmonkeyengine - jme3-desktop - 3.3.2-stable - provided - - - org.jmonkeyengine - jme3-lwjgl3 - 3.3.2-stable - provided - - - org.jmonkeyengine - jme3-jogg - 3.3.2-stable - provided - - - org.jmonkeyengine - jme3-bullet - 3.3.2-stable - provided - - - org.jmonkeyengine - jme3-bullet-native - 3.3.2-stable - provided - - - org.jmonkeyengine - jme3-plugins - 3.3.2-stable - provided - - - org.jmonkeyengine - jme3-blender - 3.3.2-stable - provided - - - de.jarnbjo - j-ogg-all - 1.0.0 - provided - - - org.lwjgl - lwjgl-opengl - 3.2.3 - provided - - - org.lwjgl - lwjgl-glfw - 3.2.3 - provided - - - - - - net.java.jinput - jinput - 2.0.9 - provided - - - jinput-natives - jinput-natives - 2.0.7 - provided - zip - - - - - - org.apache.kafka - kafka-clients - 1.0.1 - provided - - - - - - com.1stleg - jnativehook - 2.0.3 - provided - - - - - - leapmotion - leap - 2.1.3 - provided - - - leapmotion - leap-win64 - 2.1.3 - provided - zip - - - leapmotion - leap-mac64 - 2.1.3 - provided - zip - - - leapmotion - leap-linux64 - 2.1.3 - provided - zip - - - - - - org.myrobotlab.audio - voice-effects - 1.0 - provided - zip - - - - - - - de.dfki.mary - marytts - 5.2 - provided - pom - - - de.dfki.mary - voice-bits1-hsmm - 5.2 - provided + + + org.apache.opennlp + opennlp-tools + 1.6.0 + provided + + + net.objecthunter + exp4j + 0.4.8 + provided + + + org.sweble.wikitext + swc-engine + 3.1.7 + provided + + + org.sweble.wom3 + sweble-wom3-core + 3.1.7 + provided + + + com.thoughtworks.xstream + xstream + 1.4.19 + provided + + + + + + pl.allegro.tech + embedded-elasticsearch + 2.7.0 + provided + + + + + + javax.mail + mail + 1.4.7 + provided + + + + + + com.github.pnavais + state-machine + 1.2.0 + provided + + + + + + org.eclipse.jgit + org.eclipse.jgit + 6.6.1.202309021850-r + provided + + + + + + com.google.cloud + google-cloud-vision + 2.1.3 + provided + + + + + + + + + + com.google.cloud + google-cloud-translate + 2.2.0 + provided + + + com.google.auth + google-auth-library-credentials + 1.3.0 + provided + + + + + + org.jsoup + jsoup + 1.15.3 + provided + + + org.apache.commons + commons-lang3 + 3.3.2 + provided + + + + + + + + + + + + + + + + + + + + + + + + + + jfugue + jfugue + 5.0.7 + provided + + + + + + org.jmonkeyengine + jme3-core + 3.3.2-stable + provided + + + org.jmonkeyengine + jme3-desktop + 3.3.2-stable + provided + + + org.jmonkeyengine + jme3-lwjgl3 + 3.3.2-stable + provided + + + org.jmonkeyengine + jme3-jogg + 3.3.2-stable + provided + + + org.jmonkeyengine + jme3-bullet + 3.3.2-stable + provided + + + org.jmonkeyengine + jme3-bullet-native + 3.3.2-stable + provided + + + org.jmonkeyengine + jme3-plugins + 3.3.2-stable + provided + + + org.jmonkeyengine + jme3-blender + 3.3.2-stable + provided + + + de.jarnbjo + j-ogg-all + 1.0.0 + provided + + + org.lwjgl + lwjgl-opengl + 3.2.3 + provided + + + org.lwjgl + lwjgl-glfw + 3.2.3 + provided + + + + + + net.java.jinput + jinput + 2.0.9 + provided + + + jinput-natives + jinput-natives + 2.0.7 + provided + zip + + + + + + org.apache.kafka + kafka-clients + 1.0.1 + provided + + + + + + com.1stleg + jnativehook + 2.0.3 + provided + + + + + + leapmotion + leap + 2.1.3 + provided + + + leapmotion + leap-win64 + 2.1.3 + provided + zip + + + leapmotion + leap-mac64 + 2.1.3 + provided + zip + + + leapmotion + leap-linux64 + 2.1.3 + provided + zip + + + + + + org.myrobotlab.audio + voice-effects + 1.0 + provided + zip + + + + + + + de.dfki.mary + marytts + 5.2 + provided + pom + + + de.dfki.mary + voice-bits1-hsmm + 5.2 + provided org.apache.httpcomponents @@ -665,12 +672,12 @@ log4j - - - de.dfki.mary - voice-bits3-hsmm - 5.2 - provided + + + de.dfki.mary + voice-bits3-hsmm + 5.2 + provided org.apache.httpcomponents @@ -681,12 +688,12 @@ httpclient - - - de.dfki.mary - voice-cmu-bdl-hsmm - 5.2 - provided + + + de.dfki.mary + voice-cmu-bdl-hsmm + 5.2 + provided org.apache.httpcomponents @@ -697,12 +704,12 @@ httpclient - - - de.dfki.mary - voice-cmu-nk-hsmm - 5.2 - provided + + + de.dfki.mary + voice-cmu-nk-hsmm + 5.2 + provided org.apache.httpcomponents @@ -713,12 +720,12 @@ httpclient - - - de.dfki.mary - voice-cmu-rms-hsmm - 5.2 - provided + + + de.dfki.mary + voice-cmu-rms-hsmm + 5.2 + provided org.apache.httpcomponents @@ -729,12 +736,12 @@ httpclient - - - de.dfki.mary - voice-cmu-slt-hsmm - 5.2 - provided + + + de.dfki.mary + voice-cmu-slt-hsmm + 5.2 + provided org.apache.httpcomponents @@ -753,12 +760,12 @@ log4j - - - de.dfki.mary - voice-dfki-obadiah-hsmm - 5.2 - provided + + + de.dfki.mary + voice-dfki-obadiah-hsmm + 5.2 + provided org.apache.httpcomponents @@ -769,12 +776,12 @@ httpclient - - - de.dfki.mary - voice-dfki-ot-hsmm - 5.2 - provided + + + de.dfki.mary + voice-dfki-ot-hsmm + 5.2 + provided org.apache.httpcomponents @@ -785,12 +792,12 @@ httpclient - - - de.dfki.mary - voice-dfki-pavoque-neutral-hsmm - 5.2 - provided + + + de.dfki.mary + voice-dfki-pavoque-neutral-hsmm + 5.2 + provided org.apache.httpcomponents @@ -801,12 +808,12 @@ httpclient - - - de.dfki.mary - voice-dfki-poppy-hsmm - 5.2 - provided + + + de.dfki.mary + voice-dfki-poppy-hsmm + 5.2 + provided org.apache.httpcomponents @@ -817,12 +824,12 @@ httpclient - - - de.dfki.mary - voice-dfki-prudence-hsmm - 5.2 - provided + + + de.dfki.mary + voice-dfki-prudence-hsmm + 5.2 + provided org.apache.httpcomponents @@ -833,12 +840,12 @@ httpclient - - - de.dfki.mary - voice-dfki-spike-hsmm - 5.2 - provided + + + de.dfki.mary + voice-dfki-spike-hsmm + 5.2 + provided org.apache.httpcomponents @@ -849,12 +856,12 @@ httpclient - - - de.dfki.mary - voice-enst-camille-hsmm - 5.2 - provided + + + de.dfki.mary + voice-enst-camille-hsmm + 5.2 + provided org.apache.httpcomponents @@ -865,12 +872,12 @@ httpclient - - - de.dfki.mary - voice-enst-dennys-hsmm - 5.2 - provided + + + de.dfki.mary + voice-enst-dennys-hsmm + 5.2 + provided org.apache.httpcomponents @@ -881,12 +888,12 @@ httpclient - - - de.dfki.mary - voice-istc-lucia-hsmm - 5.2 - provided + + + de.dfki.mary + voice-istc-lucia-hsmm + 5.2 + provided org.apache.httpcomponents @@ -897,12 +904,12 @@ httpclient - - - de.dfki.mary - voice-upmc-jessica-hsmm - 5.2 - provided + + + de.dfki.mary + voice-upmc-jessica-hsmm + 5.2 + provided org.apache.httpcomponents @@ -913,12 +920,12 @@ httpclient - - - de.dfki.mary - voice-upmc-pierre-hsmm - 5.2 - provided + + + de.dfki.mary + voice-upmc-pierre-hsmm + 5.2 + provided org.apache.httpcomponents @@ -961,36 +968,36 @@ slf4j-log4j12 - - - org.apache.logging.log4j - log4j-1.2-api - 2.12.1 - provided - - - org.apache.logging.log4j - log4j-api - 2.12.1 - provided - - - - - - org.eclipse.paho - org.eclipse.paho.client.mqttv3 - 1.2.1 - provided - - - - - - io.moquette - moquette-broker - 0.15 - provided + + + org.apache.logging.log4j + log4j-1.2-api + 2.12.1 + provided + + + org.apache.logging.log4j + log4j-api + 2.12.1 + provided + + + + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.1 + provided + + + + + + io.moquette + moquette-broker + 0.15 + provided com.fasterxml.jackson.core @@ -1005,52 +1012,52 @@ slf4j-log4j12 - - - - - - - - - - com.github.nicholasastuart - myo-java - 0.9.1 - provided - - - - - - org.saintandreas - jovr - 1.8.0.0 - provided - - - slick-util - slick-util - 1.0.0 - provided - - - org.jscience - jscience - 4.3.1 - provided - - - org.saintandreas - xres - 1.0.3 - provided - - - org.saintandreas - oria-resources - 1.0.4 - provided + + + + + + + + + + com.github.nicholasastuart + myo-java + 0.9.1 + provided + + + + + + org.saintandreas + jovr + 1.8.0.0 + provided + + + slick-util + slick-util + 1.0.0 + provided + + + org.jscience + jscience + 4.3.1 + provided + + + org.saintandreas + xres + 1.0.3 + provided + + + org.saintandreas + oria-resources + 1.0.4 + provided org.slf4j @@ -1065,24 +1072,24 @@ guava - - - - - - org.bytedeco - javacv-platform - 1.5.7 - provided - - - - - - net.sf.jipcam - jipcam - 0.9.1 - provided + + + + + + org.bytedeco + javacv-platform + 1.5.7 + provided + + + + + + net.sf.jipcam + jipcam + 0.9.1 + provided javax.servlet @@ -1101,105 +1108,105 @@ commons-lang - - - commons-lang - commons-lang - 2.6 - provided - - - opencv - opencv_classifiers - 0.0.2 - provided - zip - - - opencv - opencv_facedetectdnn - 1.0.1 - provided - zip - - - opencv - opencv_east_text_detection - 0.0.1 - provided - zip - - - yolo - yolov2 - 0.0.2 - provided - zip - - - - - - simpleopenni - openni - 1.96 - provided - - - org.myrobotlab.openni - openni-deps - 0.1 - provided - zip - - - javax.vecmath - vecmath - 1.5.2 - provided - - - java3d - j3d-core - 1.3.1 - provided - - - java3d - j3d-core-utils - 1.3.1 - provided - - - - - - org.json - json - 20230227 - provided - - - - - - com.illposed.osc - javaosc-core - 0.4 - provided - - - - - - - - - - com.amazonaws - aws-java-sdk-polly - 1.12.253 - provided + + + commons-lang + commons-lang + 2.6 + provided + + + opencv + opencv_classifiers + 0.0.2 + provided + zip + + + opencv + opencv_facedetectdnn + 1.0.1 + provided + zip + + + opencv + opencv_east_text_detection + 0.0.1 + provided + zip + + + yolo + yolov2 + 0.0.2 + provided + zip + + + + + + simpleopenni + openni + 1.96 + provided + + + org.myrobotlab.openni + openni-deps + 0.1 + provided + zip + + + javax.vecmath + vecmath + 1.5.2 + provided + + + java3d + j3d-core + 1.3.1 + provided + + + java3d + j3d-core-utils + 1.3.1 + provided + + + + + + org.json + json + 20230227 + provided + + + + + + com.illposed.osc + javaosc-core + 0.4 + provided + + + + + + + + + + com.amazonaws + aws-java-sdk-polly + 1.12.253 + provided com.fasterxml.jackson.core @@ -1222,17 +1229,17 @@ httpclient - - - - - - - - program-ab - program-ab-kw - 0.0.8.10 - provided + + + + + + + + program-ab + program-ab-kw + 0.0.8.10 + provided ch.qos.logback @@ -1243,204 +1250,204 @@ logback-core - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - 2.14.0 - provided - - - - - org.apache.lucene - lucene-analysis-common - 9.4.2 - provided - - - org.apache.lucene - lucene-analysis-kuromoji - 9.4.2 - provided - - - - - - net.sf.py4j - py4j - 0.10.9.7 - provided - - - org.bytedeco - cpython-platform - 3.10.8-1.5.8 - provided - - - org.bytedeco - cpython - 3.10.8-1.5.8 - provided - - - - - - org.python - jython-standalone - 2.7.2 - - - - - - rome - rome - 1.0 - provided - - - - - - com.pi4j - pi4j-core - 1.4 - provided - - - com.pi4j - pi4j-native - 1.4 - provided - pom - - - - - - com.amazonaws - aws-java-sdk-rekognition - 1.11.263 - provided - - - - - - ch.qos.logback - logback-classic - 1.2.3 - - - net.bytebuddy - byte-buddy - 1.12.16 - - - com.fasterxml.jackson.core - jackson-core - 2.14.0 - - - com.fasterxml.jackson.core - jackson-annotations - 2.14.0 - - - com.fasterxml.jackson.core - jackson-databind - 2.14.0 - - - com.fasterxml.jackson.module - jackson-module-no-ctor-deser - 2.14.0 - - - org.apache.ivy - ivy - 2.5.2 - - - org.apache.httpcomponents - httpclient - 4.5.13 - - - info.picocli - picocli - 4.4.0 - - - org.slf4j - slf4j-api - 1.7.36 - - - org.yaml - snakeyaml - 1.32 - - - com.squareup.okhttp3 - okhttp - 3.9.0 - - - - - - - io.github.java-native - jssc - 2.9.4 - provided - - - - - - com.slack.api - bolt - 1.24.0 - provided - - - com.slack.api - bolt-socket-mode - 1.24.0 - provided - - - javax.websocket - javax.websocket-api - 1.1 - provided - - - org.glassfish.tyrus.bundles - tyrus-standalone-client - 1.19 - provided - - - - - - org.apache.lucene - lucene-core - 9.4.2 - provided - - - org.apache.solr - solr-core - 9.2.0 - provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + 2.14.0 + provided + + + + + org.apache.lucene + lucene-analysis-common + 9.4.2 + provided + + + org.apache.lucene + lucene-analysis-kuromoji + 9.4.2 + provided + + + + + + net.sf.py4j + py4j + 0.10.9.7 + provided + + + org.bytedeco + cpython-platform + 3.10.8-1.5.8 + provided + + + org.bytedeco + cpython + 3.10.8-1.5.8 + provided + + + + + + org.python + jython-standalone + 2.7.2 + + + + + + rome + rome + 1.0 + provided + + + + + + com.pi4j + pi4j-core + 1.4 + provided + + + com.pi4j + pi4j-native + 1.4 + provided + pom + + + + + + com.amazonaws + aws-java-sdk-rekognition + 1.11.263 + provided + + + + + + ch.qos.logback + logback-classic + 1.2.3 + + + net.bytebuddy + byte-buddy + 1.12.16 + + + com.fasterxml.jackson.core + jackson-core + 2.14.0 + + + com.fasterxml.jackson.core + jackson-annotations + 2.14.0 + + + com.fasterxml.jackson.core + jackson-databind + 2.14.0 + + + com.fasterxml.jackson.module + jackson-module-no-ctor-deser + 2.14.0 + + + org.apache.ivy + ivy + 2.5.2 + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + info.picocli + picocli + 4.4.0 + + + org.slf4j + slf4j-api + 1.7.36 + + + org.yaml + snakeyaml + 1.32 + + + com.squareup.okhttp3 + okhttp + 3.9.0 + + + + + + + io.github.java-native + jssc + 2.9.4 + provided + + + + + + com.slack.api + bolt + 1.24.0 + provided + + + com.slack.api + bolt-socket-mode + 1.24.0 + provided + + + javax.websocket + javax.websocket-api + 1.1 + provided + + + org.glassfish.tyrus.bundles + tyrus-standalone-client + 1.19 + provided + + + + + + org.apache.lucene + lucene-core + 9.4.2 + provided + + + org.apache.solr + solr-core + 9.2.0 + provided org.slf4j @@ -1463,12 +1470,12 @@ * - - - org.apache.solr - solr-test-framework - 9.2.0 - provided + + + org.apache.solr + solr-test-framework + 9.2.0 + provided org.slf4j @@ -1491,12 +1498,12 @@ * - - - org.apache.solr - solr-solrj - 9.2.0 - provided + + + org.apache.solr + solr-solrj + 9.2.0 + provided org.slf4j @@ -1519,210 +1526,198 @@ * - - - commons-io - commons-io - 2.7 - provided + + + commons-io + commons-io + 2.7 + provided org.apache.logging.log4j * - - - - - - - edu.cmu.sphinx - sphinx4-core - 5prealpha-SNAPSHOT - provided - - - edu.cmu.sphinx - sphinx4-data - 5prealpha-SNAPSHOT - provided - - - - - - org.tensorflow - tensorflow - 1.8.0 - provided - - - - - - org.bytedeco - tesseract - 5.0.1-1.5.7 - provided - - - org.bytedeco - tesseract-platform - 5.0.1-1.5.7 - provided - - - tesseract - tessdata - 0.0.2 - provided - zip - - - - - - junit - junit - 4.13.1 - provided - - - - - - topcodes - topcodes - 1.0.0 - provided - - - - - - org.twitter4j - twitter4j-core - 3.0.5 - provided - - - - - - io.vertx - vertx-core - 4.3.3 - provided + + + + + + + edu.cmu.sphinx + sphinx4-core + 5prealpha-SNAPSHOT + provided + + + edu.cmu.sphinx + sphinx4-data + 5prealpha-SNAPSHOT + provided + + + + + + org.tensorflow + tensorflow + 1.8.0 + provided + + + + + + org.bytedeco + tesseract + 5.0.1-1.5.7 + provided + + + org.bytedeco + tesseract-platform + 5.0.1-1.5.7 + provided + + + tesseract + tessdata + 0.0.2 + provided + zip + + + + + + junit + junit + 4.13.1 + provided + + + + + + topcodes + topcodes + 1.0.0 + provided + + + + + + org.twitter4j + twitter4j-core + 3.0.5 + provided + + + + + + io.vertx + vertx-core + 4.3.3 + provided io.netty * - - - io.vertx - vertx-web - 4.3.3 - provided + + + io.vertx + vertx-web + 4.3.3 + provided io.netty * - - - - - - - - com.voicerss - tts - 1.0 - provided - - - - - - org.jmdns - jmdns - 3.5.5 - - - org.atmosphere - nettosphere - 3.2.2 + + + + + + + + com.voicerss + tts + 1.0 + provided + + + + + + org.jmdns + jmdns + 3.5.5 + + + org.atmosphere + nettosphere + 3.2.2 io.netty * - - - javax.annotation - javax.annotation-api - 1.3.2 - - - io.netty - netty-all - 4.1.82.Final - - - - - - - - - au.edu.federation.caliko - caliko - 1.3.8 - - - - au.edu.federation.caliko.visualisation - caliko-visualisation - 1.3.8 - - - - - com.github.sarxos - webcam-capture-driver-v4l4j - 0.3.13-SNAPSHOT - provided - - - - - - - - - - - - - - wiiusej - wiiusej - wiiusej - provided - - - - - - org.wikidata.wdtk - wdtk-client - 0.8.0 - provided + + + javax.annotation + javax.annotation-api + 1.3.2 + + + io.netty + netty-all + 4.1.82.Final + + + + + + + + + + com.github.sarxos + webcam-capture-driver-v4l4j + 0.3.13-SNAPSHOT + provided + + + + + + + + + + + + + + wiiusej + wiiusej + wiiusej + provided + + + + + + org.wikidata.wdtk + wdtk-client + 0.8.0 + provided org.slf4j @@ -1733,72 +1728,61 @@ * - - - - - - - - - WolframAlpha - WolframAlpha - 1.1 - provided - - - - - - - - - - org.igniterealtime.smack - smack-java7 - 4.1.6 - provided - - - org.igniterealtime.smack - smack-tcp - 4.1.6 - provided - - - org.igniterealtime.smack - smack-im - 4.1.6 - provided - - - org.igniterealtime.smack - smack-extensions - 4.1.6 - provided - - - - - dev.onvoid.webrtc - webrtc-java - 0.7.0 - - - - - org.mockito - mockito-core - 3.12.4 - test - - - au.edu.federation.caliko.demo - caliko-demo - 1.3.8 - + + + + + + + + + WolframAlpha + WolframAlpha + 1.1 + provided + + + + + + + + + + org.igniterealtime.smack + smack-java7 + 4.1.6 + provided + + + org.igniterealtime.smack + smack-tcp + 4.1.6 + provided + + + org.igniterealtime.smack + smack-im + 4.1.6 + provided + + + org.igniterealtime.smack + smack-extensions + 4.1.6 + provided + + + + + + org.mockito + mockito-core + 3.12.4 + test + - + @@ -1838,116 +1822,116 @@ - - - - org.codehaus.mojo - properties-maven-plugin - 1.0.0 - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.1.0 - - - - - + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.1.0 + + + + + + org.apache.maven.plugins maven-enforcer-plugin - - no-duplicate-declared-dependencies - - enforce - - - - - - - + + no-duplicate-declared-dependencies + + enforce + + + + + + + - org.apache.maven.plugins - maven-shade-plugin - 3.1.0 - - - package - - shade - - - myrobotlab - - true - myrobotlab-full - false - + true + myrobotlab-full + false + - - - - org.myrobotlab.service.Runtime - ${version} - ${version} - - ${version} - ${maven.build.timestamp} - ${agent.name} - ${user.name} - + + + + org.myrobotlab.service.Runtime + ${project.version} + ${project.version} + + ${project.version} + ${maven.build.timestamp} + ${agent.name} + ${user.name} + - ${git.tags} - ${git.branch} - ${git.dirty} - ${git.remote.origin.url} - ${git.commit.id} - ${git.commit.id.abbrev} - ${git.commit.id.full} - ${git.commit.id.describe} - ${git.commit.id.describe-short} - ${git.commit.user.name} - ${git.commit.user.email} - - ${git.commit.time} - ${git.closest.tag.name} - ${git.closest.tag.commit.count} - ${git.build.user.name} - ${git.build.user.email} - ${git.build.time} - ${git.build.version} - - - - - - - *:* - - module-info.class - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - + ${git.commit.time} + ${git.closest.tag.name} + ${git.closest.tag.commit.count} + ${git.build.user.name} + ${git.build.user.email} + ${git.build.time} + ${git.build.version} + + + + + + + *:* + + module-info.class + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + org.apache.maven.plugins @@ -1966,10 +1950,10 @@ single - - + + - + true org.apache.maven.plugins @@ -1980,7 +1964,7 @@ 11 true true - -parameters + -parameters @@ -1991,101 +1975,104 @@ - pl.project13.maven - git-commit-id-plugin - 4.9.10 - - - initialize - get-the-git-infos - - revision - - - - - ${project.basedir}/.git - git - false - true - ${project.build.outputDirectory}/git.properties - - - false - false - -dirty - - - + pl.project13.maven + git-commit-id-plugin + 4.9.10 + + + initialize + get-the-git-infos + + revision + + + + + ${project.basedir}/.git + git + false + true + ${project.build.outputDirectory}/git.properties + + + false + false + -dirty + + + maven-surefire-plugin org.apache.maven.plugins 2.22.2 - -Djava.library.path=libraries/native -Djna.library.path=libraries/native + + ${argLine} -Djava.library.path=libraries/native + -Djna.library.path=libraries/native **/*Test.java **/integration/* + + **/OpenCV* - - + + - + org.apache.maven.plugins maven-clean-plugin 2.3 - - - - data/.myrobotlab - false + + + + data/.myrobotlab + false + + + libraries + + ** + + false - - libraries - - ** - - false - - - data - - ** - - - - resource - - ** - - - - src/main/resources/resource/framework - - **/serviceData.json - - false - - - + + data + + ** + + + + resource + + ** + + + + src/main/resources/resource/framework + + **/serviceData.json + + false + + + - - - + org.apache.maven.plugins @@ -2111,13 +2097,13 @@ 3.0.1 - + myrobotlab http://myrobotlab.org - github - https://github.com/MyRobotLab/myrobotlab/issues + github + https://github.com/MyRobotLab/myrobotlab/issues - + \ No newline at end of file diff --git a/src/main/resources/resource/framework/pom.xml.template b/src/main/resources/resource/framework/pom.xml.template index f0ae2b4183..71ecc4b938 100644 --- a/src/main/resources/resource/framework/pom.xml.template +++ b/src/main/resources/resource/framework/pom.xml.template @@ -83,7 +83,7 @@ ${maven.build.timestamp} yyyyMMddHHmm - ${version} + ${project.version} ${git.branch} ${NODE_NAME} ${NODE_LABELS} @@ -193,7 +193,7 @@ myrobotlab - + true myrobotlab-full false @@ -207,10 +207,10 @@ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> org.myrobotlab.service.Runtime - ${version} - ${version} + ${project.version} + ${project.version} - ${version} + ${project.version} ${maven.build.timestamp} ${agent.name} ${user.name} @@ -332,12 +332,15 @@ org.apache.maven.plugins 2.22.2 - -Djava.library.path=libraries/native -Djna.library.path=libraries/native + + ${argLine} -Djava.library.path=libraries/native -Djna.library.path=libraries/native **/*Test.java **/integration/* + + **/OpenCV* @@ -383,12 +386,10 @@ - -