[DSC-963] Fixes dspace-server-webapp target folder

4Science · Dec 27, 2023 · c1d6090 · c1d6090
1 parent b35b837
commit c1d6090
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 0 deletions.
diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
@@ -28,6 +28,41 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+                <version>1.1.0</version>
+                <executions>
+                    <execution>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>read-project-properties</goal>
+                        </goals>
+                        <configuration>
+                            <files>
+                                <file>${root.basedir}/dspace/config/dspace.cfg</file>
+                                <file>${root.basedir}/dspace/config/local.cfg</file>
+                            </files>
+                            <quiet>true</quiet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <resources>
+                        <resource>
+                            <directory>${basedir}/src/main/resources</directory>
+                            <includes>
+                                <include>**/*.properties</include>
+                                <include>**/static/**</include>
+                            </includes>
+                            <filtering>true</filtering>
+                        </resource>
+                    </resources>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/dspace/modules/server/pom.xml b/dspace/modules/server/pom.xml
@@ -12,6 +12,7 @@
     </parent>
 
     <properties>
+        <dspace.version>7.6-SNAPSHOT</dspace.version>
         <!-- This is the path to the root [dspace-src] directory. -->
         <root.basedir>${basedir}/../../..</root.basedir>
     </properties>
@@ -67,6 +68,31 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.dspace</groupId>
+                                    <artifactId>dspace-server-webapp</artifactId>
+                                    <version>${dspace.version}</version>
+                                    <type>jar</type>
+                                    <includes>**/static/**,**/*.properties</includes>
+                                    <outputDirectory>${project.build.directory}/additions</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <!-- This plugin allows us to run a Groovy script in our Maven POM
                  (see: https://groovy.github.io/gmaven/groovy-maven-plugin/execute.html )
                  We are generating a OS-agnostic version (agnostic.build.dir) of