Skip to content

Commit 14eee2a

Browse files
atextoratextor
authored
Merge pull request #154 from bci-oss/feature/dependency-cleanup
Feature/dependency cleanup
2 parents a16686d + 354f6d9 commit 14eee2a

File tree

11 files changed

+30
-78
lines changed

11 files changed

+30
-78
lines changed

‎core/sds-aspect-meta-model-java/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,6 @@
4545
<groupId>io.openmanufacturing</groupId>
4646
<artifactId>sds-aspect-meta-model-types</artifactId>
4747
</dependency>
48-
<dependency>
49-
<groupId>jakarta.xml.bind</groupId>
50-
<artifactId>jakarta.xml.bind-api</artifactId>
51-
</dependency>
52-
<dependency>
53-
<groupId>org.glassfish.jaxb</groupId>
54-
<artifactId>jaxb-runtime</artifactId>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.projectlombok</groupId>
58-
<artifactId>lombok</artifactId>
59-
</dependency>
6048

6149
<!-- Test dependencies -->
6250
<dependency>

‎core/sds-aspect-meta-model-resolver/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@
6161
<groupId>jakarta.xml.bind</groupId>
6262
<artifactId>jakarta.xml.bind-api</artifactId>
6363
</dependency>
64-
<dependency>
65-
<groupId>org.glassfish.jaxb</groupId>
66-
<artifactId>jaxb-runtime</artifactId>
67-
</dependency>
6864

6965
<!-- Test dependencies -->
7066
<dependency>

‎core/sds-aspect-meta-model-version-migrator/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@
5555
<artifactId>junit-jupiter</artifactId>
5656
<scope>test</scope>
5757
</dependency>
58-
<dependency>
59-
<groupId>org.assertj</groupId>
60-
<artifactId>assertj-core</artifactId>
61-
<scope>test</scope>
62-
</dependency>
6358
<dependency>
6459
<groupId>org.assertj</groupId>
6560
<artifactId>assertj-vavr</artifactId>

‎core/sds-aspect-model-document-generators/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@
3737
<groupId>io.openmanufacturing</groupId>
3838
<artifactId>sds-aspect-meta-model-resolver</artifactId>
3939
</dependency>
40-
<dependency>
41-
<groupId>io.openmanufacturing</groupId>
42-
<artifactId>sds-aspect-model-resolver</artifactId>
43-
</dependency>
4440
<dependency>
4541
<groupId>io.openmanufacturing</groupId>
4642
<artifactId>sds-aspect-model-jackson</artifactId>

‎core/sds-aspect-model-jackson/pom.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@
4141
<groupId>org.slf4j</groupId>
4242
<artifactId>slf4j-api</artifactId>
4343
</dependency>
44-
<dependency>
45-
<groupId>jakarta.xml.bind</groupId>
46-
<artifactId>jakarta.xml.bind-api</artifactId>
47-
</dependency>
4844
<dependency>
4945
<groupId>com.fasterxml.jackson.datatype</groupId>
5046
<artifactId>jackson-datatype-jsr310</artifactId>
@@ -69,11 +65,6 @@
6965
<artifactId>assertj-core</artifactId>
7066
<scope>test</scope>
7167
</dependency>
72-
<dependency>
73-
<groupId>javax.validation</groupId>
74-
<artifactId>validation-api</artifactId>
75-
<scope>test</scope>
76-
</dependency>
7768
<dependency>
7869
<groupId>io.openmanufacturing</groupId>
7970
<artifactId>sds-aspect-model-java-generator</artifactId>

‎core/sds-aspect-model-java-generator/src/test/java/io/openmanufacturing/sds/aspectmodel/java/StaticClassGenerationResult.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ public void assertConstructorArgumentForProperties( final String className,
102102
.filter( field -> expectedConstructorArgument.keySet().contains( field.resolve().getName() ) )
103103
.forEach( field -> {
104104
final String fieldName = field.resolve().getName();
105-
final String expectedBuilderCall = expectedConstructorArgument.get( fieldName );
105+
final String expectedBuilderCall = expectedConstructorArgument.get( fieldName )
106+
.replace( "\r", "" )
107+
.replace( "\n", "" );
106108
final NodeList<VariableDeclarator> declarators = field.getVariables();
107109
assertThat( declarators ).hasSize( 1 );
108110

@@ -111,8 +113,10 @@ public void assertConstructorArgumentForProperties( final String className,
111113
.asObjectCreationExpr()
112114
.getArguments()
113115
.get( constructorArgumentIndex );
114-
115-
assertThat( metaModelBaseAttributesDeclarationExpression.toString() ).isEqualTo( expectedBuilderCall );
116+
String actualBuilderCall = metaModelBaseAttributesDeclarationExpression.toString().
117+
replace( "\r", "" )
118+
.replace( "\n", "" );
119+
assertThat( actualBuilderCall ).isEqualTo( expectedBuilderCall );
116120
} );
117121
}
118122

@@ -135,11 +139,11 @@ public void assertMethods( final String className, final Map<String, String> exp
135139
assertThat( methodDeclarations ).allSatisfy( methodDeclaration -> {
136140
assertThat( expectedMethodBodies ).containsKey( methodDeclaration.getName().getIdentifier() );
137141
final String expectedBody = expectedMethodBodies.get( methodDeclaration.getName().getIdentifier() )
138-
.replace( "\\r", "" ).replace( "\\n", "" );
142+
.replace( "\r", "" ).replace( "\n", "" );
139143

140144
final NodeList<Statement> actualStatements = methodDeclaration.getBody().get().getStatements();
141145
final String actualBody = actualStatements.stream().map( Node::toString ).collect( Collectors.joining( " " ) )
142-
.replace( "\\r", "" ).replace( "\\n", "" );
146+
.replace( "\r", "" ).replace( "\n", "" );
143147
assertThat( actualBody ).isEqualTo( expectedBody );
144148
} );
145149
}

‎core/sds-aspect-model-serializer/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@
6262
<artifactId>assertj-core</artifactId>
6363
<scope>test</scope>
6464
</dependency>
65-
<dependency>
66-
<groupId>org.assertj</groupId>
67-
<artifactId>assertj-vavr</artifactId>
68-
<scope>test</scope>
69-
</dependency>
7065
<dependency>
7166
<groupId>io.openmanufacturing</groupId>
7267
<artifactId>sds-test-resources</artifactId>

‎core/sds-aspect-model-serializer/src/test/java/io/openmanufacturing/sds/aspectmodel/serializer/PrettyPrinterTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import java.io.ByteArrayOutputStream;
2020
import java.io.InputStream;
2121
import java.io.PrintWriter;
22+
import java.nio.charset.Charset;
23+
import java.nio.charset.StandardCharsets;
2224

2325
import org.apache.jena.rdf.model.Model;
2426
import org.apache.jena.rdf.model.ModelFactory;
@@ -43,14 +45,14 @@ public void testPrettyPrinter( final TestAspect testAspect ) {
4345
.getModelWithoutResolution( testAspect, metaModelVersion ).getRawModel();
4446

4547
final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
46-
final PrintWriter writer = new PrintWriter( buffer );
48+
final PrintWriter writer = new PrintWriter( buffer, false, StandardCharsets.UTF_8 );
4749
new PrettyPrinter( new VersionedModel( ModelFactory.createDefaultModel(),
4850
VersionNumber.parse( metaModelVersion.toVersionString() ), originalModel ),
4951
testAspect.getUrn(), writer )
5052
.print();
5153
writer.flush();
5254

53-
final InputStream bufferInput = new ByteArrayInputStream( buffer.toString().getBytes() );
55+
final InputStream bufferInput = new ByteArrayInputStream( buffer.toByteArray() );
5456
final Model prettyPrintedModel = ModelFactory.createDefaultModel();
5557
try {
5658
prettyPrintedModel.read( bufferInput, "", RDFLanguages.TURTLE.getName() );

‎core/sds-aspect-model-urn/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
<groupId>com.google.guava</groupId>
3333
<artifactId>guava</artifactId>
3434
</dependency>
35-
<dependency>
36-
<groupId>org.slf4j</groupId>
37-
<artifactId>slf4j-api</artifactId>
38-
</dependency>
3935
<dependency>
4036
<groupId>com.fasterxml.jackson.core</groupId>
4137
<artifactId>jackson-annotations</artifactId>

‎pom.xml‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -72,31 +72,29 @@
7272
<properties>
7373
<!-- Versions of third party dependencies -->
7474
<aspect-meta-model-version>2.0.0-M1</aspect-meta-model-version>
75-
<assertj-vavr-version>0.1.0</assertj-vavr-version>
76-
<classgraph-version>4.8.109</classgraph-version>
77-
<commons-text-version>1.6</commons-text-version>
78-
<easy-random-version>4.0.0</easy-random-version>
79-
<gradle-core-version>6.1.1</gradle-core-version>
75+
<assertj-vavr-version>0.4.2</assertj-vavr-version>
76+
<classgraph-version>4.8.146</classgraph-version>
77+
<commons-text-version>1.9</commons-text-version>
78+
<easy-random-version>5.0.0</easy-random-version>
8079
<graphviz-version>0.18.1</graphviz-version>
81-
<guava-version>30.1-jre</guava-version>
82-
<guice-version>3.0</guice-version>
83-
<javaparser-version>3.14.7</javaparser-version>
84-
<jcommander-version>1.72</jcommander-version>
80+
<guava-version>31.1-jre</guava-version>
81+
<guice-version>5.1.0</guice-version>
82+
<javaparser-version>3.24.2</javaparser-version>
8583
<jena-version>4.2.0</jena-version>
86-
<jqwik-version>1.2.0</jqwik-version>
87-
<lombok-version>1.18.20</lombok-version>
84+
<jqwik-version>1.6.5</jqwik-version>
85+
<lombok-version>1.18.24</lombok-version>
8886
<maven-plugin-annotations-version>3.5</maven-plugin-annotations-version>
8987
<maven-plugin-depdendencies-version>3.3.9</maven-plugin-depdendencies-version>
9088
<maven-plugin-flatten-version>1.2.7</maven-plugin-flatten-version>
9189
<maven-plugin-plugin-version>3.6.4</maven-plugin-plugin-version>
9290
<maven-plugin-testing-harness-version>3.3.0</maven-plugin-testing-harness-version>
9391
<rgxgen-version>1.3</rgxgen-version>
94-
<rhino-version>1.7.10</rhino-version>
95-
<roaster-version>2.23.2.Final</roaster-version>
92+
<rhino-version>1.7.14</rhino-version>
93+
<roaster-version>2.24.0.Final</roaster-version>
9694
<shacl-version>1.3.2</shacl-version>
97-
<spring-boot-version>2.5.5</spring-boot-version>
98-
<system-lambda-version>1.2.0</system-lambda-version>
99-
<vavr-version>0.10.3</vavr-version>
95+
<spring-boot-version>2.6.7</spring-boot-version>
96+
<system-lambda-version>1.2.1</system-lambda-version>
97+
<vavr-version>0.10.4</vavr-version>
10098
<!-- TODO remember to update the link to the Velocity engine user guide in the 'java-aspect-tooling.adoc' page -->
10199
<velocity-version>2.3</velocity-version>
102100
<io-admin-shell-aas-model>1.2.0</io-admin-shell-aas-model>
@@ -334,14 +332,9 @@
334332
<version>${guice-version}</version>
335333
</dependency>
336334
<dependency>
337-
<groupId>com.github.javaparser</groupId>
338-
<artifactId>javaparser-symbol-solver-core</artifactId>
339-
<version>${javaparser-version}</version>
340-
</dependency>
341-
<dependency>
342-
<groupId>com.beust</groupId>
343-
<artifactId>jcommander</artifactId>
344-
<version>${jcommander-version}</version>
335+
<groupId>com.github.javaparser</groupId>
336+
<artifactId>javaparser-symbol-solver-core</artifactId>
337+
<version>${javaparser-version}</version>
345338
</dependency>
346339
<dependency>
347340
<groupId>com.github.stefanbirkner</groupId>

0 commit comments

Comments
 (0)