From 67d8627c727b70bb6de9fae0760a8ae4bf363dfc Mon Sep 17 00:00:00 2001
From: "Dr. Martin Goik" <goik@hdm-stuttgart.de>
Date: Sun, 2 Dec 2018 17:47:15 +0100
Subject: [PATCH] Dependency upgrades
---
.../Ref/JpaIntro/P/StudyCourse_basic/pom.xml | 49 ++++++++++++-------
.../mi/sda1/JpqlReadAllStudyCourses.java | 2 -
.../JpaIntro/P/StudyCourse_surrogate/pom.xml | 28 ++++++++---
3 files changed, 52 insertions(+), 27 deletions(-)
diff --git a/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/pom.xml b/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/pom.xml
index def136bc5..877df6832 100644
--- a/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/pom.xml
+++ b/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/pom.xml
@@ -13,7 +13,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <hibernate.version>5.2.12.Final</hibernate.version>
+ <hibernate.version>5.3.7.Final</hibernate.version>
<querydsl.version>3.7.4</querydsl.version>
</properties>
@@ -35,6 +35,19 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.mysema.querydsl</groupId>
+ <artifactId>querydsl-apt</artifactId>
+ <version>${querydsl.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.mysema.querydsl</groupId>
+ <artifactId>querydsl-jpa</artifactId>
+ <version>${querydsl.version}</version>
+ </dependency>
+
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
@@ -49,16 +62,15 @@
</dependency>
<dependency>
- <groupId>com.mysema.querydsl</groupId>
- <artifactId>querydsl-apt</artifactId>
- <version>${querydsl.version}</version>
- <scope>provided</scope>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
</dependency>
<dependency>
- <groupId>com.mysema.querydsl</groupId>
- <artifactId>querydsl-jpa</artifactId>
- <version>${querydsl.version}</version>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
</dependency>
<dependency>
@@ -72,7 +84,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.3</version>
+ <version>2.9.7</version>
</dependency>
</dependencies>
@@ -93,16 +105,21 @@
<plugin>
<groupId>com.mysema.maven</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <version>1.0.4</version>
+ <artifactId>apt-maven-plugin</artifactId>
+ <version>1.1.3</version>
<executions>
<execution>
+ <id>process</id>
<goals>
<goal>process</goal>
</goals>
+ <phase>generate-sources</phase>
<configuration>
<outputDirectory>${project.build.directory}/metamodel</outputDirectory>
<processor>com.mysema.query.apt.jpa.JPAAnnotationProcessor</processor>
+ <options>
+ <querydsl.includedPackages>de.hdm_stuttgart.mi.sda1.model</querydsl.includedPackages>
+ </options>
</configuration>
</execution>
</executions>
@@ -111,7 +128,7 @@
<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.3</version>
<executions>
<execution>
@@ -151,16 +168,10 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.1</version>
<configuration>
<transformers>
<transformer
diff --git a/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/src/main/java/de/hdm_stuttgart/mi/sda1/JpqlReadAllStudyCourses.java b/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/src/main/java/de/hdm_stuttgart/mi/sda1/JpqlReadAllStudyCourses.java
index 9799ca5d9..499878069 100644
--- a/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/src/main/java/de/hdm_stuttgart/mi/sda1/JpqlReadAllStudyCourses.java
+++ b/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_basic/src/main/java/de/hdm_stuttgart/mi/sda1/JpqlReadAllStudyCourses.java
@@ -44,8 +44,6 @@ public class JpqlReadAllStudyCourses {
map(s -> "Read '" + s + "'").
forEach(System.out::println);
}
-
-
factory.close();
}
}
\ No newline at end of file
diff --git a/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_surrogate/pom.xml b/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_surrogate/pom.xml
index b4e9b1681..e0adb2efc 100644
--- a/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_surrogate/pom.xml
+++ b/Doc/Sda1/Ref/JpaIntro/P/StudyCourse_surrogate/pom.xml
@@ -13,7 +13,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <hibernate.version>5.2.12.Final</hibernate.version>
+ <hibernate.version>5.3.7.Final</hibernate.version>
<querydsl.version>3.7.4</querydsl.version>
</properties>
@@ -45,6 +45,18 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+
<dependency>
<groupId>com.mysema.querydsl</groupId>
<artifactId>querydsl-apt</artifactId>
@@ -69,7 +81,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.3</version>
+ <version>2.9.7</version>
</dependency>
</dependencies>
@@ -89,16 +101,21 @@
<plugin>
<groupId>com.mysema.maven</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <version>1.0.4</version>
+ <artifactId>apt-maven-plugin</artifactId>
+ <version>1.1.3</version>
<executions>
<execution>
+ <id>process</id>
<goals>
<goal>process</goal>
</goals>
+ <phase>generate-sources</phase>
<configuration>
<outputDirectory>${project.build.directory}/metamodel</outputDirectory>
<processor>com.mysema.query.apt.jpa.JPAAnnotationProcessor</processor>
+ <options>
+ <querydsl.includedPackages>de.hdm_stuttgart.mi.sda1.model</querydsl.includedPackages>
+ </options>
</configuration>
</execution>
</executions>
@@ -108,7 +125,6 @@
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
<version>3.2.0</version>
-
<executions>
<execution>
<id>process</id>
@@ -156,7 +172,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.1</version>
<configuration>
<transformers>
<transformer
--
GitLab