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

Commit d7c69a7

Browse files
FrankSchnickeFrankSchnicke
authored
Merge branch 'main' into fix/test-core-full-example
2 parents 92defb8 + a157dab commit d7c69a7

File tree

10 files changed

+179
-357
lines changed

10 files changed

+179
-357
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ We always look for contributions, bug reports, feature requests etc. Simply open
5858
| Jens Müller | Fraunhofer IOSB | [JensMueller2709](https://github.com/JensMueller2709) | | | | x | | | | | x |
5959
| Orthodoxos Kipouridis | SAP SE | [akiskips](https://github.com/akiskips) | x | | | x | x | | | | |
6060
| Bastian Rössl | Fraunhofer IOSB-INA | [br-iosb](https://github.com/br-iosb) | | | | x | | | x | | |
61-
| Frank Schnicke | Fraunhofer IESE | [frankschnicke](https://github.com/frankschnicke) | | | x | | x | | | | |
61+
| Frank Schnicke | Fraunhofer IESE | [frankschnicke](https://github.com/frankschnicke) | | | x | | x | | | x | |
6262
| Manuel Sauer | SAP SE | [Manu3756](https://github.com/Manu3756) | x | | | | | | | | |
6363
| Arno Weiss | Fraunhofer IWU | [alw-iwu](https://github.com/alw-iwu) | | | | x | | | x | | |
6464
| Jan Blume | Fraunhofer IOSB | []() | | | | | | | | | x |

‎dataformat-aasx/pom.xml

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
</parent>
1111
<artifactId>dataformat-aasx</artifactId>
1212
<name>Asset Administration Shell AASX-Serializer</name>
13+
1314
<dependencies>
1415
<dependency>
1516
<groupId>io.admin-shell.aas</groupId>
1617
<artifactId>dataformat-xml</artifactId>
1718
<version>${revision}</version>
18-
<scope>compile</scope>
1919
</dependency>
2020
<dependency>
2121
<groupId>io.admin-shell.aas</groupId>
@@ -24,51 +24,21 @@
2424
<classifier>tests</classifier>
2525
<scope>test</scope>
2626
</dependency>
27-
<dependency>
28-
<groupId>io.admin-shell.aas</groupId>
29-
<artifactId>model</artifactId>
30-
<version>${revision}</version>
31-
<scope>compile</scope>
32-
</dependency>
3327
<dependency>
3428
<groupId>org.apache.poi</groupId>
3529
<artifactId>poi-ooxml</artifactId>
3630
<version>${poi.version}</version>
3731
</dependency>
38-
<dependency>
39-
<groupId>org.slf4j</groupId>
40-
<artifactId>slf4j-api</artifactId>
41-
<version>${slf4j.version}</version>
42-
</dependency>
43-
<dependency>
44-
<groupId>junit</groupId>
45-
<artifactId>junit</artifactId>
46-
<version>${junit.version}</version>
47-
<scope>test</scope>
48-
</dependency>
4932
<dependency>
5033
<groupId>pl.pragmatists</groupId>
5134
<artifactId>JUnitParams</artifactId>
5235
<version>${junit-params.version}</version>
5336
<scope>test</scope>
54-
</dependency>
37+
</dependency>
5538
<dependency>
5639
<groupId>commons-io</groupId>
5740
<artifactId>commons-io</artifactId>
5841
<version>${commons-io.version}</version>
5942
</dependency>
6043
</dependencies>
61-
<build>
62-
<plugins>
63-
<plugin>
64-
<groupId>org.apache.maven.plugins</groupId>
65-
<artifactId>maven-compiler-plugin</artifactId>
66-
<version>3.8.1</version>
67-
<configuration>
68-
<source>11</source>
69-
<target>11</target>
70-
</configuration>
71-
</plugin>
72-
</plugins>
73-
</build>
7444
</project>

‎dataformat-aml/pom.xml

Lines changed: 14 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,20 @@
1010
</parent>
1111
<artifactId>dataformat-aml</artifactId>
1212
<name>Asset Administration Shell AutomationML-Serializer</name>
13+
1314
<dependencies>
1415
<dependency>
1516
<groupId>io.admin-shell.aas</groupId>
16-
<artifactId>model</artifactId>
17+
<artifactId>dataformat-core</artifactId>
1718
<version>${revision}</version>
18-
<scope>compile</scope>
1919
</dependency>
2020
<dependency>
21-
<groupId>io.admin-shell.aas</groupId>
22-
<artifactId>dataformat-core</artifactId>
23-
<version>${revision}</version>
24-
<scope>compile</scope>
21+
<groupId>io.admin-shell.aas</groupId>
22+
<artifactId>dataformat-core</artifactId>
23+
<version>${revision}</version>
24+
<classifier>tests</classifier>
25+
<scope>test</scope>
2526
</dependency>
26-
<dependency>
27-
<groupId>io.admin-shell.aas</groupId>
28-
<artifactId>dataformat-core</artifactId>
29-
<version>${revision}</version>
30-
<classifier>tests</classifier>
31-
<scope>test</scope>
32-
</dependency>
3327
<dependency>
3428
<groupId>org.slf4j</groupId>
3529
<artifactId>slf4j-api</artifactId>
@@ -43,25 +37,19 @@
4337
<dependency>
4438
<groupId>xerces</groupId>
4539
<artifactId>xercesImpl</artifactId>
46-
<version>2.12.1</version>
40+
<version>${xerces.version}</version>
4741
<exclusions>
48-
<exclusion>
49-
<artifactId>xml-apis</artifactId>
50-
<groupId>xml-apis</groupId>
51-
</exclusion>
52-
</exclusions>
42+
<exclusion>
43+
<artifactId>xml-apis</artifactId>
44+
<groupId>xml-apis</groupId>
45+
</exclusion>
46+
</exclusions>
5347
</dependency>
5448
<dependency>
5549
<groupId>org.eclipse.persistence</groupId>
5650
<artifactId>org.eclipse.persistence.moxy</artifactId>
5751
<version>${moxy.version}</version>
5852
</dependency>
59-
<dependency>
60-
<groupId>junit</groupId>
61-
<artifactId>junit</artifactId>
62-
<version>${junit.version}</version>
63-
<scope>test</scope>
64-
</dependency>
6553
<dependency>
6654
<groupId>net.codesup.util</groupId>
6755
<artifactId>jaxb2-rich-contract-plugin</artifactId>
@@ -82,35 +70,11 @@
8270
<dependency>
8371
<groupId>com.google.inject</groupId>
8472
<artifactId>guice</artifactId>
85-
<version>5.0.1</version>
73+
<version>${guice.version}</version>
8674
</dependency>
8775
</dependencies>
8876
<build>
8977
<plugins>
90-
<plugin>
91-
<groupId>org.codehaus.mojo</groupId>
92-
<artifactId>flatten-maven-plugin</artifactId>
93-
<version>${plugin.flatten.version}</version>
94-
<configuration>
95-
<updatePomFile>true</updatePomFile>
96-
</configuration>
97-
<executions>
98-
<execution>
99-
<id>flatten</id>
100-
<phase>process-resources</phase>
101-
<goals>
102-
<goal>flatten</goal>
103-
</goals>
104-
</execution>
105-
<execution>
106-
<id>flatten.clean</id>
107-
<phase>clean</phase>
108-
<goals>
109-
<goal>clean</goal>
110-
</goals>
111-
</execution>
112-
</executions>
113-
</plugin>
11478
<plugin>
11579
<groupId>org.apache.cxf</groupId>
11680
<artifactId>cxf-xjc-plugin</artifactId>

‎dataformat-core/pom.xml

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,17 @@
1616
<groupId>io.admin-shell.aas</groupId>
1717
<artifactId>model</artifactId>
1818
<version>${model.version}</version>
19-
<scope>compile</scope>
2019
</dependency>
2120
<dependency>
2221
<groupId>com.fasterxml.jackson.core</groupId>
2322
<artifactId>jackson-annotations</artifactId>
2423
<version>${jackson.version}</version>
25-
<scope>compile</scope>
2624
</dependency>
2725
<dependency>
2826
<groupId>com.fasterxml.jackson.core</groupId>
2927
<artifactId>jackson-databind</artifactId>
3028
<version>${jackson.version}</version>
3129
</dependency>
32-
<dependency>
33-
<groupId>org.slf4j</groupId>
34-
<artifactId>slf4j-api</artifactId>
35-
<version>${slf4j.version}</version>
36-
</dependency>
3730
<dependency>
3831
<groupId>io.github.classgraph</groupId>
3932
<artifactId>classgraph</artifactId>
@@ -52,24 +45,10 @@
5245
</dependencies>
5346
<build>
5447
<plugins>
55-
<plugin>
56-
<groupId>org.apache.maven.plugins</groupId>
57-
<artifactId>maven-compiler-plugin</artifactId>
58-
<version>3.8.1</version>
59-
<configuration>
60-
<source>11</source>
61-
<target>11</target>
62-
</configuration>
63-
</plugin>
6448
<plugin>
6549
<groupId>org.apache.maven.plugins</groupId>
6650
<artifactId>maven-jar-plugin</artifactId>
67-
<version>3.1.1</version>
68-
<configuration>
69-
<excludes>
70-
<exclude>**/logback.xml</exclude>
71-
</excludes>
72-
</configuration>
51+
<version>${plugin.jar.version}</version>
7352
<executions>
7453
<execution>
7554
<goals>

‎dataformat-json/pom.xml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,10 @@
1212
<name>Asset Administration Shell JSON-Serializer</name>
1313

1414
<dependencies>
15-
<dependency>
16-
<groupId>io.admin-shell.aas</groupId>
17-
<artifactId>model</artifactId>
18-
<version>${model.version}</version>
19-
<scope>compile</scope>
20-
</dependency>
2115
<dependency>
2216
<groupId>io.admin-shell.aas</groupId>
2317
<artifactId>dataformat-core</artifactId>
2418
<version>${revision}</version>
25-
<scope>compile</scope>
2619
</dependency>
2720
<dependency>
2821
<groupId>io.admin-shell.aas</groupId>
@@ -35,18 +28,12 @@
3528
<groupId>com.fasterxml.jackson.core</groupId>
3629
<artifactId>jackson-annotations</artifactId>
3730
<version>${jackson.version}</version>
38-
<scope>compile</scope>
3931
</dependency>
4032
<dependency>
4133
<groupId>com.fasterxml.jackson.core</groupId>
4234
<artifactId>jackson-databind</artifactId>
4335
<version>${jackson.version}</version>
4436
</dependency>
45-
<dependency>
46-
<groupId>org.slf4j</groupId>
47-
<artifactId>slf4j-api</artifactId>
48-
<version>${slf4j.version}</version>
49-
</dependency>
5037
<dependency>
5138
<groupId>com.networknt</groupId>
5239
<artifactId>json-schema-validator</artifactId>
@@ -57,12 +44,6 @@
5744
<artifactId>classgraph</artifactId>
5845
<version>${classgraph.version}</version>
5946
</dependency>
60-
<dependency>
61-
<groupId>junit</groupId>
62-
<artifactId>junit</artifactId>
63-
<version>${junit.version}</version>
64-
<scope>test</scope>
65-
</dependency>
6647
<dependency>
6748
<groupId>pl.pragmatists</groupId>
6849
<artifactId>JUnitParams</artifactId>
@@ -76,17 +57,4 @@
7657
<scope>test</scope>
7758
</dependency>
7859
</dependencies>
79-
<build>
80-
<plugins>
81-
<plugin>
82-
<groupId>org.apache.maven.plugins</groupId>
83-
<artifactId>maven-compiler-plugin</artifactId>
84-
<version>3.8.1</version>
85-
<configuration>
86-
<source>11</source>
87-
<target>11</target>
88-
</configuration>
89-
</plugin>
90-
</plugins>
91-
</build>
9260
</project>

‎dataformat-rdf/pom.xml

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,15 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
5+
<modelVersion>4.0.0</modelVersion>
56
<parent>
6-
<artifactId>dataformat-parent</artifactId>
77
<groupId>io.admin-shell.aas</groupId>
8+
<artifactId>dataformat-parent</artifactId>
89
<version>${revision}</version>
910
</parent>
10-
<modelVersion>4.0.0</modelVersion>
11-
1211
<artifactId>dataformat-rdf</artifactId>
1312
<name>Asset Administration Shell RDF-Serializer</name>
1413

15-
<properties>
16-
<maven.compiler.source>11</maven.compiler.source>
17-
<maven.compiler.target>11</maven.compiler.target>
18-
</properties>
19-
2014
<dependencies>
2115
<dependency>
2216
<groupId>io.admin-shell.aas</groupId>
@@ -28,19 +22,11 @@
2822
<artifactId>jena-arq</artifactId>
2923
<version>${jena.version}</version>
3024
</dependency>
31-
<dependency>
32-
<groupId>junit</groupId>
33-
<artifactId>junit</artifactId>
34-
<version>${junit.version}</version>
35-
<scope>test</scope>
36-
</dependency>
3725
<dependency>
3826
<groupId>org.slf4j</groupId>
3927
<artifactId>slf4j-simple</artifactId>
40-
<version>1.7.30</version>
28+
<version>${slf4j.version}</version>
4129
<scope>test</scope>
4230
</dependency>
4331
</dependencies>
44-
45-
4632
</project>

0 commit comments

Comments
 (0)