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

Commit 61194b4

Browse files
sebbadersebbader
committed
Moving the JSON Serialiser code into the Maven module dataformat-json
1 parent 608aef7 commit 61194b4

87 files changed

Lines changed: 5872 additions & 5823 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: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,3 @@ local.properties
2626

2727
.classpath
2828
.project
29-
30-
testJsonSerialization.json
31-

‎dataformat-json/.gitignore‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
.idea/
2+
log/
3+
*.log
4+
bin/
5+
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+
27+
.classpath
28+
.project
29+
30+
testJsonSerialization.json
31+

.mvn/extensions.xml renamed to dataformat-json/.mvn/extensions.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
2-
<extension>
3-
<groupId>com.github.gzm55.maven</groupId>
4-
<artifactId>project-settings-extension</artifactId>
5-
<version>0.1.1</version>
6-
</extension>
7-
</extensions>
1+
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
2+
<extension>
3+
<groupId>com.github.gzm55.maven</groupId>
4+
<artifactId>project-settings-extension</artifactId>
5+
<version>0.1.1</version>
6+
</extension>
7+
</extensions>

.mvn/settings.xml renamed to dataformat-json/.mvn/settings.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
<settings>
2-
<servers>
3-
<server>
4-
<id>snapshots</id>
5-
<username>ids</username>
6-
<password>indasp123!</password>
7-
</server>
8-
<server>
9-
<id>eis-snapshot-repo</id>
10-
<username>ids</username>
11-
<password>indasp123!</password>
12-
</server>
13-
</servers>
14-
</settings>
1+
<settings>
2+
<servers>
3+
<server>
4+
<id>snapshots</id>
5+
<username>ids</username>
6+
<password>indasp123!</password>
7+
</server>
8+
<server>
9+
<id>eis-snapshot-repo</id>
10+
<username>ids</username>
11+
<password>indasp123!</password>
12+
</server>
13+
</servers>
14+
</settings>

‎dataformat-json/pom.xml‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<groupId>io.adminshell.aas</groupId>
8+
<artifactId>dataformat-json</artifactId>
9+
<version>${parent.version}</version>
10+
<build>
11+
<plugins>
12+
<plugin>
13+
<groupId>org.apache.maven.plugins</groupId>
14+
<artifactId>maven-compiler-plugin</artifactId>
15+
<configuration>
16+
<source>11</source>
17+
<target>11</target>
18+
</configuration>
19+
</plugin>
20+
<plugin>
21+
<groupId>org.codehaus.mojo</groupId>
22+
<artifactId>flatten-maven-plugin</artifactId>
23+
<version>1.2.2</version>
24+
<configuration>
25+
<updatePomFile>true</updatePomFile>
26+
</configuration>
27+
<executions>
28+
<execution>
29+
<id>flatten</id>
30+
<phase>process-resources</phase>
31+
<goals>
32+
<goal>flatten</goal>
33+
</goals>
34+
</execution>
35+
<execution>
36+
<id>flatten.clean</id>
37+
<phase>clean</phase>
38+
<goals>
39+
<goal>clean</goal>
40+
</goals>
41+
</execution>
42+
</executions>
43+
</plugin>
44+
</plugins>
45+
</build>
46+
47+
<dependencies>
48+
<dependency>
49+
<groupId>io.adminshell.aas</groupId>
50+
<artifactId>model</artifactId>
51+
<version>${model.version}</version>
52+
<scope>compile</scope>
53+
</dependency>
54+
<dependency>
55+
<groupId>javax.validation</groupId>
56+
<artifactId>validation-api</artifactId>
57+
<version>2.0.1.Final</version>
58+
<scope>compile</scope>
59+
</dependency>
60+
<dependency>
61+
<groupId>com.fasterxml.jackson.core</groupId>
62+
<artifactId>jackson-annotations</artifactId>
63+
<version>2.12.1</version>
64+
<scope>compile</scope>
65+
</dependency>
66+
67+
<dependency>
68+
<groupId>junit</groupId>
69+
<artifactId>junit</artifactId>
70+
<version>4.13</version>
71+
<scope>test</scope>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.skyscreamer</groupId>
75+
<artifactId>jsonassert</artifactId>
76+
<version>1.5.0</version>
77+
<scope>test</scope>
78+
</dependency>
79+
<dependency>
80+
<groupId>com.fasterxml.jackson.core</groupId>
81+
<artifactId>jackson-databind</artifactId>
82+
<version>2.12.1</version>
83+
</dependency>
84+
85+
<dependency>
86+
<groupId>org.slf4j</groupId>
87+
<artifactId>slf4j-api</artifactId>
88+
<version>1.7.30</version>
89+
</dependency>
90+
<dependency>
91+
<groupId>org.slf4j</groupId>
92+
<artifactId>slf4j-simple</artifactId>
93+
<version>1.7.30</version>
94+
</dependency>
95+
96+
<dependency>
97+
<groupId>com.networknt</groupId>
98+
<artifactId>json-schema-validator</artifactId>
99+
<version>1.0.52</version>
100+
</dependency>
101+
102+
<dependency>
103+
<groupId>pl.pragmatists</groupId>
104+
<artifactId>JUnitParams</artifactId>
105+
<version>1.1.1</version>
106+
<scope>test</scope>
107+
</dependency>
108+
<dependency>
109+
<groupId>io.github.classgraph</groupId>
110+
<artifactId>classgraph</artifactId>
111+
<version>4.8.106</version>
112+
</dependency>
113+
<dependency>
114+
<groupId>org.hibernate.validator</groupId>
115+
<artifactId>hibernate-validator</artifactId>
116+
<version>7.0.1.Final</version>
117+
</dependency>
118+
119+
</dependencies>
120+
<repositories>
121+
<repository>
122+
<id>eis-public-repo</id>
123+
<name>maven-public</name>
124+
<url>http://maven.iais.fraunhofer.de/artifactory/eis-ids-public</url>
125+
</repository>
126+
</repositories>
127+
128+
</project>

src/main/java/io/adminshell/aas/v3/dataformat/json/DataSpecificationManager.java renamed to dataformat-json/src/main/java/io/adminshell/aas/v3/dataformat/json/DataSpecificationManager.java

File renamed without changes.

0 commit comments

Comments
 (0)