rc config

thehyve · Feb 20, 2019 · f9f680e · f9f680e
1 parent 08b799d
commit f9f680e
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 59 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,28 +1,28 @@
 import groovy.json.JsonSlurper
 
 buildscript {
-    ext {
-        gradleNodeVersion = '1.2.0'
-    }
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        maven { url 'https://plugins.gradle.org/m2/' }
-    }
-    dependencies {
-        classpath "com.moowork.gradle:gradle-node-plugin:${gradleNodeVersion}"
-        classpath 'net.linguica.gradle:maven-settings-plugin:0.5'
-    }
+  ext {
+    gradleNodeVersion = '1.2.0'
+  }
+  repositories {
+    mavenLocal()
+    mavenCentral()
+    maven { url 'https://plugins.gradle.org/m2/' }
+  }
+  dependencies {
+    classpath "com.moowork.gradle:gradle-node-plugin:${gradleNodeVersion}"
+    classpath 'net.linguica.gradle:maven-settings-plugin:0.5'
+  }
 }
 
 def versionFile = new File('src/app/config/config.default.json')
 def versionObject = new JsonSlurper().parseText(versionFile.text)
 
 ext {
-    glowingBearVersion = versionObject['app-version']
-    nodeVersion = '10.12.0'
-    yarnVersion = '1.10.1'
-    gradleWrapperVersion = '4.0'
+  glowingBearVersion = versionObject['app-version']
+  nodeVersion = '11.10.0'
+  yarnVersion = '1.13.0'
+  gradleWrapperVersion = '4.0'
 }
 
 version = glowingBearVersion
@@ -36,20 +36,20 @@ apply plugin: 'net.linguica.maven-settings'
 apply plugin: 'maven-publish'
 
 repositories {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
+  repositories {
+    mavenLocal()
+    mavenCentral()
+  }
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = gradleWrapperVersion
+  gradleVersion = gradleWrapperVersion
 }
 
 node {
-    version = nodeVersion
-    yarnVersion = yarnVersion
-    download = true
+  version = nodeVersion
+  yarnVersion = yarnVersion
+  download = true
 }
 
 task yarnPackage(type: YarnTask, dependsOn: 'yarn') {
@@ -80,47 +80,47 @@ task yarnCodecov(type: YarnTask, dependsOn: 'yarn') {
 }
 
 clean {
-    delete fileTree(dir: 'dist')
-    delete 'coverage'
+  delete fileTree(dir: 'dist')
+  delete 'coverage'
 }
 
 distributions {
-    main {
-        baseName = 'glowing-bear'
-        contents {
-            from 'dist'
-            include '**'
-        }
+  main {
+    baseName = 'glowing-bear'
+    contents {
+      from 'dist'
+      include '**'
     }
-    cypress {
-        baseName = 'glowing-bear-cypress-tests'
-        contents {
-            from 'cypress'
-            include '**'
-        }
+  }
+  cypress {
+    baseName = 'glowing-bear-cypress-tests'
+    contents {
+      from 'cypress'
+      include '**'
     }
+  }
 }
 
 distZip.enabled = false
 cypressDistTar.enabled = false
 
 publishing {
-    repositories {
-        maven {
-            name 'nl.thehyve.nexus'
-            url 'https://repo.thehyve.nl/content/repositories/snapshots/'
-        }
+  repositories {
+    maven {
+      name 'nl.thehyve.nexus'
+      url 'https://repo.thehyve.nl/content/repositories/releases/'
+    }
+  }
+  publications {
+    app(MavenPublication) {
+      artifactId 'glowing-bear'
+      artifact distTar // Publish the output of the distTar task
     }
-    publications {
-        app(MavenPublication) {
-            artifactId 'glowing-bear'
-            artifact distTar // Publish the output of the distTar task
-        }
-        cypressTests(MavenPublication) {
-            artifactId 'glowing-bear-cypress-tests'
-            artifact cypressDistZip
-        }
+    cypressTests(MavenPublication) {
+      artifactId 'glowing-bear-cypress-tests'
+      artifact cypressDistZip
     }
+  }
 }
 publishToMavenLocal.dependsOn 'distTar'
 publish.dependsOn 'distTar'
diff --git a/src/app/config/config.default.json b/src/app/config/config.default.json
@@ -1,11 +1,11 @@
 {
-  "api-url": "https://transmart-dev.thehyve.net",
+  "api-url": "https://transmart-test.thehyve.net",
   "api-version": "v2",
-  "app-url": "https://localhost:4200",
-  "app-version": "0.0.1-SNAPSHOT",
-  "gb-backend-url": "https://gb-backend-dev.thehyve.net",
-  "fractalis-url": "https://fractalis-dev.thehyve.net",
-  "fractalis-datasource-url": "http://localhost:8080",
+  "app-url": "https://glowingbear-test.thehyve.net",
+  "app-version": "1.2.3",
+  "gb-backend-url": "https://gb-backend-test.thehyve.net",
+  "fractalis-url": "https://fractalis-test.thehyve.net",
+  "fractalis-datasource-url": "https://transmart-test.thehyve.net:8080",
   "doc-url": "https://glowingbear.app",
   "enable-fractalis-analysis": true,
   "autosave-subject-sets": false,
@@ -14,7 +14,7 @@
   "include-data-table": true,
   "include-cohort-subscription": false,
   "authentication-service-type": "oidc",
-  "oidc-server-url": "https://keycloak-dwh-test.thehyve.net/auth/realms/transmart-dev/protocol/openid-connect",
+  "oidc-server-url": "https://keycloak-dwh-test.thehyve.net/auth/realms/transmart-test/protocol/openid-connect",
   "oidc-client-id": "transmart-client",
   "export-mode": {
     "name": "transmart",