Fixing release zip creation

pkiraly · Feb 2, 2021 · 1ad072b · 1ad072b
1 parent 278d80f
commit 1ad072b
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -184,37 +184,40 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<version>2.6</version>
+				<configuration>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+					<archive>
+						<manifest>
+							<mainClass></mainClass>
+						</manifest>
+					</archive>
+					<descriptors>
+						<descriptor>src/main/assembly/release.xml</descriptor>
+					</descriptors>
+				</configuration>
 				<executions>
 					<execution>
 						<id>jar-with-dependencies</id>
 						<phase>verify</phase>
 						<goals>
 							<goal>single</goal>
 						</goals>
-						<configuration>
-							<archive>
-								<manifest>
-									<!-- com.nsdr.europeana.qa.cli.Counter -->
-									<mainClass></mainClass>
-								</manifest>
-							</archive>
-							<descriptorRefs>
-								<descriptorRef>jar-with-dependencies</descriptorRef>
-							</descriptorRefs>
-							<appendAssemblyId>true</appendAssemblyId>
-						</configuration>
 					</execution>
 					<execution>
 						<id>dist</id>
 						<phase>verify</phase>
 						<goals>
 							<goal>single</goal>
 						</goals>
-						<configuration>
-							<descriptors>
-								<descriptor>src/main/assembly/release.xml</descriptor>
-							</descriptors>
-						</configuration>
+					</execution>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
 					</execution>
 				</executions>
 			</plugin>

diff --git a/src/main/assembly/release.xml b/src/main/assembly/release.xml
@@ -25,47 +25,79 @@
     </fileSets>
     <files>
         <file>
-            <source>setdir.sh.template</source>
+            <source>common-variables</source>
+            <fileMode>0755</fileMode>
         </file>
         <file>
-          <source>common-variables</source>
+            <source>common-script</source>
+            <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>formatter</source>
+            <source>metadata-qa.sh</source>
+            <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>functional-analysis</source>
+            <source>LICENSE</source>
+            <fileMode>0644</fileMode>
         </file>
         <file>
-            <source>index</source>
+            <source>README.md</source>
+            <fileMode>0644</fileMode>
+        </file>
+        <file>
+            <source>setdir.sh.template</source>
+        </file>
+        <file>
+            <source>validator</source>
+            <fileMode>0755</fileMode>
         </file>
         <file>
             <source>prepare-solr</source>
+            <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>serial-score</source>
+            <source>index</source>
+            <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>tt-completeness</source>
+            <source>solr-functions</source>
+            <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>validator</source>
+            <source>completeness</source>
+            <fileMode>0755</fileMode>
+        </file>
+        <file>
+            <source>classifications</source>
+            <fileMode>0755</fileMode>
         </file>
         <file>
             <source>authorities</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>common-script</source>
+            <source>tt-completeness</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>LICENSE</source>
-            <fileMode>0644</fileMode>
+            <source>shelf-ready-completeness</source>
+            <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>README.md</source>
-            <fileMode>0644</fileMode>
+            <source>serial-score</source>
+            <fileMode>0755</fileMode>
+        </file>
+        <file>
+            <source>formatter</source>
+            <fileMode>0755</fileMode>
+        </file>
+        <file>
+            <source>functional-analysis</source>
+            <fileMode>0755</fileMode>
+        </file>
+        <file>
+            <source>network-analysis</source>
+            <fileMode>0755</fileMode>
         </file>
     </files>
 </assembly>