You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2021/12/29 16:01:59 UTC
[incubator-streampipes] 01/02: [hotfix] Update various dependencies
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 83aa6d62b7efcd6f275c47f804dac2996f58637c
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Dec 29 17:00:43 2021 +0100
[hotfix] Update various dependencies
---
pom.xml | 195 +++++++++++++++------
streampipes-backend/pom.xml | 4 +
streampipes-connect-container-master/pom.xml | 11 ++
streampipes-connect/pom.xml | 15 ++
streampipes-container-base/pom.xml | 17 +-
streampipes-container/pom.xml | 6 +
streampipes-extensions/pom.xml | 118 ++++++++-----
.../streampipes-connect-adapters-iiot/pom.xml | 4 +
.../streampipes-extensions-all-jvm/pom.xml | 6 +
.../streampipes-pipeline-elements-all-jvm/pom.xml | 10 ++
.../pom.xml | 2 +-
.../pom.xml | 15 ++
.../streampipes-processors-filters-siddhi/pom.xml | 10 ++
.../pom.xml | 15 ++
.../pom.xml | 12 ++
.../pom.xml | 4 +
.../streampipes-sinks-brokers-jvm/pom.xml | 8 +
.../streampipes-sources-vehicle-simulator/pom.xml | 6 +
.../pom.xml | 12 ++
streampipes-maven-plugin/pom.xml | 40 ++++-
streampipes-pipeline-management/pom.xml | 9 +-
.../apache/streampipes/rest/impl/Deployment.java | 25 ++-
streampipes-wrapper-siddhi/pom.xml | 17 ++
tools/maven/checkstyle.xml | 38 ++--
24 files changed, 461 insertions(+), 138 deletions(-)
diff --git a/pom.xml b/pom.xml
index cf7dc10..0d00a62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,8 @@
~
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -37,9 +38,10 @@
<maven.version>3.3.9</maven.version>
<owasp.check.skip>false</owasp.check.skip>
+ <!-- project dependencies -->
<activemq-client.version>5.16.3</activemq-client.version>
<asm.version>7.0</asm.version>
- <byte-buddy.version>1.9.7</byte-buddy.version>
+ <byte-buddy.version>1.12.6</byte-buddy.version>
<cloning.version>1.9.12</cloning.version>
<commons-beanutils.version>1.9.2</commons-beanutils.version>
<commons-collections.version>3.2.2</commons-collections.version>
@@ -53,16 +55,17 @@
<fst.version>2.56</fst.version>
<geojson-jackson.version>1.8</geojson-jackson.version>
<guava.version>27.1-jre</guava.version>
- <hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
+ <hibernate-validator.version>6.2.1.Final</hibernate-validator.version>
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.9</httpcore.version>
<httpcore-osgi.version>4.4.9</httpcore-osgi.version>
- <influxdb.version>2.21</influxdb.version>
+ <influxdb.version>2.22</influxdb.version>
<j2html.version>1.4.0</j2html.version>
<jackson.version>2.13.1</jackson.version>
<jakarta-annotation.version>1.3.5</jakarta-annotation.version>
<jakarta-activation-api.version>1.2.2</jakarta-activation-api.version>
<jakarta-mail.version>1.6.7</jakarta-mail.version>
+ <jakarta-servlet-api.version>4.0.4</jakarta-servlet-api.version>
<jakarta-validation.version>2.0.2</jakarta-validation.version>
<jakarta-xml-bind-api.version>2.3.3</jakarta-xml-bind-api.version>
<javapoet.version>1.6.1</javapoet.version>
@@ -75,7 +78,10 @@
<javassist.version>3.19.0-GA</javassist.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<jboss-logging.version>3.4.0.Final</jboss-logging.version>
- <jersey.version>2.33</jersey.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>
+ <jersey.version>2.35</jersey.version>
+ <jetbrains-annotations.version>16.0.2</jetbrains-annotations.version>
<jetty.version>9.4.19.v20190610</jetty.version>
<jgrapht.version>1.3.1</jgrapht.version>
<jjwt.version>0.11.2</jjwt.version>
@@ -91,40 +97,46 @@
<objenesis.version>2.5.1</objenesis.version>
<okio.version>1.16.0</okio.version>
<okhttp.version>3.12.2</okhttp.version>
- <plexus-component-annotations.version>1.6</plexus-component-annotations.version>
- <plexus-utils.version>3.0.22</plexus-utils.version>
+ <osgi.version>6.0.0</osgi.version>
+ <plexus-component-annotations.version>2.1.1</plexus-component-annotations.version>
+ <plexus-utils.version>3.4.1</plexus-utils.version>
<rdf4j.version>3.5.0</rdf4j.version>
- <rendersnake.version>1.8</rendersnake.version>
+ <rendersnake.version>1.9.0</rendersnake.version>
<retrofit.version>2.5.0</retrofit.version>
<shiro.version>1.7.0</shiro.version>
<siddhi.version>5.1.20</siddhi.version>
+ <simple-java-mail.version>6.7.5</simple-java-mail.version>
<slf4j.version>1.7.30</slf4j.version>
<snakeyaml.version>1.26</snakeyaml.version>
<snappy-java.version>1.1.7.7</snappy-java.version>
<spark.version>2.1.2</spark.version>
- <spring.version>5.3.13</spring.version>
- <spring-boot.version>2.5.5</spring-boot.version>
- <spring-security.version>5.6.0</spring-security.version>
+ <spring.version>5.3.14</spring.version>
+ <spring-boot.version>2.6.2</spring-boot.version>
+ <spring-security.version>5.6.1</spring-security.version>
<swagger.version>2.1.11</swagger.version>
<type-parser.version>0.6.0</type-parser.version>
<underscore.version>1.47</underscore.version>
- <wildfly-common.version>1.5.2.Final</wildfly-common.version>
+ <wildfly-common.version>1.5.4.Final</wildfly-common.version>
<hawtbuf.version>1.11</hawtbuf.version>
<!-- Test dependencies -->
<junit.version>4.12</junit.version>
- <mockito.version>3.1.0</mockito.version>
- <powermock.version>2.0.4</powermock.version>
+ <mockito.version>3.12.4</mockito.version>
+ <powermock.version>2.0.9</powermock.version>
<rest-assured.version>2.9.0</rest-assured.version>
- <wiremock.version>2.25.1</wiremock.version>
+ <wiremock.version>2.27.2</wiremock.version>
<!-- Maven Plugins -->
- <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
- <maven.dependency.plugin.version>3.1.1</maven.dependency.plugin.version>
- <maven.jar.plugin.version>3.1.2</maven.jar.plugin.version>
- <maven.source.plugin.version>3.1.0</maven.source.plugin.version>
+ <apache-rat-plugin.version>0.13</apache-rat-plugin.version>
+ <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
+ <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
+ <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven.dependency.check.plugin.version>6.5.1</maven.dependency.check.plugin.version>
- <maven.shade.plugin.version>3.2.3</maven.shade.plugin.version>
+ <maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version>
+ <maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
+ <maven.jar.plugin.version>3.1.2</maven.jar.plugin.version>
+ <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
+ <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
</properties>
<name>Apache StreamPipes (incubating)</name>
@@ -336,6 +348,11 @@
<version>${javax-annotation.version}</version>
</dependency>
<dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta-servlet-api.version}</version>
+ </dependency>
+ <dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jakarta-xml-bind-api.version}</version>
@@ -347,6 +364,11 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax-servlet-api.version}</version>
</dependency>
@@ -517,6 +539,16 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
</dependency>
@@ -576,6 +608,22 @@
<version>${jboss-logging.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ <version>${jboss-logging-annotations.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <version>${jboss-logging-processor.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <version>${jetbrains-annotations.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jgrapht</groupId>
<artifactId>jgrapht-core</artifactId>
<version>${jgrapht.version}</version>
@@ -666,6 +714,11 @@
<version>${objenesis.version}</version>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${osgi.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${asm.version}</version>
@@ -683,7 +736,7 @@
<dependency>
<groupId>org.simplejavamail</groupId>
<artifactId>simple-java-mail</artifactId>
- <version>6.6.1</version>
+ <version>${simple-java-mail.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -721,6 +774,11 @@
<version>${spring.version}</version>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>${spring-security.version}</version>
@@ -915,7 +973,7 @@
<module>streampipes-wrapper-kafka-streams</module>
<module>streampipes-wrapper-python</module>
<module>streampipes-wrapper-siddhi</module>
- <module>streampipes-wrapper-spark</module>
+<!-- <module>streampipes-wrapper-spark</module>-->
<module>streampipes-wrapper-standalone</module>
<module>streampipes-mail</module>
<module>streampipes-resource-management</module>
@@ -949,7 +1007,8 @@
<fileSet>
<directory>${project.build.directory}</directory>
<includes>
- <include>apache-streampipes-${project.version}-incubating-source-release.zip</include>
+ <include>apache-streampipes-${project.version}-incubating-source-release.zip
+ </include>
</includes>
</fileSet>
</fileSets>
@@ -989,13 +1048,26 @@
</profiles>
<!-- Build Settings -->
+
+
<build>
+
+ <!-- Plugin Management -->
+
<pluginManagement>
<plugins>
<plugin>
+ <groupId>net.revelc.code.formatter</groupId>
+ <artifactId>formatter-maven-plugin</artifactId>
+ <version>2.11.0</version>
+ <configuration>
+ <lineEnding>LF</lineEnding>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>${maven-compiler-plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -1004,18 +1076,18 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>${maven.shade.plugin.version}</version>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin.version}</version>
</plugin>
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring-boot.version}</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>${maven-shade-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1027,7 +1099,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.2.0</version>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<finalName>apache-streampipes-${project.version}-incubating</finalName>
<descriptors>
@@ -1036,20 +1108,46 @@
</configuration>
</plugin>
<plugin>
- <groupId>net.revelc.code.formatter</groupId>
- <artifactId>formatter-maven-plugin</artifactId>
- <version>2.11.0</version>
- <configuration>
- <lineEnding>LF</lineEnding>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${maven-dependency-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${maven-checkstyle-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${maven-source-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <version>${maven.dependency.check.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot.version}</version>
</plugin>
</plugins>
</pluginManagement>
+
+
+ <!-- Plugins -->
+
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M2</version>
<executions>
<execution>
<id>check-at-least-java-8</id>
@@ -1074,14 +1172,10 @@
</goals>
<configuration>
<rules>
- <dependencyConvergence />
+ <dependencyConvergence/>
</rules>
</configuration>
</execution>
- <!--
- Fails the build if classes are included from multiple
- artifacts and these are not identical.
- -->
</executions>
<dependencies>
<dependency>
@@ -1119,7 +1213,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.13</version>
<executions>
<execution>
<id>license-check</id>
@@ -1218,12 +1311,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>${maven.dependency.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>${maven.source.plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -1236,7 +1327,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -1246,12 +1336,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.1.0</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>8.19</version>
+ <version>9.2.1</version>
</dependency>
</dependencies>
<executions>
@@ -1274,7 +1363,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${maven.jar.plugin.version}</version>
<configuration>
<archive>
<manifest>
@@ -1287,7 +1375,6 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>${maven.dependency.check.plugin.version}</version>
<configuration>
<!-- use -Dowasp.check.skip=true to skip dependency check -->
<skip>${owasp.check.skip}</skip>
@@ -1314,8 +1401,8 @@
<developerConnection>scm:git:ssh://git@github.com/apache/incubator-streampipes.git</developerConnection>
<connection>scm:git:ssh://git@github.com/apache/incubator-streampipes.git</connection>
<url>https://github.com/apache/incubator-streampipes</url>
- <tag>HEAD</tag>
- </scm>
+ <tag>HEAD</tag>
+ </scm>
<issueManagement>
<system>Jira</system>
diff --git a/streampipes-backend/pom.xml b/streampipes-backend/pom.xml
index 2197aba..56782f8 100644
--- a/streampipes-backend/pom.xml
+++ b/streampipes-backend/pom.xml
@@ -97,6 +97,10 @@
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/streampipes-connect-container-master/pom.xml b/streampipes-connect-container-master/pom.xml
index 557da95..5931b02 100644
--- a/streampipes-connect-container-master/pom.xml
+++ b/streampipes-connect-container-master/pom.xml
@@ -36,6 +36,11 @@
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-measurement-units</artifactId>
+ <version>0.69.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-pipeline-management</artifactId>
<version>0.69.0-SNAPSHOT</version>
</dependency>
@@ -61,6 +66,12 @@
<artifactId>httpmime</artifactId>
</dependency>
+ <!-- Dependency convergence -->
+ <dependency>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
diff --git a/streampipes-connect/pom.xml b/streampipes-connect/pom.xml
index 865a2cb..4dd30f1 100755
--- a/streampipes-connect/pom.xml
+++ b/streampipes-connect/pom.xml
@@ -136,6 +136,21 @@
</exclusions>
</dependency>
+ <!-- dependency convergence -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>com.github.tomakehurst</groupId>
diff --git a/streampipes-container-base/pom.xml b/streampipes-container-base/pom.xml
index b849815..d58f1d7 100644
--- a/streampipes-container-base/pom.xml
+++ b/streampipes-container-base/pom.xml
@@ -74,6 +74,19 @@
<artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</dependency>
@@ -89,9 +102,5 @@
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
- <dependency>
- <groupId>org.wildfly.common</groupId>
- <artifactId>wildfly-common</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/streampipes-container/pom.xml b/streampipes-container/pom.xml
index c029349..b1b9477 100644
--- a/streampipes-container/pom.xml
+++ b/streampipes-container/pom.xml
@@ -84,6 +84,12 @@
<dependency>
<groupId>org.rendersnake</groupId>
<artifactId>rendersnake</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Test dependencies -->
diff --git a/streampipes-extensions/pom.xml b/streampipes-extensions/pom.xml
index 6a30c36..712a35f 100644
--- a/streampipes-extensions/pom.xml
+++ b/streampipes-extensions/pom.xml
@@ -89,16 +89,18 @@
<jsrosbridge.version>0.2.0</jsrosbridge.version>
<jedis.version>3.3.0</jedis.version>
<j2objc-annotations.version>1.3</j2objc-annotations.version>
- <quartz.version>2.3.2</quartz.version>
<language-detector.version>0.6</language-detector.version>
<log4j-to-slf4j.version>2.8.2</log4j-to-slf4j.version>
+ <lombok.version>1.18.22</lombok.version>
<mailapi.version>1.4.3</mailapi.version>
<metrics-core.version>3.1.2</metrics-core.version>
<nekohtml.version>1.9.13</nekohtml.version>
+ <netty-resolver.version>4.1.72.Final</netty-resolver.version>
<okhttp.version>3.13.1</okhttp.version>
<opennlp.version>1.9.0</opennlp.version>
<postgresql.version>42.2.2</postgresql.version>
- <pulsar.version>2.7.0</pulsar.version>
+ <pulsar.version>2.9.1</pulsar.version>
+ <quartz.version>2.3.2</quartz.version>
<scala-lang.version>2.11.12</scala-lang.version>
<scala-parser-combinators.version>1.1.1</scala-parser-combinators.version>
<slack-api.version>1.2.0</slack-api.version>
@@ -136,36 +138,58 @@
<dependencyManagement>
<dependencies>
- <!-- External Connect dependencies -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${jcl-over-slf4j.version}</version>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-runtime</artifactId>
+ <version>4.9</version>
</dependency>
<dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-annotations</artifactId>
- <version>${animal-sniffer-annotations.version}</version>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>4.1.72.Final</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- <version>${bcprov.version}</version>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>proton-j</artifactId>
+ <version>0.18.0</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>${bcprov.version}</version>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>4.1.0</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>${bcpkix.version}</version>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-xml_2.11</artifactId>
+ <version>1.0.5</version>
+ <scope>test</scope>
</dependency>
+ <!-- External Connect dependencies -->
<dependency>
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-qual</artifactId>
- <version>${checker-qual.version}</version>
+ <groupId>com.github.shyiko</groupId>
+ <artifactId>mysql-binlog-connector-java</artifactId>
+ <version>${mysql-binlog-connector.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
+ <version>${j2objc-annotations.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.wpi.rail</groupId>
+ <artifactId>jrosbridge</artifactId>
+ <version>${jsrosbridge.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver</artifactId>
+ <version>${netty-resolver.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.websocket</groupId>
+ <artifactId>javax.websocket-api</artifactId>
+ <version>${javax-websocket-client-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -183,24 +207,29 @@
<version>${commons-text.version}</version>
</dependency>
<dependency>
- <groupId>org.java-websocket</groupId>
- <artifactId>Java-WebSocket</artifactId>
- <version>${java-websocket.version}</version>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ <version>${bcprov.version}</version>
</dependency>
<dependency>
- <groupId>javax.websocket</groupId>
- <artifactId>javax.websocket-api</artifactId>
- <version>${javax-websocket-client-api.version}</version>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${bcprov.version}</version>
</dependency>
<dependency>
- <groupId>edu.wpi.rail</groupId>
- <artifactId>jrosbridge</artifactId>
- <version>${jsrosbridge.version}</version>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>${bcpkix.version}</version>
</dependency>
<dependency>
- <groupId>org.influxdb</groupId>
- <artifactId>influxdb-java</artifactId>
- <version>${influxdb.java.version}</version>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ <version>${checker-qual.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-annotations</artifactId>
+ <version>${animal-sniffer-annotations.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.milo</groupId>
@@ -218,14 +247,25 @@
<version>${graalvm.js.version}</version>
</dependency>
<dependency>
- <groupId>com.github.shyiko</groupId>
- <artifactId>mysql-binlog-connector-java</artifactId>
- <version>${mysql-binlog-connector.version}</version>
+ <groupId>org.influxdb</groupId>
+ <artifactId>influxdb-java</artifactId>
+ <version>${influxdb.java.version}</version>
</dependency>
+
<dependency>
- <groupId>com.google.j2objc</groupId>
- <artifactId>j2objc-annotations</artifactId>
- <version>${j2objc-annotations.version}</version>
+ <groupId>org.java-websocket</groupId>
+ <artifactId>Java-WebSocket</artifactId>
+ <version>${java-websocket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${jcl-over-slf4j.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
diff --git a/streampipes-extensions/streampipes-connect-adapters-iiot/pom.xml b/streampipes-extensions/streampipes-connect-adapters-iiot/pom.xml
index f318f9e..b729cfc 100644
--- a/streampipes-extensions/streampipes-connect-adapters-iiot/pom.xml
+++ b/streampipes-extensions/streampipes-connect-adapters-iiot/pom.xml
@@ -201,6 +201,10 @@
<artifactId>jetty-webapp</artifactId>
<groupId>org.eclipse.jetty</groupId>
</exclusion>
+ <exclusion>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-runtime</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/streampipes-extensions/streampipes-extensions-all-jvm/pom.xml b/streampipes-extensions/streampipes-extensions-all-jvm/pom.xml
index 3b450ca..63e92a5 100644
--- a/streampipes-extensions/streampipes-extensions-all-jvm/pom.xml
+++ b/streampipes-extensions/streampipes-extensions-all-jvm/pom.xml
@@ -53,6 +53,12 @@
<version>0.69.0-SNAPSHOT</version>
<classifier>embed</classifier>
</dependency>
+
+ <!-- Dependency convergence -->
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-runtime</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/streampipes-extensions/streampipes-pipeline-elements-all-jvm/pom.xml b/streampipes-extensions/streampipes-pipeline-elements-all-jvm/pom.xml
index e721452..ae9a870 100644
--- a/streampipes-extensions/streampipes-pipeline-elements-all-jvm/pom.xml
+++ b/streampipes-extensions/streampipes-pipeline-elements-all-jvm/pom.xml
@@ -45,6 +45,12 @@
<artifactId>streampipes-processors-filters-siddhi</artifactId>
<version>0.69.0-SNAPSHOT</version>
<classifier>embed</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
@@ -107,6 +113,10 @@
<artifactId>metrics-core</artifactId>
</dependency>
<dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.atteo.classindex</groupId>
<artifactId>classindex</artifactId>
</dependency>
diff --git a/streampipes-extensions/streampipes-pipeline-elements-data-simulator/pom.xml b/streampipes-extensions/streampipes-pipeline-elements-data-simulator/pom.xml
index 0a5ead4..8aab362 100644
--- a/streampipes-extensions/streampipes-pipeline-elements-data-simulator/pom.xml
+++ b/streampipes-extensions/streampipes-pipeline-elements-data-simulator/pom.xml
@@ -72,4 +72,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/pom.xml b/streampipes-extensions/streampipes-processors-aggregation-flink/pom.xml
index ce4ce40..8f7e546 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/pom.xml
+++ b/streampipes-extensions/streampipes-processors-aggregation-flink/pom.xml
@@ -67,6 +67,16 @@
<groupId>org.lz4</groupId>
<artifactId>lz4-java</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-xml_2.11</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- Test dependencies -->
@@ -79,11 +89,16 @@
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime_2.11</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-streaming-java_2.11</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils_2.11</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
diff --git a/streampipes-extensions/streampipes-processors-filters-siddhi/pom.xml b/streampipes-extensions/streampipes-processors-filters-siddhi/pom.xml
index 9da3dbc..74c13f9 100644
--- a/streampipes-extensions/streampipes-processors-filters-siddhi/pom.xml
+++ b/streampipes-extensions/streampipes-processors-filters-siddhi/pom.xml
@@ -27,6 +27,16 @@
<artifactId>streampipes-processors-filters-siddhi</artifactId>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<!-- StreamPipes dependencies -->
<dependency>
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/pom.xml b/streampipes-extensions/streampipes-processors-pattern-detection-flink/pom.xml
index cbbdcb6..72c4ee6 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/pom.xml
+++ b/streampipes-extensions/streampipes-processors-pattern-detection-flink/pom.xml
@@ -77,6 +77,17 @@
<artifactId>scala-parser-combinators_2.11</artifactId>
</dependency>
+ <!-- Dependency convergence -->
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-xml_2.11</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- Test dependencies -->
<dependency>
@@ -92,6 +103,10 @@
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime_2.11</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-streaming-java_2.11</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/pom.xml b/streampipes-extensions/streampipes-processors-text-mining-flink/pom.xml
index 2eacbda..43fef1d 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/pom.xml
+++ b/streampipes-extensions/streampipes-processors-text-mining-flink/pom.xml
@@ -68,6 +68,18 @@
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime_2.11</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-streaming-java_2.11</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-reflect</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-compiler</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/pom.xml b/streampipes-extensions/streampipes-processors-transformation-flink/pom.xml
index 9f6bbdd..a5b6597 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/pom.xml
+++ b/streampipes-extensions/streampipes-processors-transformation-flink/pom.xml
@@ -69,6 +69,10 @@
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime_2.11</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-streaming-java_2.11</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/pom.xml b/streampipes-extensions/streampipes-sinks-brokers-jvm/pom.xml
index cf87a4c..449e9cf 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/pom.xml
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/pom.xml
@@ -88,6 +88,14 @@
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/streampipes-extensions/streampipes-sources-vehicle-simulator/pom.xml b/streampipes-extensions/streampipes-sources-vehicle-simulator/pom.xml
index 37c2fe2..fb20161 100644
--- a/streampipes-extensions/streampipes-sources-vehicle-simulator/pom.xml
+++ b/streampipes-extensions/streampipes-sources-vehicle-simulator/pom.xml
@@ -32,6 +32,12 @@
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-pipeline-elements-data-simulator</artifactId>
<version>0.69.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- StreamPipes dependencies -->
diff --git a/streampipes-extensions/streampipes-sources-watertank-simulator/pom.xml b/streampipes-extensions/streampipes-sources-watertank-simulator/pom.xml
index 9d08a8d..d91a361 100644
--- a/streampipes-extensions/streampipes-sources-watertank-simulator/pom.xml
+++ b/streampipes-extensions/streampipes-sources-watertank-simulator/pom.xml
@@ -32,6 +32,12 @@
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-pipeline-elements-data-simulator</artifactId>
<version>0.69.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- StreamPipes dependencies -->
@@ -52,6 +58,12 @@
</dependency>
<!-- External dependencies -->
+
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>proton-j</artifactId>
+ <version>0.18.0</version>
+ </dependency>
</dependencies>
<build>
diff --git a/streampipes-maven-plugin/pom.xml b/streampipes-maven-plugin/pom.xml
index c976f6a..1523d9c 100644
--- a/streampipes-maven-plugin/pom.xml
+++ b/streampipes-maven-plugin/pom.xml
@@ -40,6 +40,26 @@
<version.roaster>2.20.8.Final</version.roaster>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>4.0</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>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -64,7 +84,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.6.0</version>
+ <version>3.6.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -86,7 +106,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
- <version>1.0-alpha-6</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -122,6 +142,20 @@
<version>1.24</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>
@@ -190,4 +224,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/streampipes-pipeline-management/pom.xml b/streampipes-pipeline-management/pom.xml
index 3eb1f21..52bf775 100644
--- a/streampipes-pipeline-management/pom.xml
+++ b/streampipes-pipeline-management/pom.xml
@@ -29,11 +29,6 @@
<dependencies>
<dependency>
<groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-code-generation</artifactId>
- <version>0.69.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-commons</artifactId>
<version>0.69.0-SNAPSHOT</version>
</dependency>
@@ -119,6 +114,10 @@
</dependency>
<!-- External dependencies -->
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
</dependency>
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/Deployment.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/Deployment.java
index e4dd8fc..6292ae6 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/Deployment.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/Deployment.java
@@ -18,7 +18,6 @@
package org.apache.streampipes.rest.impl;
-import org.apache.streampipes.codegeneration.api.CodeGenerator;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.client.deployment.DeploymentConfiguration;
import org.apache.streampipes.model.client.deployment.ElementType;
@@ -34,7 +33,6 @@ import org.glassfish.jersey.media.multipart.FormDataParam;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import java.io.File;
@Path("/v2/deploy")
@@ -53,15 +51,16 @@ public class Deployment extends AbstractRestResource {
throw new WebApplicationException(500);
}
- File f = CodeGenerator.getCodeGenerator(deploymentConfig, element).getGeneratedFile();
-
- if (!f.exists()) {
- throw new WebApplicationException(404);
- }
-
- return Response.ok(f)
- .header("Content-Disposition",
- "attachment; filename=" + f.getName()).build();
+// File f = CodeGenerator.getCodeGenerator(deploymentConfig, element).getGeneratedFile();
+//
+// if (!f.exists()) {
+// throw new WebApplicationException(404);
+// }
+//
+// return Response.ok(f)
+// .header("Content-Disposition",
+// "attachment; filename=" + f.getName()).build();
+ return Response.serverError().build();
}
public static NamedStreamPipesEntity getElement(DeploymentConfiguration config, String model) {
@@ -133,11 +132,11 @@ public class Deployment extends AbstractRestResource {
NamedStreamPipesEntity element = getElement(deploymentConfig, model);
- String java = CodeGenerator.getCodeGenerator(deploymentConfig, element).getDeclareModel();
+ //String java = CodeGenerator.getCodeGenerator(deploymentConfig, element).getDeclareModel();
try {
- return Response.ok(java).build();
+ return Response.ok().build();
} catch (IllegalArgumentException | SecurityException e) {
e.printStackTrace();
return Response.serverError().build();
diff --git a/streampipes-wrapper-siddhi/pom.xml b/streampipes-wrapper-siddhi/pom.xml
index ad9b180..ae90d27 100644
--- a/streampipes-wrapper-siddhi/pom.xml
+++ b/streampipes-wrapper-siddhi/pom.xml
@@ -27,6 +27,16 @@
<artifactId>streampipes-wrapper-siddhi</artifactId>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<!-- StreamPipes dependencies -->
<dependency>
@@ -57,6 +67,13 @@
<artifactId>siddhi-execution-list</artifactId>
<version>1.0.1</version>
</dependency>
+
+ <!-- Dependency convergence -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
</dependencies>
</project>
diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
index dc9ee0b..07fdc1f 100644
--- a/tools/maven/checkstyle.xml
+++ b/tools/maven/checkstyle.xml
@@ -60,6 +60,25 @@ page at http://checkstyle.sourceforge.net/config.html -->
<property name="fileNamePattern" value=".*Tests\.java$" />
</module>
+ <!--
+ LENGTH and CODING CHECKS
+ -->
+
+ <module name="LineLength">
+ <!-- Checks if a line is too long. -->
+ <property name="max" value="120"/>
+ <property name="severity" value="error"/>
+
+ <!--
+ The default ignore pattern exempts the following elements:
+ - import statements
+ - long URLs inside comments
+ -->
+
+ <property name="ignorePattern"
+ value="^(package .*;\s*)|(import .*;\s*)|( *\* .*https?://.*)$"/>
+ </module>
+
<!-- Check that every module has a package-info.java -->
<!--<module name="JavadocPackage"/>-->
@@ -272,25 +291,6 @@ page at http://checkstyle.sourceforge.net/config.html -->
<property name="severity" value="error"/>
</module>
- <!--
- LENGTH and CODING CHECKS
- -->
-
- <module name="LineLength">
- <!-- Checks if a line is too long. -->
- <property name="max" value="120"/>
- <property name="severity" value="error"/>
-
- <!--
- The default ignore pattern exempts the following elements:
- - import statements
- - long URLs inside comments
- -->
-
- <property name="ignorePattern"
- value="^(package .*;\s*)|(import .*;\s*)|( *\* .*https?://.*)$"/>
- </module>
-
<module name="LeftCurly">
<!-- Checks for placement of the left curly brace ('{'). -->
<property name="severity" value="error"/>