merge: develop into fix/umas/cleanup

.dockerignore

@@ -19,9 +19,9 @@ Dockerfile
 .dockerignore
 .git/**
 **/target/**
-sandbox/plc4py/.eggs
-sandbox/plc4py/.pytest_cache
-sandbox/plc4py/build
-sandbox/plc4py/dist
-sandbox/plc4py/plc4py.egg-info
-sandbox/plc4py/venv
+plc4py/.eggs
+plc4py/.pytest_cache
+plc4py/build
+plc4py/dist
+plc4py/plc4py.egg-info
+plc4py/venv

.github/dependabot.yml

@@ -31,3 +31,7 @@ updates:
   directory: plc4go
   schedule:
     interval: daily
+- package-ecosystem: pip
+  directory: plc4py
+  schedule:
+    interval: daily

.github/workflows/java-platform.yml

@@ -156,5 +156,5 @@ jobs:
             **/surefire-reports/TEST-*.xml
             **/failsafe-reports/TEST-*.xml
 
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+#      - name: Perform CodeQL Analysis
+#        uses: github/codeql-action/analyze@v3

.github/workflows/python-platform.yml

@@ -24,13 +24,13 @@ on:
     paths:
       - code-generation/**
       - protocols/**
-      - sandbox/plc4py**
+      - plc4py**
   pull_request:
     branches: [ "develop", "plc4py" ]
     paths:
       - code-generation/**
       - protocols/**
-      - sandbox/plc4py**
+      - plc4py**
   workflow_dispatch:
     inputs:
       forceUpdates:
@@ -48,7 +48,7 @@ jobs:
   test:
     strategy:
       matrix:
-        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ]
+        python-version: ['3.8', '3.10', '3.12']
         os: [ ubuntu-latest, macos-latest, windows-latest ]
       fail-fast: false
     runs-on: ${{ matrix.os }}
@@ -136,9 +136,9 @@ jobs:
 #      - name: Lint with flake8
 #        run: |
 #          # stop the build if there are Python syntax errors or undefined names
-#          flake8 ./sandbox/plc4py --count --select=E9,F63,F7,F82 --show-source --statistics
+#          flake8 ./plc4py --count --select=E9,F63,F7,F82 --show-source --statistics
 #          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-#          flake8 ./sandbox/plc4py --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+#          flake8 ./plc4py --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
 
 #      - name: Initialize CodeQL
 #        uses: github/codeql-action/init@v2
@@ -147,7 +147,7 @@ jobs:
 
       - name: Run mvnw
         run: |
-          ./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} ${{ steps.extra_options.outputs.extra_options }} -B -P'with-sandbox,with-python,enable-all-checks,update-generated-code' -pl :plc4py -am ${{ steps.platform_opts.outputs.platform_opts }} install
+          ./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} ${{ steps.extra_options.outputs.extra_options }} -B -P'with-python,enable-all-checks,update-generated-code' -pl :plc4py -am ${{ steps.platform_opts.outputs.platform_opts }} install
 
 #      - name: Perform CodeQL Analysis
 #        uses: github/codeql-action/analyze@v2

.github/workflows/sast.yaml

@@ -31,6 +31,8 @@ jobs:
   build:
     name: Trivy Scan
     runs-on: ubuntu-latest
+    # Disabling this, as it keeps on randomly failing the build without providing any information helping to fix it.
+    if: false
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.gitignore

@@ -175,14 +175,10 @@ build-iPhoneSimulator/
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
 
-# When running the cpp module in clion, it adds another ".idea" directory.
-/sandbox/plc4cpp/.idea/
-
 # Exclude VSCode project settings.
 .vscode/
 
 # Temp stuff ...
-/sandbox/plc4go/temp/
 /plc4go/.idea/
 plc4j/examples/hello-storage-elasticsearch/.factorypath
 

.mvn/extensions.xml

@@ -24,6 +24,6 @@
   <extension>
     <groupId>com.gradle</groupId>
     <artifactId>common-custom-user-data-maven-extension</artifactId>
-    <version>1.12.5</version>
+    <version>2</version>
   </extension>
 </extensions>

.mvn/jvm.config

@@ -1 +1 @@
---add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+-XX:+EnableDynamicAgentLoading --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

.mvn/wrapper/maven-wrapper.properties

@@ -16,5 +16,5 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar