Upmerge original repo

.gitattributes

@@ -1 +1 @@
-* text=auto
+* text=lf

.github/workflows/central-release.yml

@@ -0,0 +1,34 @@
+name: Publish Release to Maven Central
+
+on:
+  release:
+    types: [published] 
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v5
+
+      - name: Set up Java and Maven Central credentials
+        uses: actions/setup-java@v5
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          server-id: central
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+          gpg-private-key: ${{ secrets.ORG_GPG_PRIVATE_KEY }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
+      - name: Set project version from tag
+        run: mvn --batch-mode versions:set -DnewVersion=${{ github.event.release.tag_name }} -DgenerateBackupPoms=false
+
+      - name: Publish to Central
+        run: mvn --batch-mode deploy -DskipTests -PMavenCentral
+        env:
+          MAVEN_USERNAME: ${{ secrets.CENTRAL_SONATYPE_TOKEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.CENTRAL_SONATYPE_TOKEN_PASSWORD }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.ORG_GPG_PASSPHRASE }}

.github/workflows/central-snapshot.yml

@@ -0,0 +1,46 @@
+name: Publish Snapshot package to the Maven Central Repository
+
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/CODE_OF_CONDUCT.md'
+      - '.github/CODING_CONVENTIONS.md'
+      - '.github/CONTRIBUTING.md'
+      - '.github/dependabot.yml'
+      - '.github/pull_request_template.md'
+      - '.github/SECURITY.md'
+      - 'docs/**'
+      - 'examples/**'
+      - 'README.md'
+      - '.gitattributes'
+      - '.gitignore'
+      - 'LICENSE'
+      - 'NOTICE'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Set up Maven Central Repository
+        uses: actions/setup-java@v5
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          server-id: central
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+          gpg-private-key: ${{ secrets.ORG_GPG_PRIVATE_KEY }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
+      - name: Publish package
+        run: mvn --batch-mode deploy -DskipTests -PMavenCentral
+        env:
+          MAVEN_USERNAME: ${{ secrets.CENTRAL_SONATYPE_TOKEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.CENTRAL_SONATYPE_TOKEN_PASSWORD }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.ORG_GPG_PASSPHRASE }}

.github/workflows/dash-license.yml

@@ -0,0 +1,23 @@
+name: Dash License Check
+
+on:
+  pull_request:
+    paths:
+      - '**/pom.xml'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Build with Maven
+        run: mvn org.eclipse.dash:license-tool-plugin:license-check -PDashLicense

.github/workflows/docker-milestone-release.yml

@@ -19,6 +19,8 @@ jobs:
           path: basyx.aasrepository/basyx.aasrepository.component
         - name: submodel-repository
           path: basyx.submodelrepository/basyx.submodelrepository.component
+        - name: submodel-service
+          path: basyx.submodelservice/basyx.submodelservice.component
         - name: conceptdescription-repository
           path: basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component
         - name: aas-discovery
@@ -44,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -61,64 +63,75 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'temurin'
           cache: maven
 
-      - name: Build all modules first
-        run: mvn clean install -DskipTests
-
-      - name: Extract Release Tag
-        id: extract_tag
+      # Set the project version from the release tag
+      - name: Set project version from tag
         run: |
-          # Extract the release tag from the GitHub context
-          TAG_NAME=${GITHUB_REF#refs/tags/}
-          echo "TAG_NAME=${TAG_NAME}" >> $GITHUB_ENV
+          echo "Setting project version from release tag: ${{ github.event.release.tag_name }}"
+          mvn --batch-mode versions:set -DnewVersion=${{ github.event.release.tag_name }} -DgenerateBackupPoms=false
 
-      # Build the project
-      # For registry modules, we activate the dockerbuild profile and specify the module with --pl
-      - name: Build BaSyx
-        run: |
-          if [[ "${{ matrix.name }}" == *"registry"* ]]; then
-            # Derive the module's artifactId from the path
-            module_root=$(dirname "$(dirname "$(dirname "${{ matrix.path }}")")")
-            artifact_id=$(basename "$module_root")
-            # Run with dockerbuild profile and namespace
-            mvn clean install -DskipTests -Pdockerbuild "-Ddocker.namespace=${{ env.DOCKER_NAMESPACE }}" --pl "org.eclipse.digitaltwin.basyx:${artifact_id}"
-          else
-            echo "Non-registry module - already built in the previous step."
-          fi
+      - name: Build all modules first
+        run: mvn clean install -DskipTests
 
-      - name: Prepare Registry JAR for Docker
+      # Process registry modules
+      - name: Process Registry Module
+        id: registry_module
         if: contains(matrix.name, 'registry')
         run: |
-          # Go three levels up from src/main/docker to get the module root
-          module_root=$(dirname "$(dirname "$(dirname "${{ matrix.path }}")")")
-
-          # Adjust the path to where the dockerbuild profile places the JAR
-          JAR_FILE=$(ls "$module_root/target/docker/${{ env.DOCKER_NAMESPACE }}/${{ matrix.name }}/${{ env.TAG_NAME }}/build/maven/"*.jar | head -n 1)
+          # Get the module path without /src/main/docker
+          MODULE_PATH=$(echo ${{ matrix.path }} | sed 's|/src/main/docker||')
+          echo "Building registry module at: ${MODULE_PATH}"
+
+          # Build with dockerbuild profile
+          mvn clean package -DskipTests -Pdockerbuild "-Ddocker.namespace=${{ env.DOCKER_NAMESPACE }}" "-Ddocker.image.tag=${{ github.event.release.tag_name }}" -f ${MODULE_PATH}/pom.xml
+
+          # Create maven directory for Docker
+          mkdir -p "${{ matrix.path }}/maven"
+
+          # Find the JAR file using multiple search patterns
+          echo "Looking for JAR files in standard target directory..."
+          JAR_FILE=$(find "${MODULE_PATH}/target" -name "*.jar" -not -name "*sources*" -not -name "*javadoc*" -not -name "*-tests.jar" | head -n 1)
+
           if [ -z "$JAR_FILE" ]; then
-            echo "No repackaged JAR found in $module_root/target/docker/${{ env.DOCKER_NAMESPACE }}/${{ matrix.name }}/${{ env.TAG_NAME }}/build/maven. Check your build."
+            echo "Not found in standard location, trying docker build location..."
+            JAR_FILE=$(find "${MODULE_PATH}" -path "*/docker/*/${{ env.DOCKER_NAMESPACE }}/*/${{ github.event.release.tag_name }}/build/maven/*[!tests].jar" | head -n 1)
+          fi
+
+          # If still not found, try a more aggressive search
+          if [ -z "$JAR_FILE" ]; then
+            echo "Still not found, trying broader search..."
+            JAR_FILE=$(find "${MODULE_PATH}" -name "*.jar" -not -name "*sources*" -not -name "*javadoc*" -not -name "*-tests.jar" | head -n 1)
+          fi
+
+          if [ -z "$JAR_FILE" ]; then
+            echo "No JAR file found! Listing directory structure:"
+            find "${MODULE_PATH}" -type d | sort
+            echo "Listing all JAR files:"
+            find "${MODULE_PATH}" -name "*.jar" | sort
             exit 1
           fi
-
-          # Create the maven directory inside the Docker context and copy the JAR there
-          mkdir -p "${{ matrix.path }}/maven"
-          cp "$JAR_FILE" "${{ matrix.path }}/maven/"
-
-          # Extract the final name without .jar extension
-          FINAL_NAME=$(basename "$JAR_FILE" .jar)
-          echo "FINAL_ARGS=FINAL_NAME=${FINAL_NAME}" >> $GITHUB_ENV
-
-      - name: No-Op for Non-Registry Modules
+
+          echo "Found JAR: ${JAR_FILE}"
+          cp "${JAR_FILE}" "${{ matrix.path }}/maven/"
+
+          # Save the JAR name for Docker
+          JAR_BASENAME=$(basename "${JAR_FILE}" .jar)
+          echo "FINAL_NAME=${JAR_BASENAME}" >> $GITHUB_ENV
+
+      # Process non-registry modules
+      - name: Process Non-Registry Module
+        id: non_registry_module
         if: "!contains(matrix.name, 'registry')"
-        run: echo "FINAL_ARGS=" >> $GITHUB_ENV
-
-      - name: Set short SHA
-        run: echo "SHORT_SHA=${GITHUB_SHA:0:7}" >> $GITHUB_ENV
+        run: |
+          echo "Processing non-registry module"
+          echo "FINAL_NAME=" >> $GITHUB_ENV
 
+      # Build and push Docker image
       - name: Build and Push Docker Image
         uses: docker/build-push-action@v6
         with:
@@ -127,9 +140,11 @@ jobs:
           push: true
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           tags: |
-            ${{ env.DOCKER_NAMESPACE }}/${{ matrix.name }}:${{ env.TAG_NAME }}
-          build-args: ${{ env.FINAL_ARGS }}
+            ${{ env.DOCKER_NAMESPACE }}/${{ matrix.name }}:${{ github.event.release.tag_name }}
+          build-args: |
+            FINAL_NAME=${{ env.FINAL_NAME }}
 
       - name: Verify Docker Image
         run: |
-          docker pull ${{ env.DOCKER_NAMESPACE }}/${{ matrix.name }}:${{ env.TAG_NAME }}
+          echo "Verifying Docker image: ${{ env.DOCKER_NAMESPACE }}/${{ matrix.name }}:${{ github.event.release.tag_name }}"
+          docker pull ${{ env.DOCKER_NAMESPACE }}/${{ matrix.name }}:${{ github.event.release.tag_name }}

.github/workflows/docker-snapshot-release.yml

@@ -35,6 +35,8 @@ jobs:
           path: basyx.aasrepository/basyx.aasrepository.component
         - name: submodel-repository
           path: basyx.submodelrepository/basyx.submodelrepository.component
+        - name: submodel-service
+          path: basyx.submodelservice/basyx.submodelservice.component
         - name: conceptdescription-repository
           path: basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component
         - name: aas-discovery
@@ -60,7 +62,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -77,7 +79,7 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'temurin'
@@ -119,11 +121,11 @@ jobs:
 
           # Extract the final name without .jar extension
           FINAL_NAME=$(basename "$JAR_FILE" .jar)
-          echo "FINAL_ARGS=FINAL_NAME=${FINAL_NAME}" >> $GITHUB_ENV
+          echo "FINAL_NAME=${FINAL_NAME}" >> $GITHUB_ENV
 
       - name: No-Op for Non-Registry Modules
         if: "!contains(matrix.name, 'registry')"
-        run: echo "FINAL_ARGS=" >> $GITHUB_ENV
+        run: echo echo "FINAL_NAME=" >> $GITHUB_ENV
 
       - name: Set short SHA
         run: echo "SHORT_SHA=${GITHUB_SHA:0:7}" >> $GITHUB_ENV
@@ -138,7 +140,7 @@ jobs:
           tags: |
             ${{ env.DOCKER_NAMESPACE }}/${{ matrix.name }}:2.0.0-SNAPSHOT
             ${{ env.DOCKER_NAMESPACE }}/${{ matrix.name }}:2.0.0-SNAPSHOT-${{ env.SHORT_SHA }}
-          build-args: ${{ env.FINAL_ARGS }}
+          build-args: FINAL_NAME=${{ env.FINAL_NAME }}
 
       - name: Verify Docker Image
         run: |