Skip to content

Feature/dependency updates 08 2020 #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 2, 2020
Merged

Feature/dependency updates 08 2020 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b598608
Update critical dependencies
ferstl Aug 2, 2020
e8ab0f1
Use Maven 3.6.3
ferstl Aug 2, 2020
04dcb5a
Update dependencies and plugins
ferstl Aug 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,32 +78,32 @@
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
<maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
<maven-project-info-reports-plugin.version>3.1.0</maven-project-info-reports-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
<maven-scm-publish-plugin.version>3.0.0</maven-scm-publish-plugin.version>
<maven-source-plugin.version>3.1.0</maven-source-plugin.version>
<maven-site-plugin.version>3.7.1</maven-site-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-site-plugin.version>3.9.1</maven-site-plugin.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.4</jacoco-maven-plugin.version>
<takari-lifecycle-plugin.version>1.13.9</takari-lifecycle-plugin.version>
<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
<takari-lifecycle-plugin.version>1.13.10</takari-lifecycle-plugin.version>

<!-- Other settings. -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.version>3.6.1</maven.version>
<maven.version>3.6.3</maven.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.4.2</version>
<version>5.6.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -114,13 +114,13 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.10.3</version>
<version>2.11.0</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>28.0-jre</version>
<version>29.0-jre</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -205,7 +205,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.28.2</version>
<version>3.4.6</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/github/ferstl/depgraph/MavenVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
public final class MavenVersion {

public static final String MIN_VERSION = "3.1.0";
public static final String MAX_VERSION = "3.6.1";
public static final String MAX_VERSION = "3.6.3";

private MavenVersion() {
throw new AssertionError("not instantiable");
Expand Down
4 changes: 2 additions & 2 deletions src/test/projects/depgraph-maven-plugin-test/expectations/graph_module-2.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ node [
id "com.google.guava:guava:jar"
label "com.google.guava
guava
21.0"
29.0-jre"
]

node [
Expand All @@ -39,7 +39,7 @@ id "org.springframework:spring-core:jar"
label "<optional>
org.springframework
spring-core
5.0.7.RELEASE"
5.2.8.RELEASE"
]

node [
Expand Down
4 changes: 2 additions & 2 deletions src/test/projects/depgraph-maven-plugin-test/expectations/graph_module-2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"numericId" : 5,
"groupId" : "com.google.guava",
"artifactId" : "guava",
"version" : "21.0",
"version" : "29.0-jre",
"optional" : false,
"scopes" : [ "compile" ],
"types" : [ "jar" ]
Expand All @@ -50,7 +50,7 @@
"numericId" : 6,
"groupId" : "org.springframework",
"artifactId" : "spring-core",
"version" : "5.0.7.RELEASE",
"version" : "5.2.8.RELEASE",
"optional" : true,
"scopes" : [ "compile" ],
"types" : [ "jar" ]
Expand Down
4 changes: 2 additions & 2 deletions src/test/projects/depgraph-maven-plugin-test/expectations/graph_module-2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module-2:1.0.0-SNAPSHOT:compile
+- module-1:1.0.0-SNAPSHOT:compile
+- guava:21.0:compile
+- guava:29.0-jre:compile
+- commons-codec:1.10:compile
+- commons-lang3:3.0:compile
+- spring-core:5.0.7.RELEASE:compile (optional)
+- spring-core:5.2.8.RELEASE:compile (optional)
\- junit:4.12:test
\- hamcrest-core:1.3:test
2 changes: 1 addition & 1 deletion src/test/projects/depgraph-maven-plugin-test/expectations/graph_module-3.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ node [
id "com.google.guava:guava:jar"
label "com.google.guava
guava
21.0"
29.0-jre"
]

node [
Expand Down
2 changes: 1 addition & 1 deletion src/test/projects/depgraph-maven-plugin-test/expectations/graph_module-3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"numericId" : 6,
"groupId" : "com.google.guava",
"artifactId" : "guava",
"version" : "21.0",
"version" : "29.0-jre",
"optional" : false,
"scopes" : [ "compile" ],
"types" : [ "jar" ]
Expand Down
2 changes: 1 addition & 1 deletion src/test/projects/depgraph-maven-plugin-test/expectations/graph_module-3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module-3:1.0.0-SNAPSHOT:compile
| +- commons-codec:1.10:compile
| \- commons-lang3:3.1:compile
+- module-2:1.0.0-SNAPSHOT:compile
| \- guava:21.0:compile
| \- guava:29.0-jre:compile
\- querydsl-core:3.7.4:compile
+- jsr305:1.3.9:compile
+- mysema-commons-lang:0.2.4:compile
Expand Down
2 changes: 1 addition & 1 deletion src/test/projects/depgraph-maven-plugin-test/expectations/graph_sub-parent.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ node [
id "com.google.guava:guava:jar"
label "com.google.guava
guava
21.0"
29.0-jre"
]

node [
Expand Down
2 changes: 1 addition & 1 deletion src/test/projects/depgraph-maven-plugin-test/expectations/graph_sub-parent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"numericId" : 5,
"groupId" : "com.google.guava",
"artifactId" : "guava",
"version" : "21.0",
"version" : "29.0-jre",
"optional" : false,
"scopes" : [ "compile" ],
"types" : [ "jar" ]
Expand Down
2 changes: 1 addition & 1 deletion src/test/projects/depgraph-maven-plugin-test/expectations/graph_sub-parent.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sub-parent:1.0.0-SNAPSHOT:compile
\- module-2:1.0.0-SNAPSHOT:compile
+- module-1:1.0.0-SNAPSHOT:compile
+- guava:21.0:compile
+- guava:29.0-jre:compile
+- commons-codec:1.10:compile
\- commons-lang3:3.0:compile
156 changes: 81 additions & 75 deletions src/test/projects/depgraph-maven-plugin-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,81 @@
<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>com.github.ferstl</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
<module>module-1</module>
<module>module-2</module>
<module>sub-parent</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.mysema.querydsl</groupId>
<artifactId>querydsl-core</artifactId>
<version>3.7.4</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.10</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>21.0</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>5.0.7.RELEASE</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>com.github.ferstl</groupId>
<artifactId>depgraph-maven-plugin</artifactId>
<version>${it-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
<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>com.github.ferstl</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
<module>module-1</module>
<module>module-2</module>
<module>sub-parent</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.mysema.querydsl</groupId>
<artifactId>querydsl-core</artifactId>
<version>3.7.4</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.10</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>29.0-jre</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>5.2.8.RELEASE</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>com.github.ferstl</groupId>
<artifactId>depgraph-maven-plugin</artifactId>
<version>${it-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion src/test/projects/multiple-parents/module-other-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.12.RELEASE</version>
<version>2.3.2.RELEASE</version>
<relativePath/>
</parent>

Expand Down
Loading