Merge pull request #225 from eclipse/merge_latest_fixes

Merge latest fixes
eclipse-vorto · Sep 3, 2020 · 308bed5 · 308bed5
2 parents 4bb732a + 17ac247
commit 308bed5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ jobs:
     services:
       - docker
     before_script:
+      - true
     script:
       - mvn --fail-fast -q clean install
       - docker build --build-arg JAR_FILE=./middleware-service/target/vorto-middleware-1.0.0.jar -f ./middleware-service/Dockerfile -t eclipsevorto/vorto-normalizer:nightly ./middleware-service;
@@ -45,8 +46,10 @@ jobs:
     language: node_js
     node_js:
     - '10'
-    before_script: 
-    script: 
+    before_script:
+      - true
+    script:
+      - true
     before_install:
     - cd vorto-dashboard
     install:
@@ -91,6 +94,7 @@ jobs:
     install:
     - echo "Installing dependencies"
     - yarn install
+    - echo "Finished yarn install"
     after_success:
     - echo "Creating build"
     - npm run build

diff --git a/vorto-dashboard/things/DataPoller/AuthToken.js b/vorto-dashboard/things/DataPoller/AuthToken.js
@@ -83,7 +83,7 @@ class AuthToken {
       grant_type: 'client_credentials',
       client_id: clientId,
       client_secret: clientSecret,
-      'scope:service': scope
+      'scope': scope
     }
 
     return request(this.getReqOpts(tokenForm))

diff --git a/vorto-generators/org.eclipse.vorto.codegen.azure/pom.xml b/vorto-generators/org.eclipse.vorto.codegen.azure/pom.xml
@@ -16,21 +16,33 @@
 			<groupId>org.eclipse.vorto</groupId>
 			<artifactId>org.eclipse.vorto.core</artifactId>
 			<version>0.11.1</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.google.guava</groupId>
+					<artifactId>guava</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.vorto</groupId>
 			<artifactId>plugin-api</artifactId>
 			<version>0.11.1</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.google.guava</groupId>
+					<artifactId>guava</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.xtend</groupId>
 			<artifactId>org.eclipse.xtend.lib</artifactId>
 			<version>${xtext.version}</version>
 			<exclusions>
 				<exclusion>
-					<artifactId>guava</artifactId>
 					<groupId>com.google.guava</groupId>
+					<artifactId>guava</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>