From ea59f8ae766d038d6e529b3abc109fbbb6a7f308 Mon Sep 17 00:00:00 2001
From: Oliver Bertuch <o.bertuch@fz-juelich.de>
Date: Mon, 7 Feb 2022 13:53:25 +0100
Subject: [PATCH] build(zipdownloader): make zipdownloader use parent POM #8394

---
 modules/dataverse-parent/pom.xml |  1 +
 scripts/zipdownload/pom.xml      | 55 ++++++++------------------------
 2 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/modules/dataverse-parent/pom.xml b/modules/dataverse-parent/pom.xml
index 24e602f8033..b216772a153 100644
--- a/modules/dataverse-parent/pom.xml
+++ b/modules/dataverse-parent/pom.xml
@@ -12,6 +12,7 @@
     
     <modules>
         <module>../../pom.xml</module>
+        <module>../../scripts/zipdownload</module>
     </modules>
     
     <!-- Transitive dependencies, bigger library "bill of materials" (BOM) and
diff --git a/scripts/zipdownload/pom.xml b/scripts/zipdownload/pom.xml
index 256062a46e2..3e48b3d273f 100644
--- a/scripts/zipdownload/pom.xml
+++ b/scripts/zipdownload/pom.xml
@@ -2,51 +2,25 @@
 <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>
-    <groupId>ZipDownloadService</groupId>
-    <artifactId>ZipDownloadService</artifactId>
+    
+    <parent>
+        <groupId>edu.harvard.iq</groupId>
+        <artifactId>dataverse-parent</artifactId>
+        <version>${revision}</version>
+        <relativePath>../../modules/dataverse-parent</relativePath>
+    </parent>
+    
+    <artifactId>zipdownloader</artifactId>
     <version>1.0.0</version>
+    <packaging>jar</packaging>
+    
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>central</id>
-            <name>Central Repository</name>
-            <url>https://repo.maven.apache.org/maven2</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
-    <repositories>
-        <repository>
-            <id>central-repo</id>
-            <name>Central Repository</name>
-            <url>https://repo1.maven.org/maven2</url>
-            <layout>default</layout>
-        </repository>
-    </repositories>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.amazonaws</groupId>
-                <artifactId>aws-java-sdk-bom</artifactId>
-                <version>1.11.790</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+    
     <dependencies>
-        <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.2</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
@@ -58,10 +32,9 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>${target.java.version}</release>
                 </configuration>
             </plugin>
             <plugin>