diff --git a/P/Sd1/TicTacToe/V1/pom.xml b/P/Sd1/TicTacToe/V1/pom.xml index ce427dcc4cff840a9dd116a619f85999a17714d1..463e960bbcb2149d0b2d75682c2d11dccdae3765 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 99605fa82c7ec509a757b3334e173ca52b60b230..8572e1dd5330b051646e8508aa58f0dade0eaff4 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 819400fbeb3a8df282c35ae4d80c2f79fb3d2846..db2291486e9de135d36ddbc441e09ac6749ace99 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 9b5e3c12ff00f6c49c400a4b82fe2c7b54072d85..4e70b3a04ad5667bf0f1702596019a7830131f8b 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 148a71a4a7083cd0db15eff74b7f561baffe52aa..543f71d98c1a62706da0add9ecb5e66d038f9045 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 70c0563ecf45a9c11da6d3691a32b33f0a2a9930..4fcc2dbcff4cff3724f845bc62b550866d1c11a5 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 2caab7339bc36aef3d8d83c43cb1c54cb119a5ee..00ffb0e779a8ef9c04d962711a354f526349da21 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 0a7f542749a60b55feee18c88fa94be4b6e800ac..9c943b7b9a6b4895b241f179913887be3c043489 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 b0303e6ed1a58b4a2774b2ab3da0c15fe7e0b1f4..1ee4d5ed7c631d389af25ead67d8db55a7b513fd 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 cac46031a6116ee19470f4e9c37b7b96df3e87d9..294a94a978ab9fd083dca9f60877378d10dcfbf7 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 e3ff26d932a9fb5dcd6efb083745f39188a5a3b5..c54f702287b913471f78836fde8de9e6b7d351eb 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 2b24ceab0122ac8221473cc1bd93501196fa65db..5616397ad6f58a9a1f2d83d07040b6f0766b6925 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 6a8916fca7e4824ca27cfcfe2d25f0918e6f629a..026e83ee245a8afc45d5343836b6fd11c9133ce6 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 f7261d317c6aaac93d53705159640e1a95e6bef4..675d48a471d5f7e5cfe13ef3de7537589af1f277 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 758ca45ff26ed6de22bb378c18c3b30bbc8eecac..52d1fe94baa83fd407ffc7281c14d216ef7a05bf 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 2d4631a0316c7b3db2b43b8d893ef6a8b2dc6584..8b6ae219cc85ff07fa5b3bdedc26771e48a2b046 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 4e3a642619833c4d21ba8db3a6d888ead8b0d57d..e81b9f8c5c5bbf423f17a5c9f77f27db42484f3a 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 adc0f1c04118d3b656c41b7240ca266931179cea..732eb2576162e9c72a117f28c5e28df93e0fab5b 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 23c9898aef24930565892e45b2d5250f9e11fd72..d7fd13ed638f2b0c6f2df29a4757fa7c805bc302 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 5a6dfd7b3f8b1342417abf8eea834b9faa749e35..52f76016946a1b83f41a3559f3293eb0511ff1a2 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 ed895eb17f8d47b5e366c7f67cd523270ee32dd3..e586b4108483802e69117ea17f5a897d3ed767c9 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 322af89ca24474a24b9fc81bea12b9800ba76e25..44be94af7374b5550598fc2032c85959d1441d44 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 1030186f20be1633bb8ab0d7c05704c8ce8952d5..4f5f46d0dfb81acf464c11e8653d04b6a395f1dc 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 7b3099e1132df4cc02b72ea29a6a834c896a7fdc..f62910f924528dbf5cbe3d18a6fc40f4bb79b5f6 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 73bacaab47ab0a151ab534fc62a247d75f5b9dc2..26c5eb52f9846360aa54019a380a89e10567ab29 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 3d4201d5fc620acf9dffc1f3b292fadb43a499f5..e5157126fde02a7c55ce44ce13d2da0e13e1d6d1 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 3e331adb2d1b2ac993fa6a692f7b08469bd59454..5c1a099bb10869d36687e368df332721cde9df40 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>