Skip to content
This repository was archived by the owner on Feb 15, 2024. It is now read-only.

Commit cbac705

Browse files
sebbadersebbader
authored
Merge branch 'main' into patch-1
2 parents 14ff039 + f32540b commit cbac705

200 files changed

Lines changed: 4995 additions & 7983 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
11
.idea/
22
log/
3+
*.log
4+
bin/
35
target/
6+
pom.xml.tag
7+
pom.xml.releaseBackup
8+
pom.xml.versionsBackup
9+
pom.xml.next
10+
release.properties
11+
dependency-reduced-pom.xml
12+
buildNumber.properties
13+
.mvn/timing.properties
14+
.mvn/wrapper/maven-wrapper.jar
15+
.metadata
16+
bin/
17+
tmp/
18+
*.tmp
19+
*.bak
20+
*.swp
21+
*~.nib
22+
local.properties
23+
.settings/
24+
.loadpath
25+
.recommenders
26+
*.iml
27+
28+
.classpath
29+
.project
30+
31+
**/.flattened-pom.xml
32+
**/nb-configuration.xml
33+
**.iml
34+
**.flattened-pom.xml
35+
**/nbactions.xml
36+
testJsonSerialization.json

‎LICENSE‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
1-
Copyright (c) 2021 Fraunhofer IOSB-INA Lemgo,
2-
eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
3-
zur Foerderung der angewandten Forschung e.V.
4-
5-
Copyright (c) 2021 Fraunhofer IOSB-ILT Karlsruhe,
6-
eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
7-
zur Foerderung der angewandten Forschung e.V.
8-
9-
Copyright (c) 2021 Fraunhofer IAIS,
10-
eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
11-
zur Foerderung der angewandten Forschung e.V.
12-
13-
Copyright (c) 2021 Fraunhofer IESE,
14-
eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
15-
zur Foerderung der angewandten Forschung e.V.
16-
17-
Copyright (c) 2021 Fraunhofer IWU Karlsruhe,
18-
eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
19-
zur Foerderung der angewandten Forschung e.V.
1+
Copyright (c) 2021 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e. V.
202

213
The Java Model contained in this repository provides representations of the
224
Asset Administration Shell data model as a Java library. It is licensed under

‎README.md‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,16 @@ or by integrating the library as a dependency:
2121
<version>latest-version</version>
2222
<dependency>
2323
```
24+
> **_NOTE:_** The library is yet not available as dependency but will be deployed via Maven Central in the future.
2425
2526
# Project Structure
2627

2728
The project contains several packages.
2829

29-
- io.adminshell.aas.v3.model: Location of the AAS classes as Java interfaces
30-
- io.adminshell.aas.v3.model.impl: Default implementations of the AAS classes. Can be replaced with custom implementations if needed.
31-
- io.adminshell.aas.v3.model.builder: Provided builder classes to create the instances of the AAS classes
32-
- io.adminshell.aas.v3.dataformat: Interfaces for the serialization formats, for instance JSON, XML, AASX etc. Own serializers can be developed by implementing these interfaces. See also the provided default [serializers](https://github.com/admin-shell-io/java-serializer).
30+
- `io.adminshell.aas.v3.model` Java interfaces & enums representing the AAS model
31+
- `io.adminshell.aas.v3.model.annotations` Annotations used on the model
32+
- `io.adminshell.aas.v3.model.builder` Abstract builder classes for the interfaces
33+
- `io.adminshell.aas.v3.model.impl` Default implementations of the AAS classes. Can be replaced with custom implementations if needed.
3334

3435
# How to Contribute
3536

@@ -40,14 +41,17 @@ We always look for contributions, bug reports, feature requests etc. Simply open
4041

4142
| Name | Affiliation | Github Account |
4243
|:--| -- | -- |
43-
| Sebastian Bader | Fraunhoder IAIS | [sebbader](https://github.com/sebbader) |
44-
| Matthias Böckmann | Fraunhoder IAIS | [maboeckmann](https://github.com/maboeckmann) |
45-
| Chang Qin | Fraunhoder IAIS | [changqin26](https://github.com/changqin26) |
46-
| Michael Jacoby | Fraunhoder IOSB | []() |
47-
| Maximilian Conradi | Fraunhoder IESE | []() |
48-
| Jan-Wilhelm Blume | Fraunhoder IOSB | []() |
49-
| Frank Schnicke | Fraunhoder IESE | []() |
50-
| Jens Müller | Fraunhoder IOSB | []() |
51-
| Daniel Espen | Fraunhoder IESE | []() |
52-
| Bastian Espen | Fraunhoder IOSB | []() |
53-
| Michael Jacoby | Fraunhoder IOSB | []() |
44+
| Sebastian Bader | Fraunhofer IAIS | [sebbader](https://github.com/sebbader) |
45+
| Matthias Böckmann | Fraunhofer IAIS | [maboeckmann](https://github.com/maboeckmann) |
46+
| Helge Dickel | SAP SE | [heldic](https://github.com/heldic) |
47+
| Daniel Espen | Fraunhofer IESE | [daespen](https://github.com/daespen) |
48+
| Michael Jacoby | Fraunhofer IOSB | [mjacoby](https://github.com/mjacoby) |
49+
| Jens Müller | Fraunhofer IOSB | [JensMueller2709](https://github.com/JensMueller2709) |
50+
| Orthodoxos Kipouridis | SAP SE | [akiskips](https://github.com/akiskips) |
51+
| Chang Qin | Fraunhofer IAIS | [changqin26](https://github.com/changqin26) |
52+
| Bastian Rössl | Fraunhofer IOSB-INA | [br-iosb](https://github.com/br-iosb) |
53+
| Manuel Sauer | SAP SE | [Manu3756](https://github.com/Manu3756) |
54+
| Frank Schnicke | Fraunhofer IESE | [frankschnicke](https://github.com/frankschnicke) |
55+
56+
This project was initiated by SAP and Fraunhofer to provide a foundation for the
57+
AAS development and to foster its dissemination.

‎license-header.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Copyright (c) 2021 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e. V.
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.

‎pom.xml‎

Lines changed: 83 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,95 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
76
<groupId>io.admin-shell.aas</groupId>
87
<artifactId>model</artifactId>
9-
<version>1.1.2</version>
10-
8+
<version>${revision}</version>
119
<properties>
10+
<revision>1.0.0</revision>
1211
<maven.compiler.source>1.8</maven.compiler.source>
1312
<maven.compiler.target>1.8</maven.compiler.target>
13+
<plugin.flatten.version>1.2.2</plugin.flatten.version>
14+
<plugin.javadoc.version>3.2.0</plugin.javadoc.version>
15+
<plugin.license.version>4.1</plugin.license.version>
16+
<plugin.projectinfo.version>3.1.2</plugin.projectinfo.version>
1417
</properties>
15-
1618
<dependencies>
17-
<dependency>
18-
<groupId>javax.validation</groupId>
19-
<artifactId>validation-api</artifactId>
20-
<version>2.0.1.Final</version>
21-
<scope>compile</scope>
22-
</dependency>
23-
<dependency>
24-
<groupId>com.fasterxml.jackson.core</groupId>
25-
<artifactId>jackson-annotations</artifactId>
26-
<version>2.11.2</version>
27-
<scope>compile</scope>
28-
</dependency>
19+
<dependency>
20+
<groupId>com.mycila</groupId>
21+
<artifactId>license-maven-plugin</artifactId>
22+
<version>${plugin.license.version}</version>
23+
</dependency>
2924
</dependencies>
30-
25+
<build>
26+
<plugins>
27+
<plugin>
28+
<groupId>org.apache.maven.plugins</groupId>
29+
<artifactId>maven-project-info-reports-plugin</artifactId>
30+
<version>${plugin.projectinfo.version}</version>
31+
</plugin>
32+
<plugin>
33+
<groupId>org.apache.maven.plugins</groupId>
34+
<artifactId>maven-javadoc-plugin</artifactId>
35+
<version>${plugin.javadoc.version}</version>
36+
<configuration>
37+
<source>8</source>
38+
<detectJavaApiLink>false</detectJavaApiLink>
39+
</configuration>
40+
<executions>
41+
<execution>
42+
<id>attach-javadocs</id>
43+
<goals>
44+
<goal>jar</goal>
45+
</goals>
46+
</execution>
47+
</executions>
48+
</plugin>
49+
<plugin>
50+
<groupId>org.codehaus.mojo</groupId>
51+
<artifactId>flatten-maven-plugin</artifactId>
52+
<version>${plugin.flatten.version}</version>
53+
<configuration>
54+
<updatePomFile>true</updatePomFile>
55+
</configuration>
56+
<executions>
57+
<execution>
58+
<id>flatten</id>
59+
<phase>process-resources</phase>
60+
<goals>
61+
<goal>flatten</goal>
62+
</goals>
63+
</execution>
64+
<execution>
65+
<id>flatten.clean</id>
66+
<phase>clean</phase>
67+
<goals>
68+
<goal>clean</goal>
69+
</goals>
70+
</execution>
71+
</executions>
72+
</plugin>
73+
<plugin>
74+
<groupId>com.mycila</groupId>
75+
<artifactId>license-maven-plugin</artifactId>
76+
<version>${plugin.license.version}</version>
77+
<configuration>
78+
<licenseSets>
79+
<licenseSet>
80+
<header>license-header.txt</header>
81+
<includes>
82+
<include>**/*.java</include>
83+
</includes>
84+
</licenseSet>
85+
</licenseSets>
86+
</configuration>
87+
<executions>
88+
<execution>
89+
<goals>
90+
<goal>check</goal>
91+
</goals>
92+
</execution>
93+
</executions>
94+
</plugin>
95+
</plugins>
96+
</build>
3197
</project>

‎src/main/java/io/adminshell/aas/v3/dataformat/DeserializationException.java‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)