From ffb2b239d6d8b57ed12841f7d902162fa9c52c7d Mon Sep 17 00:00:00 2001 From: Matteo Campana Date: Thu, 10 Mar 2016 18:42:13 +0100 Subject: [PATCH 1/6] Use buildnumber plugin to get the commit SHA-1 to identify the current build. --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index 557d7ed85c..496f2bf804 100644 --- a/pom.xml +++ b/pom.xml @@ -212,6 +212,19 @@ + + org.codehaus.mojo + buildnumber-maven-plugin + 1.4 + + + validate + + create + + + + org.apache.maven.plugins maven-assembly-plugin From 43ba719d38bc7d8275ec27e811c57ba9167a5ea5 Mon Sep 17 00:00:00 2001 From: Matteo Campana Date: Thu, 10 Mar 2016 18:43:46 +0100 Subject: [PATCH 2/6] Put the git SHA-1 in the jar manifest using maven-jar plugin. --- pom.xml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/pom.xml b/pom.xml index 496f2bf804..8a05756fa1 100644 --- a/pom.xml +++ b/pom.xml @@ -225,6 +225,47 @@ + + org.apache.maven.plugins + maven-jar-plugin + + + + ${buildNumber} + + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.4.3 + + + package + + shade + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + org.jitsi.videobridge.Main + + + + + + org.apache.maven.plugins maven-assembly-plugin From fd0ee76e627a5d2776ef51da63b45a68d5d3746a Mon Sep 17 00:00:00 2001 From: Matteo Campana Date: Thu, 10 Mar 2016 18:51:10 +0100 Subject: [PATCH 3/6] Added the git SHA-1 string to the package filename. --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 8a05756fa1..34adc3903a 100644 --- a/pom.xml +++ b/pom.xml @@ -279,7 +279,7 @@ false src/assembly/linux-x64-bin-archive.xml - ${project.artifactId}-linux-x64-${project.version} + ${project.artifactId}-linux-x64-${project.version}_${buildNumber} ${assembly.skipAssembly} @@ -292,7 +292,7 @@ false src/assembly/linux-x86-bin-archive.xml - ${project.artifactId}-linux-x86-${project.version} + ${project.artifactId}-linux-x86-${project.version}_${buildNumber} ${assembly.skipAssembly} @@ -305,7 +305,7 @@ false src/assembly/macosx-bin-archive.xml - ${project.artifactId}-macosx-${project.version} + ${project.artifactId}-macosx-${project.version}_${buildNumber} ${assembly.skipAssembly} @@ -318,7 +318,7 @@ false src/assembly/windows-x64-bin-archive.xml - ${project.artifactId}-windows-x64-${project.version} + ${project.artifactId}-windows-x64-${project.version}_${buildNumber} ${assembly.skipAssembly} @@ -331,7 +331,7 @@ false src/assembly/windows-x86-bin-archive.xml - ${project.artifactId}-windows-x86-${project.version} + ${project.artifactId}-windows-x86-${project.version}_${buildNumber} ${assembly.skipAssembly} From 4f98b8de1652065b4b676cfcacd5329e2a10509d Mon Sep 17 00:00:00 2001 From: Matteo Campana Date: Wed, 16 Mar 2016 16:18:50 +0100 Subject: [PATCH 4/6] Put the git SHA-1 in the jar manifest using maven-jar plugin. --- pom.xml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/pom.xml b/pom.xml index 496f2bf804..8a05756fa1 100644 --- a/pom.xml +++ b/pom.xml @@ -225,6 +225,47 @@ + + org.apache.maven.plugins + maven-jar-plugin + + + + ${buildNumber} + + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.4.3 + + + package + + shade + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + org.jitsi.videobridge.Main + + + + + + org.apache.maven.plugins maven-assembly-plugin From a8f3a78521c2a35f30f7784cc659fb94eb940ec0 Mon Sep 17 00:00:00 2001 From: Matteo Campana Date: Thu, 10 Mar 2016 18:51:10 +0100 Subject: [PATCH 5/6] Added the git SHA-1 string to the package filename. --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 8a05756fa1..34adc3903a 100644 --- a/pom.xml +++ b/pom.xml @@ -279,7 +279,7 @@ false src/assembly/linux-x64-bin-archive.xml - ${project.artifactId}-linux-x64-${project.version} + ${project.artifactId}-linux-x64-${project.version}_${buildNumber} ${assembly.skipAssembly} @@ -292,7 +292,7 @@ false src/assembly/linux-x86-bin-archive.xml - ${project.artifactId}-linux-x86-${project.version} + ${project.artifactId}-linux-x86-${project.version}_${buildNumber} ${assembly.skipAssembly} @@ -305,7 +305,7 @@ false src/assembly/macosx-bin-archive.xml - ${project.artifactId}-macosx-${project.version} + ${project.artifactId}-macosx-${project.version}_${buildNumber} ${assembly.skipAssembly} @@ -318,7 +318,7 @@ false src/assembly/windows-x64-bin-archive.xml - ${project.artifactId}-windows-x64-${project.version} + ${project.artifactId}-windows-x64-${project.version}_${buildNumber} ${assembly.skipAssembly} @@ -331,7 +331,7 @@ false src/assembly/windows-x86-bin-archive.xml - ${project.artifactId}-windows-x86-${project.version} + ${project.artifactId}-windows-x86-${project.version}_${buildNumber} ${assembly.skipAssembly} From a01bd1311ce653b7b673c64d19edd0b1c0264201 Mon Sep 17 00:00:00 2001 From: Matteo Campana Date: Fri, 11 Mar 2016 12:11:41 +0100 Subject: [PATCH 6/6] Avoid the creation of dependency-reduced-pom.xml file in the project directory. --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 34adc3903a..b33300826e 100644 --- a/pom.xml +++ b/pom.xml @@ -247,6 +247,7 @@ shade + false *:*