From a11a47835a81bbc93e5fde83a2db28b23d14c56a Mon Sep 17 00:00:00 2001 From: Martin Goik <goik@hdm-stuttgart.de> Date: Mon, 4 Jul 2016 13:42:56 +0200 Subject: [PATCH] Mysql version alignment --- P/Persist/Airline/airline_basic/pom.xml | 1 - P/Persist/Airline/airline_key/pom.xml | 1 - P/Sda1/InsertGui/V10/pom.xml | 1 - P/Sda1/InsertGui/V12/pom.xml | 1 - P/Sda1/InsertGui/V2/pom.xml | 1 - P/Sda1/InsertGui/V4/pom.xml | 1 - P/Sda1/InsertGui/V6/pom.xml | 1 - P/Sda1/InsertGui/V8/pom.xml | 1 - P/Sda1/Jpa/Company/companyJpa1/pom.xml | 1 - P/Sda1/Jpa/HibernateStandalone/pom.xml | 3 +- P/Sda1/Jpa/LectureOperations/pom.xml | 1 - P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml | 1 - P/Sda1/Jpa/rdbms2catalog/solution/pom.xml | 3 +- .../PersistenceHandler/Authenticate/pom.xml | 1 - .../PreparedStatement/pom.xml | 2 - .../de/hdm_stuttgart/mi/database.properties | 2 +- P/Sda1/PersistenceHandler/Statement/pom.xml | 1 - P/Sda1/catalog2rdbms/pom.xml | 1 - P/Sda1/catalog2rdbmsPrepare/pom.xml | 1 - P/Sda1/rdbms2catalog/pom.xml | 1 - P/Sda1/rdbmsXml2Html/pom.xml | 1 - P/Sda2/Jpa/Cd/pom.xml | 1 - P/Sda2/Jpa/HibernateCacheDemo/pom.xml | 1 - P/Sda2/Jpa/Inherit/Tpch/pom.xml | 1 - P/Sda2/Jpa/University/pom.xml | 1 - P/Sda2/Register/pom.xml | 1 - P/Sda2/UnixSqlLdap/Jndi/Rdbms2Ldap/pom.xml | 1 - P/Sda2/account/pom.xml | 1 - P/Sda2/forum_1/pom.xml | 1 - pom.xml | 195 +++++++++--------- ws/eclipse/Jdbc/pom.xml | 2 +- 31 files changed, 107 insertions(+), 125 deletions(-) diff --git a/P/Persist/Airline/airline_basic/pom.xml b/P/Persist/Airline/airline_basic/pom.xml index 2e8e70d13..486bb4136 100644 --- a/P/Persist/Airline/airline_basic/pom.xml +++ b/P/Persist/Airline/airline_basic/pom.xml @@ -29,7 +29,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.38</version> </dependency> </dependencies> diff --git a/P/Persist/Airline/airline_key/pom.xml b/P/Persist/Airline/airline_key/pom.xml index 87480abd1..0cf8b0771 100644 --- a/P/Persist/Airline/airline_key/pom.xml +++ b/P/Persist/Airline/airline_key/pom.xml @@ -29,7 +29,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.38</version> </dependency> </dependencies> diff --git a/P/Sda1/InsertGui/V10/pom.xml b/P/Sda1/InsertGui/V10/pom.xml index 0754f04f4..6a63185cb 100644 --- a/P/Sda1/InsertGui/V10/pom.xml +++ b/P/Sda1/InsertGui/V10/pom.xml @@ -91,7 +91,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.36</version> </dependency> </dependencies> diff --git a/P/Sda1/InsertGui/V12/pom.xml b/P/Sda1/InsertGui/V12/pom.xml index 546adb06f..6e5de11de 100644 --- a/P/Sda1/InsertGui/V12/pom.xml +++ b/P/Sda1/InsertGui/V12/pom.xml @@ -91,7 +91,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.36</version> </dependency> </dependencies> diff --git a/P/Sda1/InsertGui/V2/pom.xml b/P/Sda1/InsertGui/V2/pom.xml index 9c6a05882..a74d653a6 100644 --- a/P/Sda1/InsertGui/V2/pom.xml +++ b/P/Sda1/InsertGui/V2/pom.xml @@ -87,7 +87,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.35</version> </dependency> </dependencies> diff --git a/P/Sda1/InsertGui/V4/pom.xml b/P/Sda1/InsertGui/V4/pom.xml index eecf1f218..ed496b4cd 100644 --- a/P/Sda1/InsertGui/V4/pom.xml +++ b/P/Sda1/InsertGui/V4/pom.xml @@ -87,7 +87,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.35</version> </dependency> </dependencies> diff --git a/P/Sda1/InsertGui/V6/pom.xml b/P/Sda1/InsertGui/V6/pom.xml index 6d6074a39..a3e61ea1c 100644 --- a/P/Sda1/InsertGui/V6/pom.xml +++ b/P/Sda1/InsertGui/V6/pom.xml @@ -90,7 +90,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.36</version> </dependency> </dependencies> diff --git a/P/Sda1/InsertGui/V8/pom.xml b/P/Sda1/InsertGui/V8/pom.xml index d80504d4a..2e6bea14b 100644 --- a/P/Sda1/InsertGui/V8/pom.xml +++ b/P/Sda1/InsertGui/V8/pom.xml @@ -91,7 +91,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.36</version> </dependency> </dependencies> diff --git a/P/Sda1/Jpa/Company/companyJpa1/pom.xml b/P/Sda1/Jpa/Company/companyJpa1/pom.xml index b487cd0df..fb19e0559 100644 --- a/P/Sda1/Jpa/Company/companyJpa1/pom.xml +++ b/P/Sda1/Jpa/Company/companyJpa1/pom.xml @@ -143,7 +143,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.mysql-connector-java.version}</version> </dependency> </dependencies> diff --git a/P/Sda1/Jpa/HibernateStandalone/pom.xml b/P/Sda1/Jpa/HibernateStandalone/pom.xml index 50ae3dd3e..26dc15a03 100644 --- a/P/Sda1/Jpa/HibernateStandalone/pom.xml +++ b/P/Sda1/Jpa/HibernateStandalone/pom.xml @@ -29,7 +29,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.38</version> </dependency> <dependency> @@ -62,4 +61,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/P/Sda1/Jpa/LectureOperations/pom.xml b/P/Sda1/Jpa/LectureOperations/pom.xml index 15b442006..4a325864e 100644 --- a/P/Sda1/Jpa/LectureOperations/pom.xml +++ b/P/Sda1/Jpa/LectureOperations/pom.xml @@ -29,7 +29,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.38</version> </dependency> <dependency> diff --git a/P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml b/P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml index 543f71d98..a3515a9cf 100644 --- a/P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml +++ b/P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml @@ -83,7 +83,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.mysql-connector-java.version}</version> </dependency> <dependency> diff --git a/P/Sda1/Jpa/rdbms2catalog/solution/pom.xml b/P/Sda1/Jpa/rdbms2catalog/solution/pom.xml index 0a93b2107..8a5aa69b2 100644 --- a/P/Sda1/Jpa/rdbms2catalog/solution/pom.xml +++ b/P/Sda1/Jpa/rdbms2catalog/solution/pom.xml @@ -29,7 +29,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.mysql-connector-java.version}</version> </dependency> <dependency> @@ -68,4 +67,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/P/Sda1/PersistenceHandler/Authenticate/pom.xml b/P/Sda1/PersistenceHandler/Authenticate/pom.xml index b67e16946..59f3aee48 100644 --- a/P/Sda1/PersistenceHandler/Authenticate/pom.xml +++ b/P/Sda1/PersistenceHandler/Authenticate/pom.xml @@ -20,7 +20,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.36</version> </dependency> <dependency> diff --git a/P/Sda1/PersistenceHandler/PreparedStatement/pom.xml b/P/Sda1/PersistenceHandler/PreparedStatement/pom.xml index d5e7fa94c..1c06d8555 100644 --- a/P/Sda1/PersistenceHandler/PreparedStatement/pom.xml +++ b/P/Sda1/PersistenceHandler/PreparedStatement/pom.xml @@ -20,9 +20,7 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.36</version> </dependency> - </dependencies> </project> diff --git a/P/Sda1/PersistenceHandler/PreparedStatement/src/main/resources/de/hdm_stuttgart/mi/database.properties b/P/Sda1/PersistenceHandler/PreparedStatement/src/main/resources/de/hdm_stuttgart/mi/database.properties index f6cef81b4..234ebbba5 100644 --- a/P/Sda1/PersistenceHandler/PreparedStatement/src/main/resources/de/hdm_stuttgart/mi/database.properties +++ b/P/Sda1/PersistenceHandler/PreparedStatement/src/main/resources/de/hdm_stuttgart/mi/database.properties @@ -1,4 +1,4 @@ PersistenceHandler.driverClassName=com.mysql.jdbc.Driver -PersistenceHandler.jdbcUrl=jdbc:mysql://localhost:3306/hdm +PersistenceHandler.jdbcUrl=jdbc:mysql://localhost:3306/hdm?useSSL=false PersistenceHandler.username=hdmuser PersistenceHandler.password=XYZ diff --git a/P/Sda1/PersistenceHandler/Statement/pom.xml b/P/Sda1/PersistenceHandler/Statement/pom.xml index a00f3ec1b..b48f0be38 100644 --- a/P/Sda1/PersistenceHandler/Statement/pom.xml +++ b/P/Sda1/PersistenceHandler/Statement/pom.xml @@ -20,7 +20,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.36</version> </dependency> </dependencies> diff --git a/P/Sda1/catalog2rdbms/pom.xml b/P/Sda1/catalog2rdbms/pom.xml index 1ee4d5ed7..b1ac4d5d7 100644 --- a/P/Sda1/catalog2rdbms/pom.xml +++ b/P/Sda1/catalog2rdbms/pom.xml @@ -30,7 +30,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.mysql-connector-java.version}</version> </dependency> </dependencies> diff --git a/P/Sda1/catalog2rdbmsPrepare/pom.xml b/P/Sda1/catalog2rdbmsPrepare/pom.xml index 294a94a97..062f181b2 100644 --- a/P/Sda1/catalog2rdbmsPrepare/pom.xml +++ b/P/Sda1/catalog2rdbmsPrepare/pom.xml @@ -30,7 +30,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.mysql-connector-java.version}</version> </dependency> </dependencies> diff --git a/P/Sda1/rdbms2catalog/pom.xml b/P/Sda1/rdbms2catalog/pom.xml index 5616397ad..0a8089814 100644 --- a/P/Sda1/rdbms2catalog/pom.xml +++ b/P/Sda1/rdbms2catalog/pom.xml @@ -29,7 +29,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.mysql-connector-java.version}</version> </dependency> </dependencies> diff --git a/P/Sda1/rdbmsXml2Html/pom.xml b/P/Sda1/rdbmsXml2Html/pom.xml index d8fdcbb90..47b76e081 100644 --- a/P/Sda1/rdbmsXml2Html/pom.xml +++ b/P/Sda1/rdbmsXml2Html/pom.xml @@ -35,7 +35,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.mysql-connector-java.version}</version> </dependency> </dependencies> diff --git a/P/Sda2/Jpa/Cd/pom.xml b/P/Sda2/Jpa/Cd/pom.xml index 52d1fe94b..0cf5b62af 100644 --- a/P/Sda2/Jpa/Cd/pom.xml +++ b/P/Sda2/Jpa/Cd/pom.xml @@ -22,7 +22,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.mysql-connector-java.version}</version> </dependency> <dependency> diff --git a/P/Sda2/Jpa/HibernateCacheDemo/pom.xml b/P/Sda2/Jpa/HibernateCacheDemo/pom.xml index 8b6ae219c..ee8d3260e 100644 --- a/P/Sda2/Jpa/HibernateCacheDemo/pom.xml +++ b/P/Sda2/Jpa/HibernateCacheDemo/pom.xml @@ -32,7 +32,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.mysql-connector-java.version}</version> </dependency> <!-- diff --git a/P/Sda2/Jpa/Inherit/Tpch/pom.xml b/P/Sda2/Jpa/Inherit/Tpch/pom.xml index e81b9f8c5..25b9d73cb 100644 --- a/P/Sda2/Jpa/Inherit/Tpch/pom.xml +++ b/P/Sda2/Jpa/Inherit/Tpch/pom.xml @@ -22,7 +22,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.mysql-connector-java.version}</version> </dependency> <dependency> diff --git a/P/Sda2/Jpa/University/pom.xml b/P/Sda2/Jpa/University/pom.xml index 732eb2576..9c0fbb9b3 100644 --- a/P/Sda2/Jpa/University/pom.xml +++ b/P/Sda2/Jpa/University/pom.xml @@ -22,7 +22,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.mysql-connector-java.version}</version> </dependency> <dependency> diff --git a/P/Sda2/Register/pom.xml b/P/Sda2/Register/pom.xml index 5242db9fd..1bfda956d 100644 --- a/P/Sda2/Register/pom.xml +++ b/P/Sda2/Register/pom.xml @@ -98,7 +98,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.mysql-connector-java.version}</version> </dependency> </dependencies> diff --git a/P/Sda2/UnixSqlLdap/Jndi/Rdbms2Ldap/pom.xml b/P/Sda2/UnixSqlLdap/Jndi/Rdbms2Ldap/pom.xml index 52f760169..21ebb2274 100644 --- a/P/Sda2/UnixSqlLdap/Jndi/Rdbms2Ldap/pom.xml +++ b/P/Sda2/UnixSqlLdap/Jndi/Rdbms2Ldap/pom.xml @@ -21,7 +21,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.mysql-connector-java.version}</version> </dependency> </dependencies> diff --git a/P/Sda2/account/pom.xml b/P/Sda2/account/pom.xml index f62910f92..6a44628c3 100644 --- a/P/Sda2/account/pom.xml +++ b/P/Sda2/account/pom.xml @@ -24,7 +24,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.mysql-connector-java.version}</version> </dependency> <dependency> diff --git a/P/Sda2/forum_1/pom.xml b/P/Sda2/forum_1/pom.xml index cb5d68c3d..ee1be78aa 100644 --- a/P/Sda2/forum_1/pom.xml +++ b/P/Sda2/forum_1/pom.xml @@ -106,7 +106,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.mysql-connector-java.version}</version> </dependency> <!-- JPAcontainer stuff --> diff --git a/pom.xml b/pom.xml index eb2f9a781..ffffa684c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,95 +1,106 @@ <!-- This file is used to build and run all the examples --> -<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> - - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - - <!-- dependencies --> - <jaxen.jaxen.version>1.1.6</jaxen.jaxen.version> - <mysql.mysql-connector-java.version>5.1.36</mysql.mysql-connector-java.version> - <org.jdom.jdom2.version>2.0.6</org.jdom.jdom2.version> - - <!-- Maven plugins --> - <org.apache.maven.plugins.maven-jar-plugin>2.6</org.apache.maven.plugins.maven-jar-plugin> - - </properties> - - - - <groupId>de.hdm-stuttgart.mi</groupId> - <artifactId>lecturenotes-base-pom</artifactId> - <version>1.0</version> - <packaging>pom</packaging> - - <name>Martin Goik lecture notes</name> - <url>http://www.mi.hdm-stuttgart.de/freedocs</url> - - <modules> - <module>ws/eclipse/HtmlExtensionTaglet</module> - <module>ws/Docbook/Dbtools</module> - <module>ws/eclipse/Jdbc</module> - <module>P</module> - </modules> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.2</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration> - <linksource>true</linksource> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.5</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.5.2</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.5</version> - </plugin> - - </plugins> - - </build> - - <dependencies> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>2.6</version> - </dependency> - </dependencies> +<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> + + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + + <!-- dependencies --> + <jaxen.jaxen.version>1.1.6</jaxen.jaxen.version> + <org.jdom.jdom2.version>2.0.6</org.jdom.jdom2.version> + + <!-- Maven plugins --> + <org.apache.maven.plugins.maven-jar-plugin>2.6</org.apache.maven.plugins.maven-jar-plugin> + + </properties> + + + + <groupId>de.hdm-stuttgart.mi</groupId> + <artifactId>lecturenotes-base-pom</artifactId> + <version>1.0</version> + <packaging>pom</packaging> + + <name>Martin Goik lecture notes</name> + <url>http://www.mi.hdm-stuttgart.de/freedocs</url> + + <modules> + <module>ws/eclipse/HtmlExtensionTaglet</module> + <module>ws/Docbook/Dbtools</module> + <module>ws/eclipse/Jdbc</module> + <module>P</module> + </modules> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.2</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.1</version> + <configuration> + <linksource>true</linksource> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.5</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.5.2</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.5</version> + </plugin> + + </plugins> + + </build> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.39</version> + </dependency> + </dependencies> + + </dependencyManagement> + + <dependencies> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.6</version> + </dependency> + </dependencies> </project> diff --git a/ws/eclipse/Jdbc/pom.xml b/ws/eclipse/Jdbc/pom.xml index 78f0949b2..96dd86c37 100644 --- a/ws/eclipse/Jdbc/pom.xml +++ b/ws/eclipse/Jdbc/pom.xml @@ -32,7 +32,7 @@ <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> - <version>1.1.4</version> + <version>1.1.6</version> </dependency> <dependency> -- GitLab