This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 4_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 893b4e4d4c344049ad57e2ebad136cb2cda4a25a Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Wed Jun 3 09:27:36 2026 +0200 Core Docker image: avoid duplicating bundles and lib files --- docker/core/pom.xml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/docker/core/pom.xml b/docker/core/pom.xml index eaeda228ab..486ef03b8f 100644 --- a/docker/core/pom.xml +++ b/docker/core/pom.xml @@ -152,7 +152,7 @@ under the License. <goal>copy</goal> </goals> <configuration> - <outputDirectory>${project.build.outputDirectory}/bundles</outputDirectory> + <outputDirectory>${project.build.directory}/tmp/bundles</outputDirectory> </configuration> </execution> </executions> @@ -168,10 +168,10 @@ under the License. <phase>process-resources</phase> <configuration> <target> - <copy file="${settings.localRepository}/org/postgresql/postgresql/${jdbc.postgresql.version}/postgresql-${jdbc.postgresql.version}.jar" todir="${project.build.outputDirectory}/lib" overwrite="true"/> - <copy file="${settings.localRepository}/com/mysql/mysql-connector-j/${jdbc.mysql.version}/mysql-connector-j-${jdbc.mysql.version}.jar" todir="${project.build.outputDirectory}/lib" overwrite="true"/> - <copy file="${settings.localRepository}/org/mariadb/jdbc/mariadb-java-client/${jdbc.mariadb.version}/mariadb-java-client-${jdbc.mariadb.version}.jar" todir="${project.build.outputDirectory}/lib" overwrite="true"/> - <copy file="${settings.localRepository}/com/oracle/database/jdbc/ojdbc11/${jdbc.oracle.version}/ojdbc11-${jdbc.oracle.version}.jar" todir="${project.build.outputDirectory}/lib" overwrite="true"/> + <copy file="${settings.localRepository}/org/postgresql/postgresql/${jdbc.postgresql.version}/postgresql-${jdbc.postgresql.version}.jar" todir="${project.build.directory}/tmp/lib" overwrite="true"/> + <copy file="${settings.localRepository}/com/mysql/mysql-connector-j/${jdbc.mysql.version}/mysql-connector-j-${jdbc.mysql.version}.jar" todir="${project.build.directory}/tmp/lib" overwrite="true"/> + <copy file="${settings.localRepository}/org/mariadb/jdbc/mariadb-java-client/${jdbc.mariadb.version}/mariadb-java-client-${jdbc.mariadb.version}.jar" todir="${project.build.directory}/tmp/lib" overwrite="true"/> + <copy file="${settings.localRepository}/com/oracle/database/jdbc/ojdbc11/${jdbc.oracle.version}/ojdbc11-${jdbc.oracle.version}.jar" todir="${project.build.directory}/tmp/lib" overwrite="true"/> </target> </configuration> <goals> @@ -194,7 +194,7 @@ under the License. <goal>repackage</goal> </goals> <configuration> - <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory> + <outputDirectory>${project.build.directory}/tmp/lib</outputDirectory> </configuration> </execution> </executions> @@ -209,7 +209,7 @@ under the License. <image> <name>apache/syncope:%v</name> <build> - <dockerFileDir>${project.build.outputDirectory}</dockerFileDir> + <dockerFileDir>${project.build.directory}/tmp</dockerFileDir> <buildx> <platforms> <platform>linux/amd64</platform> @@ -243,6 +243,7 @@ under the License. <resource> <directory>src/main/resources</directory> <filtering>true</filtering> + <targetPath>${project.build.directory}/tmp</targetPath> </resource> <resource> @@ -251,6 +252,7 @@ under the License. <include>saml.keystore.jks</include> </includes> <filtering>false</filtering> + <targetPath>${project.build.directory}/tmp</targetPath> </resource> </resources> </build>
