Skip to content

Commit

Permalink
prepare for release 5.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mastastny committed Jul 7, 2023
1 parent 9a8137e commit 3a29af5
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 34 deletions.
12 changes: 5 additions & 7 deletions checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,16 @@
<!-- Checks for whitespace -->
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
<module name="FileTabCharacter"/>

<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
<module name="LineLength">
<property name="max" value="120"/>
</module>
<module name="TreeWalker">
<!-- Checks for Javadoc comments. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
<module name="JavadocMethod">
<property name="scope" value="public"/>
<property name="allowMissingPropertyJavadoc" value="true"/>
<property name="severity" value="warning"/>
</module>
<module name="JavadocType">
Expand Down Expand Up @@ -64,11 +67,6 @@
<module name="RedundantImport"/>
<module name="UnusedImports"/>

<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
<module name="LineLength">
<property name="max" value="120"/>
</module>
<module name="MethodLength">
<property name="max" value="30"/>
<property name="countEmpty" value="false"/>
Expand Down
68 changes: 41 additions & 27 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
~ limitations under the License.
-->

<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>

<groupId>io.patriot-framework</groupId>
<artifactId>docker-network-simulator</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>5.0.0</version>

<name>Docker controller for simulation</name>
<description>
Expand Down Expand Up @@ -129,10 +130,10 @@
</distributionManagement>
<properties>
<org.junit.platform.version>1.3.0</org.junit.platform.version>
<org.junit.jupiter.version>5.9.2</org.junit.jupiter.version>
<maven-surefire-plugin.version>3.0.0-M8</maven-surefire-plugin.version>
<com.github.docker-java.version>3.2.14</com.github.docker-java.version>
<org.slf4j.version>2.0.6</org.slf4j.version>
<org.junit.jupiter.version>5.9.3</org.junit.jupiter.version>
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
<com.github.docker-java.version>3.3.1</com.github.docker-java.version>
<org.slf4j.version>2.0.7</org.slf4j.version>
<org.codehouse.mojo.version>3.1.0</org.codehouse.mojo.version>
<org.args4j.version>2.33</org.args4j.version>
<org.etcd4j.version>2.18.0</org.etcd4j.version>
Expand All @@ -146,7 +147,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<configuration>
<release>17:q</release>
<release>17</release>
</configuration>
</plugin>
<plugin>
Expand All @@ -172,7 +173,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
<executions>
<execution>
<id>validate</id>
Expand All @@ -193,22 +194,27 @@
</plugins>
</build>
<dependencies>
<dependency>
<groupId>io.patriot-framework</groupId>
<artifactId>patriot-api</artifactId>
<version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${org.slf4j.version}</version>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
<version>${com.github.docker-java.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${org.junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
<version>${com.github.docker-java.version}</version>
</dependency>
<dependency>
<groupId>args4j</groupId>
<artifactId>args4j</artifactId>
Expand All @@ -222,14 +228,13 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>4.0.1</version>
<version>4.0.3</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>4.0.1</version>
<version>4.0.3</version>
</dependency>

<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
Expand All @@ -240,13 +245,6 @@
<artifactId>etcd4j</artifactId>
<version>${org.etcd4j.version}</version>
</dependency>
<!-- Jackson-databind is there only because etcd4j uses newer jackson (2.10) and it clashes with patriot-api (2.8),
I have forced the newer version to make it work, can be deleted once patriot-api is updated -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.10.2</version>
</dependency>
<!--Removes vulnerability from dependency of etc4j-->
<dependency>
<groupId>io.netty</groupId>
Expand All @@ -259,13 +257,29 @@
<artifactId>netty-handler</artifactId>
<version>4.1.87.Final</version>
</dependency>
<!--Todo: after bump of patriot-api bump also version of jackson-databind-->
<!--Removes vulnerability from dependency of etc4j-->
<dependency>
<groupId>io.patriot-framework</groupId>
<artifactId>patriot-api</artifactId>
<version>2.0.1-SNAPSHOT</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
</dependencies>

<profiles>
<profile>
<id>release</id>
Expand Down

0 comments on commit 3a29af5

Please sign in to comment.