diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index c3ad15cdd..000000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.so filter=lfs diff=lfs merge=lfs -text diff --git a/pom.xml b/pom.xml index 61c851e3c..a296473ae 100644 --- a/pom.xml +++ b/pom.xml @@ -50,6 +50,7 @@ with even-numbered patch versions). Also when updating FoundationDB, make sure to update the version of FoundationDB used by GitHub Actions. --> 7.3.62 + bfed237b787fae3cde1222676e6bfbb0d218fc27bf9e903397a7a7aa96fb2d33 26.57.0 1.70.0 2.12.1 diff --git a/service/pom.xml b/service/pom.xml index 40ce2b6ee..7a4202516 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -543,6 +543,28 @@ exclude-spam-filter + + io.github.download-maven-plugin + download-maven-plugin + 2.0.0 + + + + install-foundationdb-client-library + prepare-package + + wget + + + + + + https://github.com/apple/foundationdb/releases/download/${foundationdb.version}/libfdb_c.x86_64.so + ${project.build.directory}/jib-extra/usr/local + ${foundationdb.client-library-sha256} + + + org.apache.maven.plugins maven-shade-plugin @@ -659,14 +681,14 @@ - - ${project.basedir}/src/main/jib - ${project.basedir}/config *.yml /usr/share/signal/ + + ${project.build.directory}/jib-extra + diff --git a/service/src/main/jib/usr/lib/libfdb_c.x86_64.so b/service/src/main/jib/usr/lib/libfdb_c.x86_64.so deleted file mode 100644 index de1868063..000000000 --- a/service/src/main/jib/usr/lib/libfdb_c.x86_64.so +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bfed237b787fae3cde1222676e6bfbb0d218fc27bf9e903397a7a7aa96fb2d33 -size 23671800