From 02327b55f33488eda0e93de62cc79641f9a45d7d Mon Sep 17 00:00:00 2001
From: Johannes Schnatterer <johannes.schnatterer@cloudogu.com>
Date: Wed, 1 Aug 2018 11:42:40 +0200
Subject: [PATCH] Makes pom.xmls more DRY

---
 pom.xml                            | 72 ++++++++++++++++++++++++++++++
 scm-plugins/pom.xml                | 15 -------
 scm-plugins/scm-git-plugin/pom.xml | 18 --------
 scm-test/pom.xml                   |  3 +-
 scm-webapp/pom.xml                 | 13 +-----
 5 files changed, 75 insertions(+), 46 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0b751a2908..174fa07079 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,6 +181,77 @@
         <optional>true</optional>
       </dependency>
 
+      <dependency>
+        <groupId>com.webcohesion.enunciate</groupId>
+        <artifactId>enunciate-core-annotations</artifactId>
+        <version>${enunciate.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.mapstruct</groupId>
+        <artifactId>mapstruct-jdk8</artifactId>
+        <version>${org.mapstruct.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.mapstruct</groupId>
+        <artifactId>mapstruct-processor</artifactId>
+        <version>${org.mapstruct.version}</version>
+        <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>de.otto.edison</groupId>
+        <artifactId>edison-hal</artifactId>
+        <version>2.0.1</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.projectlombok</groupId>
+        <artifactId>lombok</artifactId>
+        <version>1.16.18</version>
+        <scope>provided</scope>
+      </dependency>
+
+      <!-- rest api -->
+
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-jaxrs</artifactId>
+        <version>${resteasy.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-jaxb-provider</artifactId>
+        <version>${resteasy.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-jackson2-provider</artifactId>
+        <version>${resteasy.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-multipart-provider</artifactId>
+        <version>${resteasy.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-guice</artifactId>
+        <version>${resteasy.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-servlet-initializer</artifactId>
+        <version>${resteasy.version}</version>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>
 
@@ -555,6 +626,7 @@
     <jaxrs.version>2.0.1</jaxrs.version>
     <resteasy.version>3.1.3.Final</resteasy.version>
     <jersey-client.version>1.19.4</jersey-client.version>
+    <enunciate.version>2.9.1</enunciate.version>
     <jackson.version>2.8.6</jackson.version>
     <guice.version>4.0</guice.version>
 
diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml
index 168c5910e4..70dee9676a 100644
--- a/scm-plugins/pom.xml
+++ b/scm-plugins/pom.xml
@@ -61,33 +61,28 @@
     <dependency>
       <groupId>com.webcohesion.enunciate</groupId>
       <artifactId>enunciate-core-annotations</artifactId>
-      <version>${enunciate.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.mapstruct</groupId>
       <artifactId>mapstruct-jdk8</artifactId>
-      <version>${org.mapstruct.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.mapstruct</groupId>
       <artifactId>mapstruct-processor</artifactId>
-      <version>${org.mapstruct.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>de.otto.edison</groupId>
       <artifactId>edison-hal</artifactId>
-      <version>2.0.1</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.16.18</version>
       <scope>provided</scope>
     </dependency>
 
@@ -96,37 +91,31 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jaxrs</artifactId>
-      <version>${resteasy.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jaxb-provider</artifactId>
-      <version>${resteasy.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jackson2-provider</artifactId>
-      <version>${resteasy.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-multipart-provider</artifactId>
-      <version>${resteasy.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-guice</artifactId>
-      <version>${resteasy.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-servlet-initializer</artifactId>
-      <version>${resteasy.version}</version>
     </dependency>
 
   </dependencies>
@@ -185,10 +174,6 @@
     </plugins>
   </build>
 
-  <properties>
-    <enunciate.version>2.9.1</enunciate.version>
-  </properties>
-
   <profiles>
     <profile>
       <id>release</id>
diff --git a/scm-plugins/scm-git-plugin/pom.xml b/scm-plugins/scm-git-plugin/pom.xml
index 7013c237cb..c6ae017d9e 100644
--- a/scm-plugins/scm-git-plugin/pom.xml
+++ b/scm-plugins/scm-git-plugin/pom.xml
@@ -9,9 +9,7 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>sonia.scm.plugins</groupId>
   <artifactId>scm-git-plugin</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <name>scm-git-plugin</name>
   <packaging>smp</packaging>
   <url>https://bitbucket.org/sdorra/scm-manager</url>
@@ -19,13 +17,6 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>${servlet.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>sonia.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
@@ -50,15 +41,6 @@
       <version>2.6</version>
     </dependency>
 
-    <!-- test scope -->
-
-    <dependency>
-      <groupId>sonia.scm</groupId>
-      <artifactId>scm-test</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-
   </dependencies>
   
   <!-- create test jar -->
diff --git a/scm-test/pom.xml b/scm-test/pom.xml
index 086552e864..7556fa4a80 100644
--- a/scm-test/pom.xml
+++ b/scm-test/pom.xml
@@ -37,7 +37,8 @@
     <dependency>
       <groupId>com.github.sdorra</groupId>
       <artifactId>shiro-unit</artifactId>
-      <scope>test</scope>
+      <!-- scm-test is test scoped in other modules and they might need shiro unit for their tests. -->
+      <scope>compile</scope>
     </dependency>
 
     <dependency>
diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index b1e46c2e37..538eba4911 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -117,48 +117,42 @@
       <artifactId>jackson-datatype-jsr310</artifactId>
       <version>${jackson.version}</version>
     </dependency>
+
     <!-- rest api -->
     
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jaxrs</artifactId>
-      <version>${resteasy.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jaxb-provider</artifactId>
-      <version>${resteasy.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jackson2-provider</artifactId>
-      <version>${resteasy.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-multipart-provider</artifactId>
-      <version>${resteasy.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-guice</artifactId>
-      <version>${resteasy.version}</version>
     </dependency>
     
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-servlet-initializer</artifactId>
-      <version>${resteasy.version}</version>
     </dependency>
 
     <dependency>
       <groupId>de.otto.edison</groupId>
       <artifactId>edison-hal</artifactId>
-      <version>2.0.1</version>
     </dependency>
 
     <!-- injection -->
@@ -261,7 +255,6 @@
     <dependency>
       <groupId>com.webcohesion.enunciate</groupId>
       <artifactId>enunciate-core-annotations</artifactId>
-      <version>${enunciate.version}</version>
     </dependency>
 
     <!-- test scope -->
@@ -387,20 +380,17 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.16.18</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>org.mapstruct</groupId>
       <artifactId>mapstruct-jdk8</artifactId>
-      <version>${org.mapstruct.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.mapstruct</groupId>
       <artifactId>mapstruct-processor</artifactId>
-      <version>${org.mapstruct.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -557,7 +547,6 @@
     <scm.home>target/scm-it</scm.home>
     <environment.profile>default</environment.profile>
     <selenium.version>2.53.1</selenium.version>
-    <enunciate.version>2.9.1</enunciate.version>
     <wagon.version>1.0</wagon.version>
     <mustache.version>0.8.17</mustache.version>
     <netbeans.hint.deploy.server>Tomcat</netbeans.hint.deploy.server>