From 0c9067d574afe96ab2c3c1d7858b86667f9e7580 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 17:16:25 +0200
Subject: [PATCH 1/6] build(deps): bump
 com.google.errorprone:error_prone_annotations (#1578)

Bumps [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) from 2.27.0 to 2.27.1.
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](https://github.com/google/error-prone/compare/v2.27.0...v2.27.1)

---
updated-dependencies:
- dependency-name: com.google.errorprone:error_prone_annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 71cb7d7cd59..dff630c5b69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -576,7 +576,7 @@
       <dependency>
         <groupId>com.google.errorprone</groupId>
         <artifactId>error_prone_annotations</artifactId>
-        <version>2.27.0</version>
+        <version>2.27.1</version>
       </dependency>
 
       <dependency>

From ad9183af6436e4169743f160e3fc91bc8439dfa9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 17:16:49 +0200
Subject: [PATCH 2/6] build(deps): bump com.google.j2objc:j2objc-annotations
 from 2.8 to 3.0.0 (#1560)

Bumps [com.google.j2objc:j2objc-annotations](https://github.com/google/j2objc) from 2.8 to 3.0.0.
- [Release notes](https://github.com/google/j2objc/releases)
- [Commits](https://github.com/google/j2objc/compare/2.8...3.0.0)

---
updated-dependencies:
- dependency-name: com.google.j2objc:j2objc-annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dff630c5b69..4e1d32d1aaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -594,7 +594,7 @@
       <dependency>
         <groupId>com.google.j2objc</groupId>
         <artifactId>j2objc-annotations</artifactId>
-        <version>2.8</version>
+        <version>3.0.0</version>
       </dependency>
 
       <dependency>

From 66a83885b722299f65d3ac8dbdbf3cc788f908bb Mon Sep 17 00:00:00 2001
From: Christofer Dutz <cdutz@apache.org>
Date: Fri, 3 May 2024 12:56:08 +0200
Subject: [PATCH 3/6] fix: Fixed the build AGAIN (The next one who blindly
 merges a dependabot pr to update it back to 32 gets no love from toddy for a
 year)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4e1d32d1aaf..7f25cd4fdd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
     <!-- When updating to 32 the site build starts failing -->
-    <version>32</version>
+    <version>31</version>
   </parent>
 
   <groupId>org.apache.plc4x</groupId>

From 2d02f19d2b7ff5e616cd38ce5f75270c10c87a0f Mon Sep 17 00:00:00 2001
From: Christofer Dutz <cdutz@apache.org>
Date: Fri, 3 May 2024 12:56:52 +0200
Subject: [PATCH 4/6] chore: removed an unneeded option

---
 plc4c/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plc4c/pom.xml b/plc4c/pom.xml
index f9057124a6b..4561e02f214 100644
--- a/plc4c/pom.xml
+++ b/plc4c/pom.xml
@@ -258,7 +258,6 @@
               <descriptors>
                 <descriptor>build-utils/source-bundle-descriptor.xml</descriptor>
               </descriptors>
-              <classifier>sources</classifier>
             </configuration>
           </execution>
         </executions>

From ee6f13b9f87a04d5fcb761d7b80d67745a779f9a Mon Sep 17 00:00:00 2001
From: Christofer Dutz <cdutz@apache.org>
Date: Sun, 5 May 2024 13:25:45 +0200
Subject: [PATCH 5/6] fix: fix some build issues on Ubuntu Linux VM

---
 plc4j/pom.xml   | 116 +++++++++++++++++++++++++++++-------------------
 plc4net/pom.xml |   2 +
 2 files changed, 72 insertions(+), 46 deletions(-)

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 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <!--
+            As dynamic agent loading has been deprecated and was starting
+            to cause issues in more recent JDK versions, we now fetch the
+            agent manually and pass it in to surefire.
+          -->
+          <execution>
+            <id>copy</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>net.bytebuddy</groupId>
+                  <artifactId>byte-buddy-agent</artifactId>
+                  <version>${byte-buddy.version}</version>
+                  <outputDirectory>${project.build.directory}</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <!--
+            Even if Maven transitively pulls in dependencies, relying on these can
+            quite often cause hard to find problems. So it's a good practice to make
+            sure everything directly required is also directly added as a dependency.
+            On the other side adding unused dependency only over-complicates the
+            the dependency graph, so the maven-dependency-plugin checks we depend on
+            what we need and only that and that runtime dependencies are correctly
+            imported with runtime scope.
+          -->
+          <execution>
+            <id>check-dependencies</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>analyze-only</goal>
+            </goals>
+            <configuration>
+              <failOnWarning>true</failOnWarning>
+              <ignoreNonCompile>true</ignoreNonCompile>
+              <ignoredDependencies>
+                <ignoredDependency>org.assertj:assertj-core</ignoredDependency>
+                <ignoredDependency>org.junit.jupiter:junit-jupiter</ignoredDependency>
+                <ignoredDependency>org.junit.jupiter:junit-jupiter-api</ignoredDependency>
+                <ignoredDependency>org.junit.jupiter:junit-jupiter-params</ignoredDependency>
+                <ignoredDependency>org.opentest4j:opentest4j</ignoredDependency>
+                <ignoredDependency>org.hamcrest:hamcrest</ignoredDependency>
+                <ignoredDependency>org.hamcrest:hamcrest-core</ignoredDependency>
+                <ignoredDependency>org.hamcrest:hamcrest-library</ignoredDependency>
+                <ignoredDependency>org.mockito:mockito-core</ignoredDependency>
+                <ignoredDependency>org.mockito:mockito-junit-jupiter</ignoredDependency>
+                <ignoredDependency>org.slf4j:slf4j-api</ignoredDependency>
+                <ignoredDependency>ch.qos.logback:logback-classic</ignoredDependency>
+                <ignoredDependency>org.apache.groovy:groovy-test-junit5</ignoredDependency>
+                <ignoredDependency>org.apache.groovy:groovy</ignoredDependency>
+                <ignoredDependency>com.athaydes:spock-reports</ignoredDependency>
+                <ignoredDependency>org.apache.nifi:nifi-standard-nar</ignoredDependency>
+              </ignoredDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
       <!-- Compile any groovy code located in "src/test/groovy" -->
       <plugin>
         <groupId>org.codehaus.gmavenplus</groupId>
@@ -198,8 +265,10 @@
           <!--
             We have to slightly increase the heap-size or some tests will fail.
             Notice the @ instead of the $ as prefix? That's late evaluation.
+            Also do we have to pass in the byte-buddy agent to work around issues
+            with dynamic loading of jvm agents.
           -->
-          <argLine>-Xmx512m @{surefireArgLine}</argLine>
+          <argLine>-javaagent:${project.basedir}/target/byte-buddy-agent-${byte-buddy.version}.jar -Xmx512m @{surefireArgLine}</argLine>
           <includes>
             <include>**/*Test.java</include>
             <include>**/*Tests.java</include>
@@ -274,51 +343,6 @@
           </archive>
         </configuration>
       </plugin>
-
-      <!--
-        Even if Maven transitively pulls in dependencies, relying on these can
-        quite often cause hard to find problems. So it's a good practice to make
-        sure everything directly required is also directly added as a dependency.
-        On the other side adding unused dependency only over-complicates the
-        the dependency graph, so the maven-dependency-plugin checks we depend on
-        what we need and only that and that runtime dependencies are correctly
-        imported with runtime scope.
-      -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>check-dependencies</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>analyze-only</goal>
-            </goals>
-            <configuration>
-              <failOnWarning>true</failOnWarning>
-              <ignoreNonCompile>true</ignoreNonCompile>
-              <ignoredDependencies>
-                <ignoredDependency>org.assertj:assertj-core</ignoredDependency>
-                <ignoredDependency>org.junit.jupiter:junit-jupiter</ignoredDependency>
-                <ignoredDependency>org.junit.jupiter:junit-jupiter-api</ignoredDependency>
-                <ignoredDependency>org.junit.jupiter:junit-jupiter-params</ignoredDependency>
-                <ignoredDependency>org.opentest4j:opentest4j</ignoredDependency>
-                <ignoredDependency>org.hamcrest:hamcrest</ignoredDependency>
-                <ignoredDependency>org.hamcrest:hamcrest-core</ignoredDependency>
-                <ignoredDependency>org.hamcrest:hamcrest-library</ignoredDependency>
-                <ignoredDependency>org.mockito:mockito-core</ignoredDependency>
-                <ignoredDependency>org.mockito:mockito-junit-jupiter</ignoredDependency>
-                <ignoredDependency>org.slf4j:slf4j-api</ignoredDependency>
-                <ignoredDependency>ch.qos.logback:logback-classic</ignoredDependency>
-                <ignoredDependency>org.apache.groovy:groovy-test-junit5</ignoredDependency>
-                <ignoredDependency>org.apache.groovy:groovy</ignoredDependency>
-                <ignoredDependency>com.athaydes:spock-reports</ignoredDependency>
-                <ignoredDependency>org.apache.nifi:nifi-standard-nar</ignoredDependency>                
-              </ignoredDependencies>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
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 @@
                   <outputDirectory>${project.basedir}/drivers/knxnetip-test/resources</outputDirectory>
                   <includes>**/*.xml</includes>
                   <excludes>META-INF/**,org/**</excludes>
+                  <overWrite>true</overWrite>
                 </artifactItem>
               </artifactItems>
+              <ignorePermissions>true</ignorePermissions>
             </configuration>
           </execution>
         </executions>

From b2cbfe04ca9b01ac6089ee5788a1bc8c961a7457 Mon Sep 17 00:00:00 2001
From: Christofer Dutz <cdutz@apache.org>
Date: Sun, 5 May 2024 18:40:04 +0200
Subject: [PATCH 6/6] fix: Get the PLC4C build working on windows aarch64
 (#1582)

---
 plc4c/pom.xml                            | 63 ++++++++++++++++++++++++
 pom.xml                                  |  4 +-
 src/main/script/prerequisiteCheck.groovy |  2 +-
 3 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/plc4c/pom.xml b/plc4c/pom.xml
index 4561e02f214..7508753af10 100644
--- a/plc4c/pom.xml
+++ b/plc4c/pom.xml
@@ -374,6 +374,69 @@
       </dependencies>
     </profile>
 
+    <!--
+      In order to build on windows with aarch64 systems, we need to re-deploy an
+      artifact which was unfortunately deployed with the wrong classifier.
+    -->
+    <profile>
+      <id>.os-windows-aarch64</id>
+      <activation>
+        <os>
+          <family>windows</family>
+          <arch>aarch64</arch>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>get-aarch64-windows-binaries</id>
+                <phase>validate</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <outputDirectory>${project.build.directory}/redeploy</outputDirectory>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>com.googlecode.cmake-maven-project</groupId>
+                      <artifactId>cmake-binaries</artifactId>
+                      <version>${cmake.version}</version>
+                      <classifier>windows-arm_64</classifier>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-install-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>install-aarch64-windows-binaries</id>
+                <phase>validate</phase>
+                <goals>
+                  <goal>install-file</goal>
+                </goals>
+                <configuration>
+                  <file>${project.build.directory}/redeploy/cmake-binaries-${cmake.version}-windows-arm_64.jar</file>
+                  <groupId>com.googlecode.cmake-maven-project</groupId>
+                  <artifactId>cmake-binaries</artifactId>
+                  <version>${cmake.version}</version>
+                  <classifier>windows-arm64</classifier>
+                  <packaging>jar</packaging>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <!-- When running on jenkins, download the sonar build-wrapper, so we can do a code analysis -->
     <profile>
       <id>jenkins-build</id>
diff --git a/pom.xml b/pom.xml
index 7f25cd4fdd1..0c89d03faf4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
     <bouncycastle.version>1.78.1</bouncycastle.version>
     <byte-buddy.version>1.14.14</byte-buddy.version>
     <!-- Be sure to keep this version set to the version of the cmake-maven-plugin -->
-    <cmake-version>3.27.2</cmake-version>
+    <cmake.version>3.27.7-b1</cmake.version>
     <commons-beanutils.version>1.9.4</commons-beanutils.version>
     <commons-cli.version>1.7.0</commons-cli.version>
     <commons-codec.version>1.17.0</commons-codec.version>
@@ -1326,7 +1326,7 @@
           <groupId>com.googlecode.cmake-maven-project</groupId>
           <artifactId>cmake-maven-plugin</artifactId>
           <!-- Not all versions have all types of binaries deployed -->
-          <version>3.27.7-b1</version>
+          <version>${cmake.version}</version>
         </plugin>
 
         <plugin>
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()