Skip to content
Snippets Groups Projects
Commit fbbc26ef authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into OZG-3929-spring-upgrade

# Conflicts:
#	goofy-client/pom.xml
#	goofy-server/pom.xml
parents e082b65d fedb430c
No related branches found
No related tags found
No related merge requests found
...@@ -201,11 +201,13 @@ ...@@ -201,11 +201,13 @@
</goals> </goals>
<configuration> <configuration>
<outputDirectory> <outputDirectory>
${project.build.directory}/classes/META-INF/resources</outputDirectory> ${project.build.directory}/classes/META-INF/resources
</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory> <directory>
../${project.parent.artifactId}-client/dist/apps/goofy/</directory> ../${project.parent.artifactId}-client/dist/apps/goofy/
</directory>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment