gh-1243 GitProperties shown should be for the SCDF Implementation

Author: ghillert

spring-cloud-dataflow-server-core/pom.xml

@@ -161,11 +161,5 @@
 				</includes>
 			</resource>
 		</resources>
-		<plugins>
-			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
-			</plugin>
-		</plugins>
 	</build>
 </project>

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/AboutController.java

@@ -110,10 +110,12 @@ public AboutResource getAboutResource() {
 		versionInfo.setShell(new Dependency("Spring Cloud Data Flow Shell",versionInfoProperties.getDataflowShellVersion()));
 		versionInfo.setDashboard(new Dependency("Spring Cloud Dataflow UI", versionInfoProperties.getDataflowDashboardVersion()));
 
-		versionInfo.setBranch(this.gitProperties.getBranch());
-		versionInfo.setCommitId(this.gitProperties.getCommitId());
-		versionInfo.setShortCommitId(this.gitProperties.getShortCommitId());
-		versionInfo.setCommitTime(this.gitProperties.getCommitTime());
+		if (this.gitProperties != null) {
+			versionInfo.setBranch(this.gitProperties.getBranch());
+			versionInfo.setCommitId(this.gitProperties.getCommitId());
+			versionInfo.setShortCommitId(this.gitProperties.getShortCommitId());
+			versionInfo.setCommitTime(this.gitProperties.getCommitTime());
+		}
 
 		aboutResource.setFeatureInfo(featureInfo);
 		aboutResource.setVersionInfo(versionInfo);

spring-cloud-dataflow-server-local/pom.xml

@@ -123,7 +123,6 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
 				<executions>
 					<execution>
 						<id>javadoc</id>
@@ -139,7 +138,6 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.4</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -150,6 +148,10 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>pl.project13.maven</groupId>
+				<artifactId>git-commit-id-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
 

spring-cloud-starter-dataflow-server-local/pom.xml

@@ -50,10 +50,6 @@
 			</resource>
 		</resources>
 		<plugins>
-			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>