diff --git a/plc4c/pom.xml b/plc4c/pom.xml index f9057124a6b..7508753af10 100644 --- a/plc4c/pom.xml +++ b/plc4c/pom.xml @@ -258,7 +258,6 @@ build-utils/source-bundle-descriptor.xml - sources @@ -375,6 +374,69 @@ + + + .os-windows-aarch64 + + + windows + aarch64 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + get-aarch64-windows-binaries + validate + + copy + + + ${project.build.directory}/redeploy + + + com.googlecode.cmake-maven-project + cmake-binaries + ${cmake.version} + windows-arm_64 + + + + + + + + org.apache.maven.plugins + maven-install-plugin + + + install-aarch64-windows-binaries + validate + + install-file + + + ${project.build.directory}/redeploy/cmake-binaries-${cmake.version}-windows-arm_64.jar + com.googlecode.cmake-maven-project + cmake-binaries + ${cmake.version} + windows-arm64 + jar + + + + + + + + jenkins-build diff --git a/plc4j/pom.xml b/plc4j/pom.xml index 45bf69938d2..c38830e987b 100644 --- a/plc4j/pom.xml +++ b/plc4j/pom.xml @@ -49,6 +49,73 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + + copy + process-resources + + copy + + + + + net.bytebuddy + byte-buddy-agent + ${byte-buddy.version} + ${project.build.directory} + + + + + + + check-dependencies + verify + + analyze-only + + + true + true + + org.assertj:assertj-core + org.junit.jupiter:junit-jupiter + org.junit.jupiter:junit-jupiter-api + org.junit.jupiter:junit-jupiter-params + org.opentest4j:opentest4j + org.hamcrest:hamcrest + org.hamcrest:hamcrest-core + org.hamcrest:hamcrest-library + org.mockito:mockito-core + org.mockito:mockito-junit-jupiter + org.slf4j:slf4j-api + ch.qos.logback:logback-classic + org.apache.groovy:groovy-test-junit5 + org.apache.groovy:groovy + com.athaydes:spock-reports + org.apache.nifi:nifi-standard-nar + + + + + + org.codehaus.gmavenplus @@ -198,8 +265,10 @@ - -Xmx512m @{surefireArgLine} + -javaagent:${project.basedir}/target/byte-buddy-agent-${byte-buddy.version}.jar -Xmx512m @{surefireArgLine} **/*Test.java **/*Tests.java @@ -274,51 +343,6 @@ - - - - org.apache.maven.plugins - maven-dependency-plugin - - - check-dependencies - verify - - analyze-only - - - true - true - - org.assertj:assertj-core - org.junit.jupiter:junit-jupiter - org.junit.jupiter:junit-jupiter-api - org.junit.jupiter:junit-jupiter-params - org.opentest4j:opentest4j - org.hamcrest:hamcrest - org.hamcrest:hamcrest-core - org.hamcrest:hamcrest-library - org.mockito:mockito-core - org.mockito:mockito-junit-jupiter - org.slf4j:slf4j-api - ch.qos.logback:logback-classic - org.apache.groovy:groovy-test-junit5 - org.apache.groovy:groovy - com.athaydes:spock-reports - org.apache.nifi:nifi-standard-nar - - - - - diff --git a/plc4net/pom.xml b/plc4net/pom.xml index bc768609de1..c4ab8449329 100644 --- a/plc4net/pom.xml +++ b/plc4net/pom.xml @@ -65,8 +65,10 @@ ${project.basedir}/drivers/knxnetip-test/resources **/*.xml META-INF/**,org/** + true + true diff --git a/pom.xml b/pom.xml index 71cb7d7cd59..0c89d03faf4 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache apache - 32 + 31 org.apache.plc4x @@ -111,7 +111,7 @@ 1.78.1 1.14.14 - 3.27.2 + 3.27.7-b1 1.9.4 1.7.0 1.17.0 @@ -576,7 +576,7 @@ com.google.errorprone error_prone_annotations - 2.27.0 + 2.27.1 @@ -594,7 +594,7 @@ com.google.j2objc j2objc-annotations - 2.8 + 3.0.0 @@ -1326,7 +1326,7 @@ com.googlecode.cmake-maven-project cmake-maven-plugin - 3.27.7-b1 + ${cmake.version} diff --git a/src/main/script/prerequisiteCheck.groovy b/src/main/script/prerequisiteCheck.groovy index 7f19e3f69b0..ef81acfa12b 100644 --- a/src/main/script/prerequisiteCheck.groovy +++ b/src/main/script/prerequisiteCheck.groovy @@ -203,7 +203,7 @@ def checkGit() { // that's why this is the baseline for python. def checkPython() { def python = project.properties['python.exe.bin'] - println "Using python executable: " + python + " OK" + println "Using python executable: " + python + " OK" print "Detecting Python version: " try { def process = (python + " --version").execute()