Merged 2.0.0-m3

scm-ui-components/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "bootstrap": "lerna bootstrap",
     "link": "lerna exec -- yarn link",
-    "unlink": "lerna exec -- yarn unlink"
+    "unlink": "lerna exec --no-bail -- yarn unlink"
   },
   "devDependencies": {
     "lerna": "^3.2.1"

scm-ui-components/packages/ui-components/src/apiclient.js

@@ -32,7 +32,7 @@ export function createUrl(url: string) {
   if (url.indexOf("/") !== 0) {
     urlWithStartingSlash = "/" + urlWithStartingSlash;
   }
-  return `${contextPath}/api/rest/v2${urlWithStartingSlash}`;
+  return `${contextPath}/api/v2${urlWithStartingSlash}`;
 }
 
 class ApiClient {

scm-ui-components/packages/ui-components/src/apiclient.test.js

@@ -9,7 +9,7 @@ describe("create url", () => {
   });
 
   it("should add prefix for api", () => {
-    expect(createUrl("/users")).toBe("/api/rest/v2/users");
-    expect(createUrl("users")).toBe("/api/rest/v2/users");
+    expect(createUrl("/users")).toBe("/api/v2/users");
+    expect(createUrl("users")).toBe("/api/v2/users");
   });
 });

scm-ui-components/pom.xml

@@ -48,6 +48,16 @@
               <script>bootstrap</script>
             </configuration>
           </execution>
+          <execution>
+            <id>unlink</id>
+            <phase>package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <script>unlink</script>
+            </configuration>
+          </execution>
           <execution>
             <id>link</id>
             <phase>package</phase>
@@ -58,16 +68,6 @@
               <script>link</script>
             </configuration>
           </execution>
-          <execution>
-            <id>unlink</id>
-            <phase>clean</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <script>unlink</script>
-            </configuration>
-          </execution>
         </executions>
       </plugin>