From 1635e41a75598335c50ee50ef465c79b12816a61 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Wed, 16 Sep 2015 10:21:51 +0200
Subject: [PATCH] Pom version variables, removing some redundencies
---
P/Sd1/TicTacToe/V1/pom.xml | 36 +++++--------------
P/Sda1/Jpa/Company/companyJpa1/pom.xml | 17 +++++----
P/Sda1/Jpa/HibernateStandalone/pom.xml | 24 ++++++-------
P/Sda1/Jpa/LectureOperations/pom.xml | 20 +++++------
P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml | 34 +++++-------------
P/Sda1/Jpa/rdbms2catalog/solution/pom.xml | 15 ++------
P/Sda1/NoCast/pom.xml | 4 +--
P/Sda1/VerifyImgAccess/pom.xml | 4 +--
P/Sda1/catalog2rdbms/pom.xml | 14 +-------
P/Sda1/catalog2rdbmsPrepare/pom.xml | 14 +-------
P/Sda1/catalog2sql/pom.xml | 12 -------
P/Sda1/rdbms2catalog/pom.xml | 15 ++------
P/Sda1/saxerrorhandler/pom.xml | 16 ---------
P/Sda1/xmlstatistics/pom.xml | 16 ++-------
P/Sda2/Jpa/Cd/pom.xml | 12 +------
P/Sda2/Jpa/HibernateCacheDemo/pom.xml | 2 +-
P/Sda2/Jpa/Inherit/Tpch/pom.xml | 13 +------
P/Sda2/Jpa/University/pom.xml | 13 +------
P/Sda2/Register/pom.xml | 2 +-
P/Sda2/UnixSqlLdap/Jndi/Rdbms2Ldap/pom.xml | 14 +-------
P/Sda2/UnixSqlLdap/Jndi/Unix2Rdbms/pom.xml | 8 +----
.../mi/sda2/usermanage/parse/Group.java | 7 ++--
.../sda2/usermanage/rdbms/RdbmsHandler.java | 6 ++--
P/Sda2/account/pom.xml | 14 ++------
.../mi/sda2/account/sql/DbHandler.java | 6 ++--
P/Sda2/forum_1/pom.xml | 3 +-
pom.xml | 13 +++++--
27 files changed, 87 insertions(+), 267 deletions(-)
diff --git a/P/Sd1/TicTacToe/V1/pom.xml b/P/Sd1/TicTacToe/V1/pom.xml
index ce427dcc4..463e960bb 100644
--- a/P/Sd1/TicTacToe/V1/pom.xml
+++ b/P/Sd1/TicTacToe/V1/pom.xml
@@ -1,6 +1,14 @@
<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>
+ <groupId>de.hdm-stuttgart.mi</groupId>
+ <artifactId>lecturenotes-pom</artifactId>
+ <version>1.0</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+
+
<groupId>de.hdm-stuttgart.mi.sd1</groupId>
<artifactId>connectfour</artifactId>
<version>1.0</version>
@@ -8,33 +16,7 @@
<name>connectfour</name>
- <!--Fixme: Add a sensible project related domain here -->
- <url>http://somedomain.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.1</version>
- </dependency>
-
- </dependencies>
+ <url>http://www.mi.hdm-stuttgart.de/freedocs</url>
<build>
<plugins>
diff --git a/P/Sda1/Jpa/Company/companyJpa1/pom.xml b/P/Sda1/Jpa/Company/companyJpa1/pom.xml
index 99605fa82..8572e1dd5 100644
--- a/P/Sda1/Jpa/Company/companyJpa1/pom.xml
+++ b/P/Sda1/Jpa/Company/companyJpa1/pom.xml
@@ -2,6 +2,13 @@
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>
+ <groupId>de.hdm-stuttgart.mi</groupId>
+ <artifactId>lecturenotes-pom</artifactId>
+ <version>1.0</version>
+ <relativePath>../../../../pom.xml</relativePath>
+ </parent>
+
<groupId>de.hdm-stuttgart.mi</groupId>
<artifactId>company</artifactId>
<version>1.0</version>
@@ -11,7 +18,6 @@
<url>http://www.mi.hdm-stuttgart.de/freedocs</url>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vaadin.version>7.5.0</vaadin.version>
<vaadin.jpacontainer.version>3.2.0</vaadin.jpacontainer.version>
</properties>
@@ -137,14 +143,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.34</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
+ <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 819400fbe..db2291486 100644
--- a/P/Sda1/Jpa/HibernateStandalone/pom.xml
+++ b/P/Sda1/Jpa/HibernateStandalone/pom.xml
@@ -1,6 +1,13 @@
<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>
+ <groupId>de.hdm-stuttgart.mi</groupId>
+ <artifactId>lecturenotes-pom</artifactId>
+ <version>1.0</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+
<groupId>de.hdm-stuttgart.mi.sda1</groupId>
<artifactId>mi-hibernate-standalone</artifactId>
<version>0.0.1</version>
@@ -10,10 +17,6 @@
<url>http://www.mi.hdm-stuttgart.de/freedocs</url>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
@@ -37,14 +40,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.35</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
+ <version>${mysql.mysql-connector-java.version}</version>
</dependency>
</dependencies>
@@ -71,4 +67,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 9b5e3c12f..4e70b3a04 100644
--- a/P/Sda1/Jpa/LectureOperations/pom.xml
+++ b/P/Sda1/Jpa/LectureOperations/pom.xml
@@ -1,5 +1,12 @@
<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>
+ <groupId>de.hdm-stuttgart.mi</groupId>
+ <artifactId>lecturenotes-pom</artifactId>
+ <version>1.0</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
<groupId>de.hdm-stuttgart.mi.sda1</groupId>
<artifactId>lecture-operations</artifactId>
@@ -10,10 +17,6 @@
<url>http://www.mi.hdm-stuttgart.de/freedocs</url>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
@@ -37,14 +40,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.35</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
+ <version>${mysql.mysql-connector-java.version}</version>
</dependency>
</dependencies>
diff --git a/P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml b/P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml
index 148a71a4a..543f71d98 100644
--- a/P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml
+++ b/P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml
@@ -2,6 +2,13 @@
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>
+ <groupId>de.hdm-stuttgart.mi</groupId>
+ <artifactId>lecturenotes-pom</artifactId>
+ <version>1.0</version>
+ <relativePath>../../../../pom.xml</relativePath>
+ </parent>
+
<groupId>de.hdm-stuttgart.mi.sda1</groupId>
<artifactId>rdbms2catalog</artifactId>
<version>2.0</version>
@@ -10,10 +17,6 @@
<name>rdbms2catalogJpa</name>
<url>http://www.mi.hdm-stuttgart.de/freedocs</url>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -80,32 +83,13 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.34</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.1</version>
+ <version>${mysql.mysql-connector-java.version}</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
- <version>2.0.5</version>
+ <version>${org.jdom.jdom2.version}</version>
</dependency>
</dependencies>
diff --git a/P/Sda1/Jpa/rdbms2catalog/solution/pom.xml b/P/Sda1/Jpa/rdbms2catalog/solution/pom.xml
index 70c0563ec..4fcc2dbcf 100644
--- a/P/Sda1/Jpa/rdbms2catalog/solution/pom.xml
+++ b/P/Sda1/Jpa/rdbms2catalog/solution/pom.xml
@@ -37,27 +37,16 @@
<version>5.0.0.CR1</version>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.1</version>
- </dependency>
-
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
- <version>2.0.5</version>
+ <version>${org.jdom.jdom2.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.34</version>
+ <version>${mysql.mysql-connector-java.version}</version>
</dependency>
</dependencies>
diff --git a/P/Sda1/NoCast/pom.xml b/P/Sda1/NoCast/pom.xml
index 2caab7339..00ffb0e77 100644
--- a/P/Sda1/NoCast/pom.xml
+++ b/P/Sda1/NoCast/pom.xml
@@ -23,13 +23,13 @@
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
- <version>2.0.6</version>
+ <version>${org.jdom.jdom2.version}</version>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
- <version>1.1.4</version>
+ <version>${jaxen.jaxen.version}</version>
</dependency>
</dependencies>
diff --git a/P/Sda1/VerifyImgAccess/pom.xml b/P/Sda1/VerifyImgAccess/pom.xml
index 0a7f54274..9c943b7b9 100644
--- a/P/Sda1/VerifyImgAccess/pom.xml
+++ b/P/Sda1/VerifyImgAccess/pom.xml
@@ -24,13 +24,13 @@
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
- <version>2.0.6</version>
+ <version>${org.jdom.jdom2.version}</version>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
- <version>1.1.4</version>
+ <version>${jaxen.jaxen.version}</version>
</dependency>
</dependencies>
diff --git a/P/Sda1/catalog2rdbms/pom.xml b/P/Sda1/catalog2rdbms/pom.xml
index b0303e6ed..1ee4d5ed7 100644
--- a/P/Sda1/catalog2rdbms/pom.xml
+++ b/P/Sda1/catalog2rdbms/pom.xml
@@ -21,18 +21,6 @@
<dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.1</version>
- </dependency>
-
<dependency>
<groupId>de.hdm-stuttgart.mi.sda1</groupId>
<artifactId>saxerrorhandler</artifactId>
@@ -42,7 +30,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.34</version>
+ <version>${mysql.mysql-connector-java.version}</version>
</dependency>
</dependencies>
diff --git a/P/Sda1/catalog2rdbmsPrepare/pom.xml b/P/Sda1/catalog2rdbmsPrepare/pom.xml
index cac46031a..294a94a97 100644
--- a/P/Sda1/catalog2rdbmsPrepare/pom.xml
+++ b/P/Sda1/catalog2rdbmsPrepare/pom.xml
@@ -21,18 +21,6 @@
<dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.1</version>
- </dependency>
-
<dependency>
<groupId>de.hdm-stuttgart.mi.sda1</groupId>
<artifactId>saxerrorhandler</artifactId>
@@ -42,7 +30,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.34</version>
+ <version>${mysql.mysql-connector-java.version}</version>
</dependency>
</dependencies>
diff --git a/P/Sda1/catalog2sql/pom.xml b/P/Sda1/catalog2sql/pom.xml
index e3ff26d93..c54f70228 100644
--- a/P/Sda1/catalog2sql/pom.xml
+++ b/P/Sda1/catalog2sql/pom.xml
@@ -20,18 +20,6 @@
<dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.1</version>
- </dependency>
-
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
diff --git a/P/Sda1/rdbms2catalog/pom.xml b/P/Sda1/rdbms2catalog/pom.xml
index 2b24ceab0..5616397ad 100644
--- a/P/Sda1/rdbms2catalog/pom.xml
+++ b/P/Sda1/rdbms2catalog/pom.xml
@@ -20,27 +20,16 @@
<dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.1</version>
- </dependency>
-
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
- <version>2.0.5</version>
+ <version>${org.jdom.jdom2.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.34</version>
+ <version>${mysql.mysql-connector-java.version}</version>
</dependency>
</dependencies>
diff --git a/P/Sda1/saxerrorhandler/pom.xml b/P/Sda1/saxerrorhandler/pom.xml
index 6a8916fca..026e83ee2 100644
--- a/P/Sda1/saxerrorhandler/pom.xml
+++ b/P/Sda1/saxerrorhandler/pom.xml
@@ -18,20 +18,4 @@
<name>saxerrorhandler</name>
<url>http://www.mi.hdm-stuttgart.de/freedocs</url>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.1</version>
- </dependency>
-
- </dependencies>
-
</project>
diff --git a/P/Sda1/xmlstatistics/pom.xml b/P/Sda1/xmlstatistics/pom.xml
index f7261d317..675d48a47 100644
--- a/P/Sda1/xmlstatistics/pom.xml
+++ b/P/Sda1/xmlstatistics/pom.xml
@@ -20,23 +20,11 @@
<url>http://www.mi.hdm-stuttgart.de/freedocs</url>
<dependencies>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.1</version>
- </dependency>
<dependency>
- <groupId>de.hdm-stuttgart.mi.sda1</groupId>
+ <groupId>de.hdm-stuttgart.mi.sda1</groupId>
<artifactId>saxerrorhandler</artifactId>
- <version>0.8</version>
+ <version>0.8</version>
</dependency>
</dependencies>
diff --git a/P/Sda2/Jpa/Cd/pom.xml b/P/Sda2/Jpa/Cd/pom.xml
index 758ca45ff..52d1fe94b 100644
--- a/P/Sda2/Jpa/Cd/pom.xml
+++ b/P/Sda2/Jpa/Cd/pom.xml
@@ -18,21 +18,11 @@
<name>Cd</name>
<dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.1</version>
- </dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.33</version>
+ <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 2d4631a03..8b6ae219c 100644
--- a/P/Sda2/Jpa/HibernateCacheDemo/pom.xml
+++ b/P/Sda2/Jpa/HibernateCacheDemo/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.33</version>
+ <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 4e3a64261..e81b9f8c5 100644
--- a/P/Sda2/Jpa/Inherit/Tpch/pom.xml
+++ b/P/Sda2/Jpa/Inherit/Tpch/pom.xml
@@ -19,21 +19,10 @@
<dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.1</version>
- </dependency>
-
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.33</version>
+ <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 adc0f1c04..732eb2576 100644
--- a/P/Sda2/Jpa/University/pom.xml
+++ b/P/Sda2/Jpa/University/pom.xml
@@ -19,21 +19,10 @@
<dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.1</version>
- </dependency>
-
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.33</version>
+ <version>${mysql.mysql-connector-java.version}</version>
</dependency>
<dependency>
diff --git a/P/Sda2/Register/pom.xml b/P/Sda2/Register/pom.xml
index 23c9898ae..d7fd13ed6 100644
--- a/P/Sda2/Register/pom.xml
+++ b/P/Sda2/Register/pom.xml
@@ -98,7 +98,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.32</version>
+ <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 5a6dfd7b3..52f760169 100644
--- a/P/Sda2/UnixSqlLdap/Jndi/Rdbms2Ldap/pom.xml
+++ b/P/Sda2/UnixSqlLdap/Jndi/Rdbms2Ldap/pom.xml
@@ -18,22 +18,10 @@
<dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.1</version>
- </dependency>
-
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.33</version>
+ <version>${mysql.mysql-connector-java.version}</version>
</dependency>
</dependencies>
diff --git a/P/Sda2/UnixSqlLdap/Jndi/Unix2Rdbms/pom.xml b/P/Sda2/UnixSqlLdap/Jndi/Unix2Rdbms/pom.xml
index ed895eb17..e586b4108 100644
--- a/P/Sda2/UnixSqlLdap/Jndi/Unix2Rdbms/pom.xml
+++ b/P/Sda2/UnixSqlLdap/Jndi/Unix2Rdbms/pom.xml
@@ -17,16 +17,10 @@
<name>unix2rdbms</name>
<dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
-
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.33</version>
+ <version>${mysql.mysql-connector-java.version}</version>
</dependency>
</dependencies>
diff --git a/P/Sda2/UnixSqlLdap/Jndi/Unix2Rdbms/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/parse/Group.java b/P/Sda2/UnixSqlLdap/Jndi/Unix2Rdbms/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/parse/Group.java
index 322af89ca..44be94af7 100644
--- a/P/Sda2/UnixSqlLdap/Jndi/Unix2Rdbms/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/parse/Group.java
+++ b/P/Sda2/UnixSqlLdap/Jndi/Unix2Rdbms/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/parse/Group.java
@@ -5,14 +5,15 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import de.hdm_stuttgart.mi.sda2.usermanage.rdbms.DatabaseObject;
+
public class Group implements DatabaseObject {
- private static Logger log = Logger
- .getLogger(Group.class);
+ private static Logger log = LogManager.getLogger(Group.class);
public static final Map<String, Set<Group>> secondaryGroupsByUid = new HashMap<String, Set<Group>>();
public static final Map<Integer, Group> groupsByGidnumber = new HashMap<Integer, Group>();
diff --git a/P/Sda2/UnixSqlLdap/Jndi/Unix2Rdbms/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/rdbms/RdbmsHandler.java b/P/Sda2/UnixSqlLdap/Jndi/Unix2Rdbms/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/rdbms/RdbmsHandler.java
index 1030186f2..4f5f46d0d 100644
--- a/P/Sda2/UnixSqlLdap/Jndi/Unix2Rdbms/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/rdbms/RdbmsHandler.java
+++ b/P/Sda2/UnixSqlLdap/Jndi/Unix2Rdbms/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/rdbms/RdbmsHandler.java
@@ -7,7 +7,8 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import de.hdm_stuttgart.mi.sda2.usermanage.Cfg;
import de.hdm_stuttgart.mi.sda2.usermanage.parse.Group;
@@ -15,8 +16,7 @@ import de.hdm_stuttgart.mi.sda2.usermanage.parse.User;
public class RdbmsHandler {
- private static Logger log = Logger
- .getLogger(RdbmsHandler.class);
+ private static Logger log = LogManager.getLogger(RdbmsHandler.class);
private MyNamedQuery<GroupParam> insertGroupStmt;
private MyNamedQuery<UserParam> insertUserStmt;
diff --git a/P/Sda2/account/pom.xml b/P/Sda2/account/pom.xml
index 7b3099e11..f62910f92 100644
--- a/P/Sda2/account/pom.xml
+++ b/P/Sda2/account/pom.xml
@@ -17,24 +17,14 @@
<name>account</name>
- <!--Fixme: Add a sensible project related domain here -->
- <url>http://somedomain.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <url>http://www.mi.hdm-stuttgart.de/freedocs</url>
<dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.33</version>
+ <version>${mysql.mysql-connector-java.version}</version>
</dependency>
<dependency>
diff --git a/P/Sda2/account/src/main/java/de/hdm_stuttgart/mi/sda2/account/sql/DbHandler.java b/P/Sda2/account/src/main/java/de/hdm_stuttgart/mi/sda2/account/sql/DbHandler.java
index 73bacaab4..26c5eb52f 100644
--- a/P/Sda2/account/src/main/java/de/hdm_stuttgart/mi/sda2/account/sql/DbHandler.java
+++ b/P/Sda2/account/src/main/java/de/hdm_stuttgart/mi/sda2/account/sql/DbHandler.java
@@ -6,15 +6,15 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import de.hdm_stuttgart.mi.sda2.account.Conf;
import de.hdm_stuttgart.mi.sda2.account.gui.ErrorReporter;
-import de.hdm_stuttgart.mi.sda2.account.gui.ExceptionDialog;
public class DbHandler {
- static private final Logger log = Logger.getLogger(DbHandler.class);
+ static private final Logger log = LogManager.getLogger(DbHandler.class);
private final ErrorReporter errorReporter;
public DbHandler(final ErrorReporter errorReporter) {
diff --git a/P/Sda2/forum_1/pom.xml b/P/Sda2/forum_1/pom.xml
index 3d4201d5f..e5157126f 100644
--- a/P/Sda2/forum_1/pom.xml
+++ b/P/Sda2/forum_1/pom.xml
@@ -18,7 +18,6 @@
<name>Forum application</name>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vaadin.version>7.3.1</vaadin.version>
<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
<eclipse.link.version>2.5.2</eclipse.link.version>
@@ -107,7 +106,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.32</version>
+ <version>${mysql.mysql-connector-java.version}</version>
</dependency>
<!-- JPAcontainer stuff -->
diff --git a/pom.xml b/pom.xml
index 3e331adb2..5c1a099bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,10 +2,19 @@
<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>
+
+ <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>
+
</properties>
+
+
<groupId>de.hdm-stuttgart.mi</groupId>
<artifactId>lecturenotes-base-pom</artifactId>
<version>1.0</version>
@@ -74,12 +83,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>2.1</version>
+ <version>2.3</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.1</version>
+ <version>2.3</version>
</dependency>
</dependencies>
--
GitLab