Merge branch 'feature/value-only-serialization' of https://github.com…

…/sap-contributions/aas4j into feature/value-only-serialization
eclipse-aas4j · Apr 22, 2024 · 64a75d7 · 64a75d7
2 parents d72908b + a604a29
commit 64a75d7
Show file tree

Hide file tree

Showing 264 changed files with 9,505 additions and 12,323 deletions.
diff --git a/.github/workflows/maven-deploy-to-maven-central.yml b/.github/workflows/maven-deploy-to-maven-central.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: 'adopt'

diff --git a/.github/workflows/maven-publish-snapshots.yml b/.github/workflows/maven-publish-snapshots.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '11'
         distribution: 'adopt'
@@ -30,49 +30,49 @@ jobs:
       run: mvn -B package --file pom.xml
 
     - name: Delete old dataformat-parent package
-      uses: actions/delete-package-versions@v4
+      uses: actions/delete-package-versions@v5
       continue-on-error: true
       with:
         package-name: 'io.admin-shell.aas.dataformat-parent'
 
     - name: Delete old dataformat-core package
-      uses: actions/delete-package-versions@v4
+      uses: actions/delete-package-versions@v5
       continue-on-error: true
       with:
         package-name: 'io.admin-shell.aas.dataformat-core'
 
     - name: Delete old dataformat-aasx package
-      uses: actions/delete-package-versions@v4
+      uses: actions/delete-package-versions@v5
       continue-on-error: true
       with:
         package-name: 'io.admin-shell.aas.dataformat-aasx'
 
     - name: Delete old dataformat-xml package
-      uses: actions/delete-package-versions@v4
+      uses: actions/delete-package-versions@v5
       continue-on-error: true
       with:
         package-name: 'io.admin-shell.aas.dataformat-xml'
 
     - name: Delete old dataformat-aml package
-      uses: actions/delete-package-versions@v4
+      uses: actions/delete-package-versions@v5
       continue-on-error: true
       with:
         package-name: 'io.admin-shell.aas.dataformat-aml'
 
     - name: Delete old dataformat-rdf package
-      uses: actions/delete-package-versions@v4
+      uses: actions/delete-package-versions@v5
       continue-on-error: true
       with:
         package-name: 'io.admin-shell.aas.dataformat-rdf'
 
     - name: Delete old dataformat-json package
-      uses: actions/delete-package-versions@v4
+      uses: actions/delete-package-versions@v5
       continue-on-error: true
       with:
         package-name: 'io.admin-shell.aas.dataformat-json'
 
     - name: Delete old validator package
-      uses: actions/delete-package-versions@v4
+      uses: actions/delete-package-versions@v5
       continue-on-error: true
       with:
         package-name: 'io.admin-shell.aas.validator'

diff --git a/.github/workflows/maven-run-tests.yml b/.github/workflows/maven-run-tests.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '11'
         distribution: 'adopt'

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # Eclipse AAS4J
 
-> :newspaper: The _`Eclipse AAS4J 1.0.0-milestone-03`_ release is available on Maven Central Repository and includes the 
-> following artifacts implementing the _AAS Specs – Part 1 V3.0 (final)_: `dataformat-core`, `dataformat-aasx`, 
-> `dataformat-xml`, `dataformat-json`, `dataformat-parent`, and `model`.
+> :newspaper: The _`Eclipse AAS4J 1.0.2`_ release is available on [Maven Central Repository](https://oss.sonatype.org/#nexus-search;quick~org.eclipse.digitaltwin.aas4j) and includes the 
+> following artifacts implementing the _AAS Specs – Part 1 V3.0 (final)_: `aas4j-dataformat-core`, `aas4j-dataformat-aasx`, 
+> `aas4j-dataformat-xml`, `aas4j-dataformat-json`, `aas4j-dataformat-parent`, and `aas4j-model`.
 
 [Eclipse AAS4J](https://projects.eclipse.org/projects/dt.aas4j) implements the specification of the Asset Administration 
 Shell (AAS) such as metamodels, submodels, serialization and deserialization modules, validators, and transformation 
@@ -37,8 +37,6 @@ Please refer to [AAS Model README](model/README.md) for more information.
 
 ## Build and Use
 
-Some examples can be found on the [documentation webpage](https://admin-shell-io.github.io/java-serializer/).
-
 You can build the project using Maven by simply executing at the repository
 root:
 
@@ -50,9 +48,9 @@ or by integrating the respective modules as dependencies from [Maven Central](ht
 ```
 <dependency>
   <groupId>org.eclipse.digitaltwin.aas4j</groupId>
-  <artifactId>dataformat-json</artifactId>
-  <version>latest-version</version>
-<dependency>
+  <artifactId>aas4j-model</artifactId>
+  <version>1.0.2</version>
+</dependency>
 ```
 
 ## AAS4J Project Structure

diff --git a/dataformat-aasx/pom.xml b/dataformat-aasx/pom.xml
@@ -5,20 +5,24 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.eclipse.digitaltwin.aas4j</groupId>
-        <artifactId>dataformat-parent</artifactId>
+        <artifactId>aas4j-dataformat-parent</artifactId>
         <version>${revision}</version>
     </parent>
-    <artifactId>dataformat-aasx</artifactId>
+    <artifactId>aas4j-dataformat-aasx</artifactId>
     <name>Asset Administration Shell AASX-Serializer</name>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>dataformat-xml</artifactId>
+            <artifactId>aas4j-dataformat-xml</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>dataformat-core</artifactId>
+            <artifactId>aas4j-dataformat-json</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aas4j-dataformat-core</artifactId>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
@@ -36,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>model</artifactId>
+            <artifactId>aas4j-model</artifactId>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -45,7 +49,12 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>dataformat-core</artifactId>
+            <artifactId>aas4j-dataformat-core</artifactId>
         </dependency>
+         <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <scope>test</scope>
+            </dependency>
     </dependencies>
 </project>