From ac93218c5af49c5b92007b849df24e737a939f67 Mon Sep 17 00:00:00 2001
From: Tom Cools <tom.cools@live.be>
Date: Sat, 21 Aug 2021 04:07:31 +0200
Subject: [PATCH] Cleanup Maven POM files (#604)

Added fixed versions for maven-deploy-plugin & spring-boot-maven-plugin as this would otherwise break in a future maven version.

Also fixed some indenting and removed duplicate declarations.

Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com>
---
 examples/pom.xml       |  6 ++----
 pom.xml                | 43 +++++++++++++++++++++++++-----------------
 sdk-springboot/pom.xml | 33 +++++++++++++-------------------
 3 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index 839379516..9635944ff 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -10,7 +10,6 @@
     <version>1.2.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>io.dapr</groupId>
   <artifactId>dapr-sdk-examples</artifactId>
   <packaging>jar</packaging>
   <version>1.2.0-SNAPSHOT</version>
@@ -97,13 +96,10 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>RELEASE</version>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>3.6.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -175,6 +171,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
+        <version>${maven-deploy-plugin.version}</version>
         <configuration>
           <skip>true</skip>
         </configuration>
@@ -190,6 +187,7 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>${springboot.version}</version>
         <executions>
           <execution>
             <goals>
diff --git a/pom.xml b/pom.xml
index de742fc0a..f38dc98db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,12 +20,15 @@
     <os-maven-plugin.version>1.6.2</os-maven-plugin.version>
     <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
     <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
+    <maven-deploy-plugin.version>2.7</maven-deploy-plugin.version>
     <maven.compiler.source>8</maven.compiler.source>
     <maven.compiler.target>8</maven.compiler.target>
     <maven.deploy.skip>true</maven.deploy.skip>
+
     <gpg.skip>true</gpg.skip>
     <spotbugs.version>4.0.0-RC1</spotbugs.version>
     <spotbugs.fail>true</spotbugs.fail>
+    <springboot.version>2.3.5.RELEASE</springboot.version>
   </properties>
 
   <distributionManagement>
@@ -64,6 +67,12 @@
         <version>4.13.1</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter</artifactId>
+        <version>5.7.2</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
@@ -76,23 +85,23 @@
   <build>
     <plugins>
       <plugin>
-	<groupId>org.jacoco</groupId>
-	<artifactId>jacoco-maven-plugin</artifactId>
-	<version>0.8.6</version>
-	<executions>
-	  <execution>
-	    <goals>
-	      <goal>prepare-agent</goal>
-	    </goals>
-	  </execution>
-	  <execution>
-	    <id>report</id>
-	    <phase>test</phase>
-	    <goals>
-	      <goal>report</goal>
-	    </goals>
-	  </execution>
-	</executions>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.6</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>report</id>
+            <phase>test</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/sdk-springboot/pom.xml b/sdk-springboot/pom.xml
index a5ce8c158..337d77cc2 100644
--- a/sdk-springboot/pom.xml
+++ b/sdk-springboot/pom.xml
@@ -65,12 +65,12 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-      <dependency>
-          <groupId>com.github.gmazzo</groupId>
-          <artifactId>okhttp-mock</artifactId>
-          <version>1.3.2</version>
-          <scope>test</scope>
-      </dependency>
+    <dependency>
+      <groupId>com.github.gmazzo</groupId>
+      <artifactId>okhttp-mock</artifactId>
+      <version>1.3.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
@@ -83,24 +83,18 @@
       <version>5.2.10.RELEASE</version>
       <scope>compile</scope>
     </dependency>
-      <dependency>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-web</artifactId>
-          <version>5.2.10.RELEASE</version>
-          <scope>compile</scope>
-      </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
       <version>5.2.10.RELEASE</version>
       <scope>compile</scope>
     </dependency>
-      <dependency>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-context</artifactId>
-          <version>5.2.10.RELEASE</version>
-          <scope>compile</scope>
-      </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>5.2.10.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-autoconfigure</artifactId>
@@ -174,7 +168,7 @@
                 <rule>
                   <element>BUNDLE</element>
                   <limits>
-                   <limit>
+                    <limit>
                       <counter>LINE</counter>
                       <value>COVEREDRATIO</value>
                       <minimum>80%</minimum>
@@ -184,7 +178,6 @@
               </rules>
             </configuration>
           </execution>
-
         </executions>
       </plugin>
     </plugins>