From 7d45a3a7d761d5f734c13cd374527835dc825dfc Mon Sep 17 00:00:00 2001 From: Martin Goik <goik@hdm-stuttgart.de> Date: Wed, 1 Feb 2017 12:07:24 +0100 Subject: [PATCH] Centralizing pom dependencies in parent --- Klausuren/Sd1/2015winter/Solution/Doc/a.xhtml | 11 ++--- P/Sd1/Array/marking/pom.xml | 9 +--- P/Sd1/Euler/11/largestproductingrid/pom.xml | 19 +------- P/Sd1/Figure/BaseClass/pom.xml | 25 ---------- P/Sd1/Figure/Scale/pom.xml | 25 ---------- P/Sd1/Figure/ToString/pom.xml | 25 ---------- P/Sd1/TicTacToe/V1/pom.xml | 7 --- P/Sd1/TicTacToe/V2/pom.xml | 7 --- P/Sd1/fraction/V05/pom.xml | 25 ---------- P/Sd1/fraction/V1/pom.xml | 25 ---------- P/Sd1/fraction/V2/pom.xml | 24 ---------- P/Sd1/interest/V1/pom.xml | 25 ---------- P/Sd1/interest/V2/pom.xml | 25 ---------- P/Sd1/math/V1/pom.xml | 25 ---------- P/Sd1/math/V2/pom.xml | 24 ---------- P/Sd1/math/V3/pom.xml | 25 ---------- P/Sd1/math/V4/pom.xml | 25 ---------- P/Sd1/plot/Basic/pom.xml | 11 +---- P/Sd1/plot/Interface/pom.xml | 10 +--- P/Sda1/Jpa/Company/companyJpa1/pom.xml | 9 ---- P/Sda1/Jpa/LectureOperations/pom.xml | 9 +--- P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml | 11 +---- P/Sda1/Jpa/rdbms2catalog/solution/pom.xml | 11 +---- P/Sda2/Jpa/Cd/pom.xml | 2 +- P/Sda2/Jpa/Inherit/Tpch/pom.xml | 2 +- P/Sda2/Jpa/University/pom.xml | 2 +- P/Sda2/account/pom.xml | 2 +- P/Sda2/bibimport/pom.xml | 46 ++++--------------- pom.xml | 16 ++++++- ws/eclipse/HtmlExtensionTaglet/pom.xml | 25 ---------- 30 files changed, 44 insertions(+), 463 deletions(-) diff --git a/Klausuren/Sd1/2015winter/Solution/Doc/a.xhtml b/Klausuren/Sd1/2015winter/Solution/Doc/a.xhtml index e2d2e5b4e..57ef9970c 100644 --- a/Klausuren/Sd1/2015winter/Solution/Doc/a.xhtml +++ b/Klausuren/Sd1/2015winter/Solution/Doc/a.xhtml @@ -5,12 +5,11 @@ <title></title> </head> - <body><h1 id="t1">Eine Helper - Klasse</h1><h2>Beschreibung</h2><p>Implementierung von Hilfsmethoden. In - dieser Aufgaben sollen die in der Klasse - <code>de.hdm_stuttgart.sw1.klausur.Helper</code> bereits vorbereiteten Dummy - Methoden implementieren.</p><h3>Vorbereitung</h3><p>Entpacken Sie das oben - sichtbare Maven Archiv <b>exam.zip</b> und importieren Sie den + <body><h1 + id="t1">Klassenmethoden</h1><h2>Beschreibung</h2><p>Implementierung von + Methoden aus Klassen des Packages + <code>de.hdm_stuttgart.mi.sd1.aufgabe1</code>.</p><h3>Vorbereitung</h3><p>Entpacken + Sie das oben sichtbare Maven Archiv <b>exam.zip</b> und importieren Sie den resultierenden Ordner <code>Exam</code> als <span lang="en">Maven</span> Projekt in Ihren <span lang="en">Eclipse Workspace</span>. Das <span lang="en">Package</span> <code>de.hdm_stuttgart.mi.bitte_ignorieren</code> diff --git a/P/Sd1/Array/marking/pom.xml b/P/Sd1/Array/marking/pom.xml index b252c7b1e..d5ba42939 100644 --- a/P/Sd1/Array/marking/pom.xml +++ b/P/Sd1/Array/marking/pom.xml @@ -49,17 +49,10 @@ </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> - <configuration/> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.4.1</version> + <version>${org.apache.maven.plugins.maven-shade-plugin}</version> <configuration> <transformers> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> diff --git a/P/Sd1/Euler/11/largestproductingrid/pom.xml b/P/Sd1/Euler/11/largestproductingrid/pom.xml index af0c8221b..82caedaae 100644 --- a/P/Sd1/Euler/11/largestproductingrid/pom.xml +++ b/P/Sd1/Euler/11/largestproductingrid/pom.xml @@ -22,27 +22,10 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</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/> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.3</version> + <version>${org.apache.maven.plugins.maven-shade-plugin}</version> <configuration> <transformers> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> diff --git a/P/Sd1/Figure/BaseClass/pom.xml b/P/Sd1/Figure/BaseClass/pom.xml index 4227ae836..74a831f88 100644 --- a/P/Sd1/Figure/BaseClass/pom.xml +++ b/P/Sd1/Figure/BaseClass/pom.xml @@ -17,29 +17,4 @@ <name>figure</name> <url>http://www.mi.hdm-stuttgart.de/freedocs</url> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration> - <linksource>true</linksource> - <taglets> - <taglet> - <tagletClass>de.hdm_stuttgart.sd1.taglet.HtmlExtensionTaglet</tagletClass> - <tagletArtifact> - <groupId>de.hdm-stuttgart.sd1</groupId> - <artifactId>taglet</artifactId> - <version>1.2</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - - </plugins> - </build> - </project> diff --git a/P/Sd1/Figure/Scale/pom.xml b/P/Sd1/Figure/Scale/pom.xml index 202f55b9e..371f30c69 100644 --- a/P/Sd1/Figure/Scale/pom.xml +++ b/P/Sd1/Figure/Scale/pom.xml @@ -17,29 +17,4 @@ <name>figure</name> <url>http://www.mi.hdm-stuttgart.de/freedocs</url> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration> - <linksource>true</linksource> - <taglets> - <taglet> - <tagletClass>de.hdm_stuttgart.sd1.taglet.HtmlExtensionTaglet</tagletClass> - <tagletArtifact> - <groupId>de.hdm-stuttgart.sd1</groupId> - <artifactId>taglet</artifactId> - <version>1.2</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - - </plugins> - </build> - </project> diff --git a/P/Sd1/Figure/ToString/pom.xml b/P/Sd1/Figure/ToString/pom.xml index 8f9a40b71..8a8d372d4 100644 --- a/P/Sd1/Figure/ToString/pom.xml +++ b/P/Sd1/Figure/ToString/pom.xml @@ -17,29 +17,4 @@ <name>figure</name> <url>http://www.mi.hdm-stuttgart.de/freedocs</url> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration> - <linksource>true</linksource> - <taglets> - <taglet> - <tagletClass>de.hdm_stuttgart.sd1.taglet.HtmlExtensionTaglet</tagletClass> - <tagletArtifact> - <groupId>de.hdm-stuttgart.sd1</groupId> - <artifactId>taglet</artifactId> - <version>1.2</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - - </plugins> - </build> - </project> diff --git a/P/Sd1/TicTacToe/V1/pom.xml b/P/Sd1/TicTacToe/V1/pom.xml index d7edbcf8c..15c23eab2 100644 --- a/P/Sd1/TicTacToe/V1/pom.xml +++ b/P/Sd1/TicTacToe/V1/pom.xml @@ -31,13 +31,6 @@ </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration/> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> diff --git a/P/Sd1/TicTacToe/V2/pom.xml b/P/Sd1/TicTacToe/V2/pom.xml index a1e7912f9..8fbe81e4f 100644 --- a/P/Sd1/TicTacToe/V2/pom.xml +++ b/P/Sd1/TicTacToe/V2/pom.xml @@ -31,13 +31,6 @@ </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration/> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> diff --git a/P/Sd1/fraction/V05/pom.xml b/P/Sd1/fraction/V05/pom.xml index eebda8954..66904f09c 100644 --- a/P/Sd1/fraction/V05/pom.xml +++ b/P/Sd1/fraction/V05/pom.xml @@ -16,29 +16,4 @@ <name>fraction-skeleton</name> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration> - <linksource>true</linksource> - <taglets> - <taglet> - <tagletClass>de.hdm_stuttgart.sd1.taglet.HtmlExtensionTaglet</tagletClass> - <tagletArtifact> - <groupId>de.hdm-stuttgart.sd1</groupId> - <artifactId>taglet</artifactId> - <version>1.2</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - - </plugins> - </build> - </project> diff --git a/P/Sd1/fraction/V1/pom.xml b/P/Sd1/fraction/V1/pom.xml index e7e9a2c8d..0d12a5e5d 100644 --- a/P/Sd1/fraction/V1/pom.xml +++ b/P/Sd1/fraction/V1/pom.xml @@ -17,29 +17,4 @@ <name>fraction</name> <url>http://www.mi.hdm-stuttgart.de/freedocs</url> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration> - <linksource>true</linksource> - <taglets> - <taglet> - <tagletClass>de.hdm_stuttgart.sd1.taglet.HtmlExtensionTaglet</tagletClass> - <tagletArtifact> - <groupId>de.hdm-stuttgart.sd1</groupId> - <artifactId>taglet</artifactId> - <version>1.2</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - - </plugins> - </build> - </project> diff --git a/P/Sd1/fraction/V2/pom.xml b/P/Sd1/fraction/V2/pom.xml index 1261dd3fd..3ebb46d1f 100644 --- a/P/Sd1/fraction/V2/pom.xml +++ b/P/Sd1/fraction/V2/pom.xml @@ -17,30 +17,6 @@ <name>fraction</name> <url>http://www.mi.hdm-stuttgart.de/freedocs</url> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration> - <linksource>true</linksource> - <taglets> - <taglet> - <tagletClass>de.hdm_stuttgart.sd1.taglet.HtmlExtensionTaglet</tagletClass> - <tagletArtifact> - <groupId>de.hdm-stuttgart.sd1</groupId> - <artifactId>taglet</artifactId> - <version>1.2</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - - </plugins> - </build> <dependencies> diff --git a/P/Sd1/interest/V1/pom.xml b/P/Sd1/interest/V1/pom.xml index 5f4d9723b..a3bb3425a 100644 --- a/P/Sd1/interest/V1/pom.xml +++ b/P/Sd1/interest/V1/pom.xml @@ -17,29 +17,4 @@ <name>interest_V1</name> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration> - <linksource>true</linksource> - <taglets> - <taglet> - <tagletClass>de.hdm_stuttgart.sd1.taglet.HtmlExtensionTaglet</tagletClass> - <tagletArtifact> - <groupId>de.hdm-stuttgart.sd1</groupId> - <artifactId>taglet</artifactId> - <version>1.2</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - - </plugins> - </build> - </project> diff --git a/P/Sd1/interest/V2/pom.xml b/P/Sd1/interest/V2/pom.xml index 6df7b6656..85a449f0c 100644 --- a/P/Sd1/interest/V2/pom.xml +++ b/P/Sd1/interest/V2/pom.xml @@ -17,29 +17,4 @@ <name>interest_V2</name> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration> - <linksource>true</linksource> - <taglets> - <taglet> - <tagletClass>de.hdm_stuttgart.sd1.taglet.HtmlExtensionTaglet</tagletClass> - <tagletArtifact> - <groupId>de.hdm-stuttgart.sd1</groupId> - <artifactId>taglet</artifactId> - <version>1.2</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - - </plugins> - </build> - </project> diff --git a/P/Sd1/math/V1/pom.xml b/P/Sd1/math/V1/pom.xml index 68d86fd8b..6626c2dd8 100644 --- a/P/Sd1/math/V1/pom.xml +++ b/P/Sd1/math/V1/pom.xml @@ -17,29 +17,4 @@ <name>math_v1</name> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration> - <linksource>true</linksource> - <taglets> - <taglet> - <tagletClass>de.hdm_stuttgart.sd1.taglet.HtmlExtensionTaglet</tagletClass> - <tagletArtifact> - <groupId>de.hdm-stuttgart.sd1</groupId> - <artifactId>taglet</artifactId> - <version>1.2</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - - </plugins> - </build> - </project> diff --git a/P/Sd1/math/V2/pom.xml b/P/Sd1/math/V2/pom.xml index 28294e943..004266fa8 100644 --- a/P/Sd1/math/V2/pom.xml +++ b/P/Sd1/math/V2/pom.xml @@ -17,29 +17,5 @@ <name>math_v2</name> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration> - <linksource>true</linksource> - <taglets> - <taglet> - <tagletClass>de.hdm_stuttgart.sd1.taglet.HtmlExtensionTaglet</tagletClass> - <tagletArtifact> - <groupId>de.hdm-stuttgart.sd1</groupId> - <artifactId>taglet</artifactId> - <version>1.2</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - - </plugins> - </build> </project> diff --git a/P/Sd1/math/V3/pom.xml b/P/Sd1/math/V3/pom.xml index e96a6554c..526053129 100644 --- a/P/Sd1/math/V3/pom.xml +++ b/P/Sd1/math/V3/pom.xml @@ -17,29 +17,4 @@ <name>math_v3</name> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration> - <linksource>true</linksource> - <taglets> - <taglet> - <tagletClass>de.hdm_stuttgart.sd1.taglet.HtmlExtensionTaglet</tagletClass> - <tagletArtifact> - <groupId>de.hdm-stuttgart.sd1</groupId> - <artifactId>taglet</artifactId> - <version>1.2</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - - </plugins> - </build> - </project> diff --git a/P/Sd1/math/V4/pom.xml b/P/Sd1/math/V4/pom.xml index 58b469dab..86741ccc7 100644 --- a/P/Sd1/math/V4/pom.xml +++ b/P/Sd1/math/V4/pom.xml @@ -16,29 +16,4 @@ <packaging>jar</packaging> <name>math_v4</name> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration> - <linksource>true</linksource> - <taglets> - <taglet> - <tagletClass>de.hdm_stuttgart.sd1.taglet.HtmlExtensionTaglet</tagletClass> - <tagletArtifact> - <groupId>de.hdm-stuttgart.sd1</groupId> - <artifactId>taglet</artifactId> - <version>1.2</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - - </plugins> - </build> - </project> diff --git a/P/Sd1/plot/Basic/pom.xml b/P/Sd1/plot/Basic/pom.xml index 4f5189caa..20650999b 100644 --- a/P/Sd1/plot/Basic/pom.xml +++ b/P/Sd1/plot/Basic/pom.xml @@ -19,18 +19,11 @@ <url>http://www.mi.hdm-stuttgart.de/freedocs</url> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration/> - </plugin> - + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.3</version> + <version>${org.apache.maven.plugins.maven-shade-plugin}</version> <configuration> <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> <transformers> diff --git a/P/Sd1/plot/Interface/pom.xml b/P/Sd1/plot/Interface/pom.xml index 744c717df..ebc72e603 100644 --- a/P/Sd1/plot/Interface/pom.xml +++ b/P/Sd1/plot/Interface/pom.xml @@ -20,17 +20,11 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration/> - </plugin> - <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.3</version> + <version>${org.apache.maven.plugins.maven-shade-plugin}</version> <configuration> <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> <transformers> diff --git a/P/Sda1/Jpa/Company/companyJpa1/pom.xml b/P/Sda1/Jpa/Company/companyJpa1/pom.xml index fb19e0559..8ad2236e0 100644 --- a/P/Sda1/Jpa/Company/companyJpa1/pom.xml +++ b/P/Sda1/Jpa/Company/companyJpa1/pom.xml @@ -34,15 +34,6 @@ </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> diff --git a/P/Sda1/Jpa/LectureOperations/pom.xml b/P/Sda1/Jpa/LectureOperations/pom.xml index 1c83a0b83..ab8b615f0 100644 --- a/P/Sda1/Jpa/LectureOperations/pom.xml +++ b/P/Sda1/Jpa/LectureOperations/pom.xml @@ -119,17 +119,10 @@ </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> - <configuration /> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.4.3</version> + <version>${org.apache.maven.plugins.maven-shade-plugin}</version> <configuration> <transformers> <transformer diff --git a/P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml b/P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml index 0be8114f2..dafc48214 100644 --- a/P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml +++ b/P/Sda1/Jpa/rdbms2catalog/skeleton/pom.xml @@ -117,17 +117,10 @@ </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> - <configuration /> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.4.3</version> + <version>${org.apache.maven.plugins.maven-shade-plugin}</version> <configuration> <transformers> <transformer @@ -150,4 +143,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/P/Sda1/Jpa/rdbms2catalog/solution/pom.xml b/P/Sda1/Jpa/rdbms2catalog/solution/pom.xml index c674df304..32cfb9017 100644 --- a/P/Sda1/Jpa/rdbms2catalog/solution/pom.xml +++ b/P/Sda1/Jpa/rdbms2catalog/solution/pom.xml @@ -124,17 +124,10 @@ </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> - <configuration /> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.4.3</version> + <version>${org.apache.maven.plugins.maven-shade-plugin}</version> <configuration> <transformers> <transformer @@ -157,4 +150,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/P/Sda2/Jpa/Cd/pom.xml b/P/Sda2/Jpa/Cd/pom.xml index 0cf5b62af..4d2ffb88a 100644 --- a/P/Sda2/Jpa/Cd/pom.xml +++ b/P/Sda2/Jpa/Cd/pom.xml @@ -41,7 +41,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.3</version> + <version>${org.apache.maven.plugins.maven-shade-plugin}</version> <configuration> <transformers> <transformer diff --git a/P/Sda2/Jpa/Inherit/Tpch/pom.xml b/P/Sda2/Jpa/Inherit/Tpch/pom.xml index 25b9d73cb..8401e98a9 100644 --- a/P/Sda2/Jpa/Inherit/Tpch/pom.xml +++ b/P/Sda2/Jpa/Inherit/Tpch/pom.xml @@ -38,7 +38,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.3</version> + <version>${org.apache.maven.plugins.maven-shade-plugin}</version> <configuration> <transformers> <transformer diff --git a/P/Sda2/Jpa/University/pom.xml b/P/Sda2/Jpa/University/pom.xml index 9c0fbb9b3..653cdbf87 100644 --- a/P/Sda2/Jpa/University/pom.xml +++ b/P/Sda2/Jpa/University/pom.xml @@ -38,7 +38,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.3</version> + <version>${org.apache.maven.plugins.maven-shade-plugin}</version> <configuration> <transformers> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> diff --git a/P/Sda2/account/pom.xml b/P/Sda2/account/pom.xml index 6a44628c3..9adfde5be 100644 --- a/P/Sda2/account/pom.xml +++ b/P/Sda2/account/pom.xml @@ -45,7 +45,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.3</version> + <version>${org.apache.maven.plugins.maven-shade-plugin}</version> <executions> <execution> <id>transfer-driver</id> diff --git a/P/Sda2/bibimport/pom.xml b/P/Sda2/bibimport/pom.xml index 54a82d8be..232a8ef19 100644 --- a/P/Sda2/bibimport/pom.xml +++ b/P/Sda2/bibimport/pom.xml @@ -2,6 +2,15 @@ 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.sda2</groupId> <artifactId>bibimport</artifactId> <version>0.9</version> @@ -35,50 +44,15 @@ <version>1.0.15</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.4</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>2.4</version> - </dependency> - </dependencies> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.3</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.3</version> - <configuration /> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.4.1</version> + <version>${org.apache.maven.plugins.maven-shade-plugin}</version> <configuration> <transformers> <transformer diff --git a/pom.xml b/pom.xml index ffffa684c..3ed05a200 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ <!-- Maven plugins --> <org.apache.maven.plugins.maven-jar-plugin>2.6</org.apache.maven.plugins.maven-jar-plugin> - + <org.apache.maven.plugins.maven-shade-plugin>2.4.3</org.apache.maven.plugins.maven-shade-plugin> </properties> @@ -48,9 +48,20 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> + <version>2.10.4</version> <configuration> <linksource>true</linksource> + <additionalparam>--allow-script-in-comments -header '<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'</additionalparam> + <taglets> + <taglet> + <tagletClass>de.hdm_stuttgart.sd1.taglet.HtmlExtensionTaglet</tagletClass> + <tagletArtifact> + <groupId>de.hdm-stuttgart.sd1</groupId> + <artifactId>taglet</artifactId> + <version>1.2</version> + </tagletArtifact> + </taglet> + </taglets> </configuration> </plugin> @@ -83,6 +94,7 @@ <artifactId>mysql-connector-java</artifactId> <version>5.1.39</version> </dependency> + </dependencies> </dependencyManagement> diff --git a/ws/eclipse/HtmlExtensionTaglet/pom.xml b/ws/eclipse/HtmlExtensionTaglet/pom.xml index a970666a8..23411a15d 100644 --- a/ws/eclipse/HtmlExtensionTaglet/pom.xml +++ b/ws/eclipse/HtmlExtensionTaglet/pom.xml @@ -17,31 +17,6 @@ <name>taglet</name> <url>http://maven.apache.org</url> - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <configuration> - <linksource>true</linksource> - <taglets> - <taglet> - <tagletClass>de.hdm_stuttgart.sd1.taglet.HtmlExtensionTaglet</tagletClass> - <tagletArtifact> - <groupId>de.hdm-stuttgart.sd1</groupId> - <artifactId>taglet</artifactId> - <version>1.2</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - - </plugins> - </build> - <dependencies> <dependency> -- GitLab