You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by bo...@apache.org on 2023/01/01 18:16:31 UTC
[streampipes] 03/03: improve pom file min streampipes-maven-plugin
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch chore/align-pom-structure
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 8cefea8ea0b1b28998a347a07a4b8841af1e5a95
Author: bossenti <bo...@posteo.de>
AuthorDate: Sun Jan 1 19:16:06 2023 +0100
improve pom file min streampipes-maven-plugin
---
pom.xml | 76 +++++++++++++++++++++++++++++++++++-----
streampipes-connect/pom.xml | 5 ++-
streampipes-maven-plugin/pom.xml | 73 +++++++++++++++++++-------------------
streampipes-rest-shared/pom.xml | 4 +--
4 files changed, 107 insertions(+), 51 deletions(-)
diff --git a/pom.xml b/pom.xml
index 171a97a94..4a6a6078e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
<commons-logging.version>1.2</commons-logging.version>
<consul-client.version>1.5.2</consul-client.version>
<elasticsearch.version>6.8.17</elasticsearch.version>
+ <file-management.version>3.0.0</file-management.version>
<flink.version>1.13.5</flink.version>
<flinkspector.version>0.9.4</flinkspector.version>
<fogsy-qudt.version>1.0</fogsy-qudt.version>
@@ -77,11 +78,11 @@
<javax-annotation.version>1.3.2</javax-annotation.version>
<javax-json.version>1.1.4</javax-json.version>
<javax-persistence-api.version>1.0.2</javax-persistence-api.version>
- <javax-servlet-api.version>4.0.1</javax-servlet-api.version>
<javax-validation.version>2.0.1.Final</javax-validation.version>
<javax.ws.rs.version>2.1</javax.ws.rs.version>
<javassist.version>3.25.0-GA</javassist.version>
- <jaxb.version>2.3.2</jaxb.version>
+ <jaxb-api.version>2.3.1</jaxb-api.version>
+ <jaxb-runtime.version>2.3.2</jaxb-runtime.version>
<jboss-logging.version>3.4.0.Final</jboss-logging.version>
<jboss-logging-annotations.version>2.2.1.Final</jboss-logging-annotations.version>
<jboss-logging-processor.version>2.2.1.Final</jboss-logging-processor.version>
@@ -101,6 +102,8 @@
<lz4.version>1.7.1</lz4.version>
<logback-classic.version>1.2.9</logback-classic.version>
<maven-invoker.version>2.2</maven-invoker.version>
+ <maven-plugin-annotations.version>3.6.2</maven-plugin-annotations.version>
+ <maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version>
<mqtt-client.version>1.12</mqtt-client.version>
<nats.version>2.16.1</nats.version>
<objenesis.version>2.5.1</objenesis.version>
@@ -108,11 +111,13 @@
<okhttp.version>3.12.2</okhttp.version>
<osgi.version>6.0.0</osgi.version>
<plexus-component-annotations.version>2.1.1</plexus-component-annotations.version>
+ <plexus-interactivity-api.version>1.1</plexus-interactivity-api.version>
<plexus-utils.version>3.5.0</plexus-utils.version>
<rdf4j.version>3.5.0</rdf4j.version>
<reflections.version>0.9.10</reflections.version>
<rendersnake.version>1.9.0</rendersnake.version>
<retrofit.version>2.5.0</retrofit.version>
+ <roaster.version>2.28.0.Final</roaster.version>
<siddhi.version>5.1.26</siddhi.version>
<simple-java-mail.version>7.1.0</simple-java-mail.version>
<slf4j.version>1.7.30</slf4j.version>
@@ -454,11 +459,6 @@
<artifactId>persistence-api</artifactId>
<version>${javax-persistence-api.version}</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${javax-servlet-api.version}</version>
- </dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
@@ -472,7 +472,7 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>${jaxb.version}</version>
+ <version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
@@ -937,6 +937,12 @@
<artifactId>wiremock</artifactId>
<version>${wiremock.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -1003,6 +1009,46 @@
<version>${flink.version}</version>
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-aether-provider</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>${maven-plugin-annotations.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-testing</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <version>${maven-plugin-testing-harness.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>file-management</artifactId>
+ <version>${file-management.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interactivity-api</artifactId>
+ <version>${plexus-interactivity-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.forge.roaster</groupId>
+ <artifactId>roaster-api</artifactId>
+ <version>${roaster.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.forge.roaster</groupId>
+ <artifactId>roaster-jdt</artifactId>
+ <version>${roaster.version}</version>
+ </dependency>
<!-- Extensions dependencies -->
<dependency>
@@ -1272,6 +1318,12 @@
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
<version>${iotdb.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.opennlp</groupId>
@@ -1282,6 +1334,12 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client</artifactId>
<version>${pulsar.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.rocketmq</groupId>
@@ -1348,7 +1406,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>${jaxb.version}</version>
+ <version>${jaxb-runtime.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
diff --git a/streampipes-connect/pom.xml b/streampipes-connect/pom.xml
index bc93d2064..88fe8b7ca 100755
--- a/streampipes-connect/pom.xml
+++ b/streampipes-connect/pom.xml
@@ -157,9 +157,8 @@
<artifactId>jetty-io</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>test</scope>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<!-- Test dependencies -->
diff --git a/streampipes-maven-plugin/pom.xml b/streampipes-maven-plugin/pom.xml
index c3c4eeef1..e62c3e3d5 100644
--- a/streampipes-maven-plugin/pom.xml
+++ b/streampipes-maven-plugin/pom.xml
@@ -38,7 +38,15 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
- <version.roaster>2.28.0.Final</version.roaster>
+
+ <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
+ <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
+ <maven-install-plugin.version>2.5.2</maven-install-plugin.version>
+ <maven-invoker-plugin.version>3.4.0</maven-invoker-plugin.version>
+ <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
+ <maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
+ <maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
+ <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
</properties>
<dependencyManagement>
@@ -46,17 +54,15 @@
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <version>4.0</version>
+ <version>${guice.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
- <version>3.3.9</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.3.9</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -71,6 +77,12 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -85,7 +97,6 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.6.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -96,18 +107,25 @@
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>3.3.0</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-aether-provider</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>file-management</artifactId>
- <version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -120,12 +138,10 @@
<dependency>
<groupId>org.jboss.forge.roaster</groupId>
<artifactId>roaster-api</artifactId>
- <version>${version.roaster}</version>
</dependency>
<dependency>
<groupId>org.jboss.forge.roaster</groupId>
<artifactId>roaster-jdt</artifactId>
- <version>${version.roaster}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -135,28 +151,11 @@
<dependency>
<groupId>com.j2html</groupId>
<artifactId>j2html</artifactId>
- <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.32</version>
- </dependency>
-
- <!-- dependency convergence -->
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-aether-provider</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- </dependency>
-
</dependencies>
<build>
@@ -164,39 +163,39 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.2.0</version>
+ <version>${maven-clean-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
+ <version>${maven-resources-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>${maven-compiler-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.0</version>
+ <version>${maven-plugin-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.1</version>
+ <version>${maven-surefire-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version>
+ <version>${maven-jar-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
+ <version>${maven-install-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven-deploy-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>3.4.0</version>
+ <version>${maven-invoker-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
@@ -204,7 +203,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.0</version>
+ <version>${maven-plugin-plugin.version}</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
diff --git a/streampipes-rest-shared/pom.xml b/streampipes-rest-shared/pom.xml
index 31c34b8bd..710a109e5 100644
--- a/streampipes-rest-shared/pom.xml
+++ b/streampipes-rest-shared/pom.xml
@@ -53,8 +53,8 @@
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>