From 90d6b485b183e2b03b5dcd417f3d462e4bc8178b Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Mon, 5 Feb 2018 15:38:10 +0000 Subject: [PATCH] SEARCH-664 (Add SearchServices/InsightEngine version to the Solr Admin UI) --- search-services/packaging/pom.xml | 53 +++++++++++++++++- .../src/assembly/solr-distribution.xml | 6 +- .../solr-webapp/webapp/img/alfresco-ico.png | Bin 0 -> 5726 bytes 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 search-services/packaging/src/main/resources/solr/server/solr-webapp/webapp/img/alfresco-ico.png diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index 3608377a8..692e0110a 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -8,7 +8,6 @@ UTF-8 UTF-8 ${maven.build.timestamp} - ${bamboo_fullBuildKey} ${bamboo_repository_revision_number} @@ -199,6 +198,58 @@ + + + com.google.code.maven-replacer-plugin + replacer + + + alter-index.css + prepare-package + + replace + + + ${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/css/angular/index.css + + + property\.png \); } + property.png ); } +#content #index #versions .alfresco span { background-image: url( ../../img/alfresco-ico.png ); } + + + + + + alter-index.html + prepare-package + + replace + + + ${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/partials/index.html + + + <li class="solr solr_spec_version"> + + <li class="alfresco"><dl class="clearfix"> + <dt><span>Search Services</span></dt> + <dd>\${project.version}</dd> + </dl></li> + + <li><dl class="clearfix"> + <dt><span></span></dt> + <dd>\${project.revision.key} - \${project.timestamp}</dd> + </dl></li> + + <li class="solr solr_spec_version"> + + + + + + + maven-assembly-plugin diff --git a/search-services/packaging/src/assembly/solr-distribution.xml b/search-services/packaging/src/assembly/solr-distribution.xml index ff3592556..e92e4637b 100644 --- a/search-services/packaging/src/assembly/solr-distribution.xml +++ b/search-services/packaging/src/assembly/solr-distribution.xml @@ -7,6 +7,11 @@ true ${project.artifactId} + + ${project.build.outputDirectory}/solr/server/solr-webapp/webapp/img + ./solr/server/solr-webapp/webapp/img + false + ${project.build.outputDirectory} . @@ -39,7 +44,6 @@ **/example/** **/bin/solr.in.sh **/bin/solr.in.cmd - diff --git a/search-services/packaging/src/main/resources/solr/server/solr-webapp/webapp/img/alfresco-ico.png b/search-services/packaging/src/main/resources/solr/server/solr-webapp/webapp/img/alfresco-ico.png new file mode 100644 index 0000000000000000000000000000000000000000..4e14e70cf0241637fbfaf94585b40f16e764b14f GIT binary patch literal 5726 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 XXWgBgTx{niu8r%%`}|n>FBJX({XKXR literal 0 HcmV?d00001