From be5b8ed2f3aa9cd5216db33e93131a52fa9ec43c Mon Sep 17 00:00:00 2001 From: Scott Kurz Date: Thu, 1 Jun 2023 10:33:31 -0400 Subject: [PATCH] Switch building uber JAR from assembly to shade plugins; exclude dep version.properties; add git.properties Signed-off-by: Scott Kurz --- jakarta.ls/pom.xml | 95 +++++++++++++++++-- .../src/main/resources/version.properties | 1 + 2 files changed, 86 insertions(+), 10 deletions(-) create mode 100644 jakarta.ls/src/main/resources/version.properties diff --git a/jakarta.ls/pom.xml b/jakarta.ls/pom.xml index f99de8c9..47c25cfe 100644 --- a/jakarta.ls/pom.xml +++ b/jakarta.ls/pom.xml @@ -34,6 +34,8 @@ UTF-8 17 17 + yyyyMMdd-HHmm + ${maven.build.timestamp} 0.17.0 repo.eclipse.org https://repo.eclipse.org/content/repositories/lsp4jakarta-releases/ @@ -107,26 +109,98 @@ + + + src/main/resources/ + true + + **/*.properties + + + + src/main/resources/ + false + + **/*.properties + + + - maven-assembly-plugin - 3.5.0 + org.codehaus.mojo + build-helper-maven-plugin + 3.2.0 + + + parse-version + + parse-version + + + + + + pl.project13.maven + git-commit-id-plugin + 4.9.10 + + + get-the-git-infos + + revision + + + + + ${project.basedir}/../.git + true + + ^git.commit.id.abbrev$ + ^git.commit.message.short$ + ^git.branch$ + ^git.build.version$ + + + true + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.3.0 make-assembly package - single + shade - - + true + jar-with-dependencies + false + + + *:* + + META-INF/ECLIPSE_.RSA + META-INF/ECLIPSE_.SF + + + + + *:org.eclipse.lsp4mp.ls + + version.properties + + + + + org.eclipse.lsp4jakarta.JakartaLanguageServerLauncher - - - - jar-with-dependencies - + + @@ -147,3 +221,4 @@ + diff --git a/jakarta.ls/src/main/resources/version.properties b/jakarta.ls/src/main/resources/version.properties new file mode 100644 index 00000000..f28ce73c --- /dev/null +++ b/jakarta.ls/src/main/resources/version.properties @@ -0,0 +1 @@ +version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-${dev.build.timestamp}