From 0beb403f5df390aeb04291f30ae05388131235df Mon Sep 17 00:00:00 2001
From: David Gageot <david@gageot.net>
Date: Mon, 16 Jul 2012 18:36:41 +0200
Subject: [PATCH] SONAR-3664 Log sonar/plugins versions and sha1 at startup

---
 .../core/plugins/DefaultPluginMetadata.java   |  10 ++++
 .../sonar/core/plugins/PluginInstaller.java   |   1 +
 .../plugins/DefaultPluginMetadataTest.java    |   4 +-
 .../core/plugins/PluginInstallerTest.java     |  11 ++--
 .../plugins/sonar-cobertura-plugin-3.1.1.jar  | Bin 0 -> 14560 bytes
 .../org/sonar/server/platform/ServerImpl.java |  55 +++++++++++-------
 .../sonar/server/plugins/PluginDeployer.java  |   4 +-
 .../src/main/resources/build.properties       |   2 +
 .../sonar/server/platform/ServerImplTest.java |  20 +++++--
 .../platform/ServerImplTest/build.properties  |   2 +
 10 files changed, 75 insertions(+), 34 deletions(-)
 create mode 100644 sonar-core/src/test/resources/org/sonar/core/plugins/sonar-cobertura-plugin-3.1.1.jar
 create mode 100644 sonar-server/src/main/resources/build.properties
 create mode 100644 sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties

diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/DefaultPluginMetadata.java b/sonar-core/src/main/java/org/sonar/core/plugins/DefaultPluginMetadata.java
index fb9498bc0f8..6b96809a76b 100644
--- a/sonar-core/src/main/java/org/sonar/core/plugins/DefaultPluginMetadata.java
+++ b/sonar-core/src/main/java/org/sonar/core/plugins/DefaultPluginMetadata.java
@@ -47,6 +47,7 @@ public class DefaultPluginMetadata implements PluginMetadata, Comparable<PluginM
   private boolean useChildFirstClassLoader;
   private String basePlugin;
   private boolean core;
+  private String implementationBuild;
 
   private DefaultPluginMetadata() {
   }
@@ -239,6 +240,15 @@ public class DefaultPluginMetadata implements PluginMetadata, Comparable<PluginM
     return this;
   }
 
+  public String getImplementationBuild() {
+    return implementationBuild;
+  }
+
+  public DefaultPluginMetadata setImplementationBuild(String implementationBuild) {
+    this.implementationBuild = implementationBuild;
+    return this;
+  }
+
   public boolean isOldManifest() {
     return !hasKey() && hasMainClass();
   }
diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/PluginInstaller.java b/sonar-core/src/main/java/org/sonar/core/plugins/PluginInstaller.java
index d0289f4a82f..085765a92d2 100644
--- a/sonar-core/src/main/java/org/sonar/core/plugins/PluginInstaller.java
+++ b/sonar-core/src/main/java/org/sonar/core/plugins/PluginInstaller.java
@@ -121,6 +121,7 @@ public class PluginInstaller {
       metadata.setPathsToInternalDeps(manifest.getDependencies());
       metadata.setUseChildFirstClassLoader(manifest.isUseChildFirstClassLoader());
       metadata.setBasePlugin(manifest.getBasePlugin());
+      metadata.setImplementationBuild(manifest.getImplementationBuild());
       metadata.setCore(isCore);
       if (metadata.isOldManifest()) {
         completeDeprecatedMetadata(metadata);
diff --git a/sonar-core/src/test/java/org/sonar/core/plugins/DefaultPluginMetadataTest.java b/sonar-core/src/test/java/org/sonar/core/plugins/DefaultPluginMetadataTest.java
index 5ac3f1dcc0a..7d8a770e85e 100644
--- a/sonar-core/src/test/java/org/sonar/core/plugins/DefaultPluginMetadataTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/plugins/DefaultPluginMetadataTest.java
@@ -44,7 +44,8 @@ public class DefaultPluginMetadataTest {
         .setVersion("1.1")
         .setSonarVersion("3.0")
         .setUseChildFirstClassLoader(true)
-        .setCore(false);
+        .setCore(false)
+        .setImplementationBuild("abcdef");
 
     assertThat(metadata.getKey()).isEqualTo("checkstyle");
     assertThat(metadata.getLicense()).isEqualTo("LGPL");
@@ -60,6 +61,7 @@ public class DefaultPluginMetadataTest {
     assertThat(metadata.getBasePlugin()).isNull();
     assertThat(metadata.getFile()).isNotNull();
     assertThat(metadata.getDeployedFiles()).isEmpty();
+    assertThat(metadata.getImplementationBuild()).isEqualTo("abcdef");
   }
 
   @Test
diff --git a/sonar-core/src/test/java/org/sonar/core/plugins/PluginInstallerTest.java b/sonar-core/src/test/java/org/sonar/core/plugins/PluginInstallerTest.java
index e9a893c48be..36d32419e3e 100644
--- a/sonar-core/src/test/java/org/sonar/core/plugins/PluginInstallerTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/plugins/PluginInstallerTest.java
@@ -38,14 +38,15 @@ public class PluginInstallerTest {
 
   @Test
   public void shouldExtractMetadata() {
-    DefaultPluginMetadata metadata = extractor.extractMetadata(getFile("sonar-checkstyle-plugin-2.8.jar"), true);
+    DefaultPluginMetadata metadata = extractor.extractMetadata(getFile("sonar-cobertura-plugin-3.1.1.jar"), true);
 
-    assertThat(metadata.getKey()).isEqualTo("checkstyle");
+    assertThat(metadata.getKey()).isEqualTo("cobertura");
     assertThat(metadata.getBasePlugin()).isNull();
-    assertThat(metadata.getName()).isEqualTo("Checkstyle");
+    assertThat(metadata.getName()).isEqualTo("Cobertura");
     assertThat(metadata.isCore()).isEqualTo(true);
-    assertThat(metadata.getFile().getName()).isEqualTo("sonar-checkstyle-plugin-2.8.jar");
-    assertThat(metadata.getVersion()).isEqualTo("2.8");
+    assertThat(metadata.getFile().getName()).isEqualTo("sonar-cobertura-plugin-3.1.1.jar");
+    assertThat(metadata.getVersion()).isEqualTo("3.1.1");
+    assertThat(metadata.getImplementationBuild()).isEqualTo("b9283404030db9ce1529b1fadfb98331686b116d");
   }
 
   @Test
diff --git a/sonar-core/src/test/resources/org/sonar/core/plugins/sonar-cobertura-plugin-3.1.1.jar b/sonar-core/src/test/resources/org/sonar/core/plugins/sonar-cobertura-plugin-3.1.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..6a74b55d02cc30115b73dd2e68e3348221059aed
GIT binary patch
literal 14560
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

literal 0
HcmV?d00001

diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java
index dfec05e9002..fc01c7a7279 100644
--- a/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java
@@ -20,8 +20,11 @@
 package org.sonar.server.platform;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Joiner;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.config.Settings;
 import org.sonar.api.platform.Server;
@@ -33,32 +36,41 @@ import java.util.Date;
 import java.util.Properties;
 
 public final class ServerImpl extends Server {
+  private static final Logger LOG = LoggerFactory.getLogger(ServerImpl.class);
 
+  private final Settings settings;
+  private final Date startedAt;
+  private final String buildProperties;
+  private final String pomProperties;
   private String id;
   private String version;
-  private final Date startedAt;
-  private Settings settings;
-  private final String manifest;
+  private String implementationBuild;
 
   public ServerImpl(Settings settings) {
-    this(settings, "/META-INF/maven/org.codehaus.sonar/sonar-plugin-api/pom.properties");
+    this(settings, "/build.properties", "/META-INF/maven/org.codehaus.sonar/sonar-plugin-api/pom.properties");
   }
 
   @VisibleForTesting
-  ServerImpl(Settings settings, String manifest) {
+  ServerImpl(Settings settings, String buildProperties, String pomProperties) {
     this.settings = settings;
     this.startedAt = new Date();
-    this.manifest = manifest;
+    this.buildProperties = buildProperties;
+    this.pomProperties = pomProperties;
   }
 
   public void start() {
     try {
       id = new SimpleDateFormat("yyyyMMddHHmmss").format(startedAt);
-      version = loadVersionFromManifest(manifest);
+
+      version = read(pomProperties).getProperty("version", "");
+      implementationBuild = read(buildProperties).getProperty("Implementation-Build");
+
       if (StringUtils.isBlank(version)) {
         throw new ServerStartException("Unknown Sonar version");
       }
 
+      LOG.info("Sonar {}", Joiner.on(" / ").skipNulls().join("Server", version, implementationBuild));
+
     } catch (IOException e) {
       throw new ServerStartException("Can not load metadata", e);
     }
@@ -79,31 +91,30 @@ public final class ServerImpl extends Server {
     return version;
   }
 
+  public String getImplementationBuild() {
+    return implementationBuild;
+  }
+
   @Override
   public Date getStartedAt() {
     return startedAt;
   }
 
-  private String loadVersionFromManifest(String pomFilename) throws IOException {
-    InputStream pomFileStream = getClass().getResourceAsStream(pomFilename);
-    try {
-      return readVersion(pomFileStream);
+  private static Properties read(String filename) throws IOException {
+    Properties properties = new Properties();
 
+    InputStream stream = null;
+    try {
+      stream = ServerImpl.class.getResourceAsStream(filename);
+      if (stream != null) {
+        properties.load(stream);
+      }
     } finally {
-      IOUtils.closeQuietly(pomFileStream);
+      IOUtils.closeQuietly(stream);
     }
-  }
 
-  protected static String readVersion(InputStream pomFileStream) throws IOException {
-    String result = null;
-    if (pomFileStream != null) {
-      Properties pomProp = new Properties();
-      pomProp.load(pomFileStream);
-      result = pomProp.getProperty("version");
-    }
-    return StringUtils.defaultIfEmpty(result, "");
+    return properties;
   }
-
   @Override
   public String getURL() {
     return null;
diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/PluginDeployer.java b/sonar-server/src/main/java/org/sonar/server/plugins/PluginDeployer.java
index 775408ca64c..6a00e387275 100644
--- a/sonar-server/src/main/java/org/sonar/server/plugins/PluginDeployer.java
+++ b/sonar-server/src/main/java/org/sonar/server/plugins/PluginDeployer.java
@@ -19,6 +19,8 @@
  */
 package org.sonar.server.plugins;
 
+import com.google.common.base.Joiner;
+
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -190,7 +192,7 @@ public class PluginDeployer implements ServerComponent {
   }
 
   private void deploy(DefaultPluginMetadata plugin) {
-    LOG.debug("Deploy plugin " + plugin);
+    LOG.info("Deploy plugin {}", Joiner.on(" / ").skipNulls().join(plugin.getName(), plugin.getVersion(), plugin.getImplementationBuild()));
 
     Preconditions.checkState(plugin.isCompatibleWith(server.getVersion()),
         "Plugin %s needs a more recent version of Sonar than %s. At least %s is expected",
diff --git a/sonar-server/src/main/resources/build.properties b/sonar-server/src/main/resources/build.properties
new file mode 100644
index 00000000000..8c9958a7711
--- /dev/null
+++ b/sonar-server/src/main/resources/build.properties
@@ -0,0 +1,2 @@
+Implementation-Build=${buildNumber}
+Build-Time=${timestamp}
\ No newline at end of file
diff --git a/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java
index 51a6df8c7fb..ced9e9d6925 100644
--- a/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java
@@ -35,7 +35,7 @@ public class ServerImplTest {
 
   @Test
   public void alwaysReturnTheSameValues() {
-    ServerImpl server = new ServerImpl(new Settings(), "/org/sonar/server/platform/ServerImplTest/pom-with-version.properties");
+    ServerImpl server = new ServerImpl(new Settings(), "", "/org/sonar/server/platform/ServerImplTest/pom-with-version.properties");
     server.start();
 
     assertThat(server.getId()).isNotNull();
@@ -50,18 +50,28 @@ public class ServerImplTest {
 
   @Test
   public void getVersionFromFile() {
-    ServerImpl server = new ServerImpl(new Settings(), "/org/sonar/server/platform/ServerImplTest/pom-with-version.properties");
+    ServerImpl server = new ServerImpl(new Settings(), "", "/org/sonar/server/platform/ServerImplTest/pom-with-version.properties");
     server.start();
 
     assertThat(server.getVersion()).isEqualTo("1.0");
   }
 
+  @Test
+  public void getImplementationBuildFromManifest() {
+    ServerImpl server = new ServerImpl(new Settings(),
+        "/org/sonar/server/platform/ServerImplTest/build.properties",
+        "/org/sonar/server/platform/ServerImplTest/pom-with-version.properties");
+    server.start();
+
+    assertThat(server.getImplementationBuild()).isEqualTo("0b9545a8b74aca473cb776275be4dc93a327c363");
+  }
+
   @Test
   public void testFileWithNoVersion() {
     exception.expect(ServerStartException.class);
     exception.expectMessage("Unknown Sonar version");
 
-    ServerImpl server = new ServerImpl(new Settings(), "/org/sonar/server/platform/ServerImplTest/pom-without-version.properties");
+    ServerImpl server = new ServerImpl(new Settings(), "", "/org/sonar/server/platform/ServerImplTest/pom-without-version.properties");
     server.start();
   }
 
@@ -70,7 +80,7 @@ public class ServerImplTest {
     exception.expect(ServerStartException.class);
     exception.expectMessage("Unknown Sonar version");
 
-    ServerImpl server = new ServerImpl(new Settings(), "/org/sonar/server/platform/ServerImplTest/pom-with-empty-version.properties");
+    ServerImpl server = new ServerImpl(new Settings(), "", "/org/sonar/server/platform/ServerImplTest/pom-with-empty-version.properties");
     server.start();
   }
 
@@ -79,7 +89,7 @@ public class ServerImplTest {
     exception.expect(ServerStartException.class);
     exception.expectMessage("Unknown Sonar version");
 
-    ServerImpl server = new ServerImpl(new Settings(), "/org/sonar/server/platform/ServerImplTest/unknown-file.properties");
+    ServerImpl server = new ServerImpl(new Settings(), "", "/org/sonar/server/platform/ServerImplTest/unknown-file.properties");
     server.start();
   }
 
diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties b/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties
new file mode 100644
index 00000000000..230f3ae8907
--- /dev/null
+++ b/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties
@@ -0,0 +1,2 @@
+Implementation-Build=0b9545a8b74aca473cb776275be4dc93a327c363
+Build-Time=1342455258749
\ No newline at end of file
-- 
2.39.5