Skip to content

Commit

Permalink
dependencies(#2157): Clean up dependencies in dependency management
Browse files Browse the repository at this point in the history
  • Loading branch information
@dominikriemer
dominikriemer committed Nov 8, 2023
1 parent b333351 commit 470fad1
Show file tree
Hide file tree
Showing 40 changed files with 940 additions and 1,878 deletions.
1,927 changes: 722 additions & 1,205 deletions pom.xml
View file

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions streampipes-client-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,10 @@
<artifactId>streampipes-model</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-service-discovery-api</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>fluent-hc</artifactId>
<artifactId>httpcore</artifactId>
</dependency>
</dependencies>

Expand Down
9 changes: 0 additions & 9 deletions streampipes-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,6 @@
<artifactId>streampipes-model</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-model-client</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-security-jwt</artifactId>
Expand All @@ -83,10 +78,6 @@
</dependency>

<!-- 3rd party Dependencies -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>fluent-hc</artifactId>
Expand Down
12 changes: 4 additions & 8 deletions streampipes-commons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@
<!-- StreamPipes dependencies -->

<!-- External dependencies -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Expand All @@ -43,14 +39,14 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>junit</groupId>
Expand Down
15 changes: 0 additions & 15 deletions streampipes-config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,6 @@
<artifactId>streampipes-model</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-model-client</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-serializers-json</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-vocabulary</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-service-discovery</artifactId>
Expand Down
22 changes: 0 additions & 22 deletions streampipes-connect-management/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,6 @@
<artifactId>streampipes-storage-couchdb</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-user-management</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-data-explorer</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>

<!-- External dependencies -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</dependency>

<!-- Dependency convergence -->
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
</dependency>

<!-- Test dependencies -->
<dependency>
Expand Down
7 changes: 1 addition & 6 deletions streampipes-data-explorer-commons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,14 @@
<!-- StreamPipes -->
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-service-discovery-api</artifactId>
<artifactId>streampipes-client-api</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-model</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-client</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-commons</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions streampipes-data-explorer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@
<groupId>org.influxdb</groupId>
<artifactId>influxdb-java</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
4 changes: 0 additions & 4 deletions streampipes-dataformat-json/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions streampipes-extensions-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@
<artifactId>streampipes-model</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-service-discovery-api</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
</dependencies>
<properties>
<maven.compiler.source>8</maven.compiler.source>
Expand Down
27 changes: 0 additions & 27 deletions streampipes-extensions-management/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@
<artifactId>streampipes-serializers-json</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-service-discovery</artifactId>
<version>0.95.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-test-utils</artifactId>
Expand All @@ -92,18 +87,10 @@


<!-- External dependencies -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>de.grundid.opendatalab</groupId>
<artifactId>geojson-jackson</artifactId>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
Expand All @@ -112,16 +99,6 @@
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.parsson</groupId>
<artifactId>jakarta.json</artifactId>
<version>1.1.1</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>fluent-hc</artifactId>
</dependency>

<!-- Test dependencies -->
<dependency>
Expand All @@ -134,10 +111,6 @@
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>com.jayway.restassured</groupId>
<artifactId>rest-assured</artifactId>
Expand Down
2 changes: 0 additions & 2 deletions streampipes-extensions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
<module>streampipes-extensions-all-iiot</module>
<module>streampipes-extensions-all-jvm</module>

<module>streampipes-pipeline-elements-data-simulator</module>
<module>streampipes-pipeline-elements-shared</module>

<module>streampipes-processors-change-detection-jvm</module>
Expand Down Expand Up @@ -100,7 +99,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
</dependency>
</dependencies>
</plugin>
Expand Down
80 changes: 2 additions & 78 deletions streampipes-extensions/streampipes-connect-adapters-iiot/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,46 +56,10 @@
</dependency>

<!-- External dependencies -->
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
</dependency>
<dependency>
<groupId>edu.wpi.rail</groupId>
<artifactId>jrosbridge</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</dependency>
<dependency>
<groupId>org.fusesource.mqtt-client</groupId>
<artifactId>mqtt-client</artifactId>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>fluent-hc</artifactId>
Expand All @@ -105,34 +69,8 @@
<artifactId>commons-compress</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-sse</artifactId>
<exclusions>
<exclusion>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.java-websocket</groupId>
<artifactId>Java-WebSocket</artifactId>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>

<!-- Test dependencies -->
Expand Down Expand Up @@ -168,20 +106,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

<!-- dependency convergence -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
<groupId>javax.websocket</groupId>
<artifactId>javax.websocket-api</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
Loading

0 comments on commit 470fad1

Please sign in to comment.