You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/09/06 15:50:58 UTC
[3/6] syncope git commit: Parachute for builds not from GIT repo
Parachute for builds not from GIT repo
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6cc2b2cc
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6cc2b2cc
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6cc2b2cc
Branch: refs/heads/2_0_X
Commit: 6cc2b2ccd15d3d4e14a0a8dd0a00b14f01a262ae
Parents: 20a13df
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Sep 6 17:50:25 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Sep 6 17:50:25 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/syncope/client/console/pages/BasePage.java | 6 ++++--
pom.xml | 3 +++
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/6cc2b2cc/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
index 815b29f..e8f1fb9 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
@@ -107,8 +107,10 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware {
// right sidebar
PlatformInfo platformInfo = SyncopeConsoleSession.get().getPlatformInfo();
Label version = new Label("version", platformInfo.getVersion());
- String versionLink = platformInfo.getVersion().endsWith("-SNAPSHOT")
- ? "https://git-wip-us.apache.org/repos/asf?p=syncope.git;a=commit;h=" + platformInfo.getBuildNumber()
+ String versionLink = StringUtils.isNotBlank(platformInfo.getBuildNumber())
+ && platformInfo.getVersion().endsWith("-SNAPSHOT")
+ ? "https://git-wip-us.apache.org/repos/asf?p=syncope.git;a=commit;h="
+ + platformInfo.getBuildNumber()
: "https://cwiki.apache.org/confluence/display/SYNCOPE/Jazz";
version.add(new AttributeModifier("onclick", "window.open('" + versionLink + "', '_blank')"));
body.add(version);
http://git-wip-us.apache.org/repos/asf/syncope/blob/6cc2b2cc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c7adcc9..b5d0876 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2070,6 +2070,9 @@ under the License.
project.properties['licenseUrl'] = project.parent.licenses[0].url
project.properties['site.deploymentBaseDir'] =
project.properties['site.deploymentBaseUrl'] == null || !project.properties['site.deploymentBaseUrl'].startsWith('file:') ? project.properties['project.build.directory'] + "/generated-docs" : project.properties['site.deploymentBaseUrl'].substring(7)
+
+ if (!project.properties.containsKey('buildNumber'))
+ project.properties['buildNumber'] = ""
</source>
</configuration>
</execution>