28 files changed, 79 insertions, 76 deletions
diff --git a/lib/agent/agent.go b/lib/agent/agent.go
index 989c9a0..3aa89a8 100644
--- a/lib/agent/agent.go
+++ b/lib/agent/agent.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,9 +27,10 @@ import (
 	"syscall"
 	"time"
 
+	st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/syncthing"
+
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig"
 	"github.com/Sirupsen/logrus"
-	"github.com/iotbzh/xds-agent/lib/syncthing"
-	"github.com/iotbzh/xds-agent/lib/xdsconfig"
 	"github.com/urfave/cli"
 )
 
diff --git a/lib/agent/apiv1-browse.go b/lib/agent/apiv1-browse.go
index c873d43..dcfe79b 100644
--- a/lib/agent/apiv1-browse.go
+++ b/lib/agent/apiv1-browse.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/agent/apiv1-config.go b/lib/agent/apiv1-config.go
index 0b1e200..54d3525 100644
--- a/lib/agent/apiv1-config.go
+++ b/lib/agent/apiv1-config.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +21,10 @@ import (
 	"net/http"
 	"sync"
 
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
 	"github.com/gin-gonic/gin"
-	"github.com/iotbzh/xds-agent/lib/xaapiv1"
-	"github.com/iotbzh/xds-agent/lib/xdsconfig"
-	common "github.com/iotbzh/xds-common/golib"
 )
 
 var confMut sync.Mutex
diff --git a/lib/agent/apiv1-events.go b/lib/agent/apiv1-events.go
index d76e2d1..d18bd1f 100644
--- a/lib/agent/apiv1-events.go
+++ b/lib/agent/apiv1-events.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,9 +20,9 @@ package agent
 import (
 	"net/http"
 
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
 	"github.com/gin-gonic/gin"
-	"github.com/iotbzh/xds-agent/lib/xaapiv1"
-	common "github.com/iotbzh/xds-common/golib"
 )
 
 // eventsList Registering for events that will be send over a WS
diff --git a/lib/agent/apiv1-exec.go b/lib/agent/apiv1-exec.go
index ace2cdc..4a1340b 100644
--- a/lib/agent/apiv1-exec.go
+++ b/lib/agent/apiv1-exec.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,11 +20,11 @@ package agent
 import (
 	"net/http"
 
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 	"github.com/franciscocpg/reflectme"
 	"github.com/gin-gonic/gin"
-	"github.com/iotbzh/xds-agent/lib/xaapiv1"
-	common "github.com/iotbzh/xds-common/golib"
-	"github.com/iotbzh/xds-server/lib/xsapiv1"
 	uuid "github.com/satori/go.uuid"
 )
 
diff --git a/lib/agent/apiv1-projects.go b/lib/agent/apiv1-projects.go
index b69474d..ceb92bb 100644
--- a/lib/agent/apiv1-projects.go
+++ b/lib/agent/apiv1-projects.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,9 +20,9 @@ package agent
 import (
 	"net/http"
 
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
 	"github.com/gin-gonic/gin"
-	"github.com/iotbzh/xds-agent/lib/xaapiv1"
-	common "github.com/iotbzh/xds-common/golib"
 )
 
 // getProjects returns all projects configuration
diff --git a/lib/agent/apiv1-sdks.go b/lib/agent/apiv1-sdks.go
index 7d6342b..fd897fc 100644
--- a/lib/agent/apiv1-sdks.go
+++ b/lib/agent/apiv1-sdks.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,8 +21,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/iotbzh/xds-agent/lib/xaapiv1"
-	"github.com/iotbzh/xds-server/lib/xsapiv1"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 )
 
 // sdksPassthroughInit Declare passthrough routes for sdks
diff --git a/lib/agent/apiv1-version.go b/lib/agent/apiv1-version.go
index 5d950ef..ada785e 100644
--- a/lib/agent/apiv1-version.go
+++ b/lib/agent/apiv1-version.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"net/http"
 
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
 	"github.com/gin-gonic/gin"
-	"github.com/iotbzh/xds-agent/lib/xaapiv1"
 )
 
 // getInfo : return various information about server
diff --git a/lib/agent/apiv1.go b/lib/agent/apiv1.go
index a66f451..c5f4d22 100644
--- a/lib/agent/apiv1.go
+++ b/lib/agent/apiv1.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"strconv"
 
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 	"github.com/gin-gonic/gin"
-	"github.com/iotbzh/xds-agent/lib/xdsconfig"
-	"github.com/iotbzh/xds-server/lib/xsapiv1"
 )
 
 const apiBaseURL = "/api/v1"
diff --git a/lib/agent/events.go b/lib/agent/events.go
index 678f116..45a262e 100644
--- a/lib/agent/events.go
+++ b/lib/agent/events.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/iotbzh/xds-agent/lib/xaapiv1"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
 )
 
 // EventDef Definition on one event
diff --git a/lib/agent/project-interface.go b/lib/agent/project-interface.go
index 867c588..4d61819 100644
--- a/lib/agent/project-interface.go
+++ b/lib/agent/project-interface.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,16 +17,16 @@
 
 package agent
 
-import "github.com/iotbzh/xds-agent/lib/xaapiv1"
+import "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
 
 // IPROJECT Project interface
 type IPROJECT interface {
-	Add(cfg xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error)          // Add a new project
-	Setup(prj xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) // Local setup of the project
-	Delete() error                                                      // Delete a project
-	GetProject() *xaapiv1.ProjectConfig                                   // Get project public configuration
-	Update(prj xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error)       // Update project configuration
-	GetServer() *XdsServer                                              // Get XdsServer that holds this project
-	Sync() error                                                        // Force project files synchronization
-	IsInSync() (bool, error)                                            // Check if project files are in-sync
+	Add(cfg xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error)    // Add a new project
+	Setup(prj xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error)  // Local setup of the project
+	Delete() error                                                    // Delete a project
+	GetProject() *xaapiv1.ProjectConfig                               // Get project public configuration
+	Update(prj xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) // Update project configuration
+	GetServer() *XdsServer                                            // Get XdsServer that holds this project
+	Sync() error                                                      // Force project files synchronization
+	IsInSync() (bool, error)                                          // Check if project files are in-sync
 }
diff --git a/lib/agent/project-pathmap.go b/lib/agent/project-pathmap.go
index 8b6e824..875384e 100644
--- a/lib/agent/project-pathmap.go
+++ b/lib/agent/project-pathmap.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,9 +23,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/iotbzh/xds-agent/lib/xaapiv1"
-	common "github.com/iotbzh/xds-common/golib"
-	"github.com/iotbzh/xds-server/lib/xsapiv1"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 )
 
 // IPROJECT interface implementation for native/path mapping projects
diff --git a/lib/agent/project-st.go b/lib/agent/project-st.go
index c92f5d4..60fe262 100644
--- a/lib/agent/project-st.go
+++ b/lib/agent/project-st.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,9 +21,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	st "github.com/iotbzh/xds-agent/lib/syncthing"
-	"github.com/iotbzh/xds-agent/lib/xaapiv1"
-	"github.com/iotbzh/xds-server/lib/xsapiv1"
+	st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/syncthing"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 )
 
 // IPROJECT interface implementation for syncthing projects
diff --git a/lib/agent/projects.go b/lib/agent/projects.go
index 4e8b0f6..ff28f96 100644
--- a/lib/agent/projects.go
+++ b/lib/agent/projects.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,11 +25,12 @@ import (
 	"strings"
 	"time"
 
+	st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/syncthing"
+
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 	"github.com/franciscocpg/reflectme"
-	"github.com/iotbzh/xds-agent/lib/syncthing"
-	"github.com/iotbzh/xds-agent/lib/xaapiv1"
-	common "github.com/iotbzh/xds-common/golib"
-	"github.com/iotbzh/xds-server/lib/xsapiv1"
 	"github.com/syncthing/syncthing/lib/sync"
 )
 
diff --git a/lib/agent/sessions.go b/lib/agent/sessions.go
index 3655eef..8641527 100644
--- a/lib/agent/sessions.go
+++ b/lib/agent/sessions.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/agent/webserver.go b/lib/agent/webserver.go
index 3622efe..e8ad033 100644
--- a/lib/agent/webserver.go
+++ b/lib/agent/webserver.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,11 +24,12 @@ import (
 	"os"
 	"path"
 
+	socketio "github.com/googollee/go-socket.io"
+
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
 	"github.com/Sirupsen/logrus"
 	"github.com/gin-contrib/static"
 	"github.com/gin-gonic/gin"
-	"github.com/googollee/go-socket.io"
-	"github.com/iotbzh/xds-agent/lib/xaapiv1"
 )
 
 // WebServer .
diff --git a/lib/agent/xdsserver.go b/lib/agent/xdsserver.go
index 346bdb9..1c715f6 100644
--- a/lib/agent/xdsserver.go
+++ b/lib/agent/xdsserver.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,11 +26,11 @@ import (
 	"sync"
 	"time"
 
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 	"github.com/gin-gonic/gin"
-	"github.com/iotbzh/xds-agent/lib/xaapiv1"
-	"github.com/iotbzh/xds-agent/lib/xdsconfig"
-	common "github.com/iotbzh/xds-common/golib"
-	"github.com/iotbzh/xds-server/lib/xsapiv1"
 	uuid "github.com/satori/go.uuid"
 	sio_client "github.com/sebd71/go-socket.io-client"
 )
diff --git a/lib/syncthing/st.go b/lib/syncthing/st.go
index 1ea3947..3e07605 100644
--- a/lib/syncthing/st.go
+++ b/lib/syncthing/st.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,9 +33,9 @@ import (
 
 	"os/exec"
 
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
 	"github.com/Sirupsen/logrus"
-	"github.com/iotbzh/xds-agent/lib/xdsconfig"
-	common "github.com/iotbzh/xds-common/golib"
 	"github.com/syncthing/syncthing/lib/config"
 )
 
diff --git a/lib/syncthing/stEvent.go b/lib/syncthing/stEvent.go
index d8e0e0a..473a975 100644
--- a/lib/syncthing/stEvent.go
+++ b/lib/syncthing/stEvent.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/syncthing/stfolder.go b/lib/syncthing/stfolder.go
index 098ab2d..05ec5f9 100644
--- a/lib/syncthing/stfolder.go
+++ b/lib/syncthing/stfolder.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"strings"
 
-	common "github.com/iotbzh/xds-common/golib"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
 	stconfig "github.com/syncthing/syncthing/lib/config"
 	"github.com/syncthing/syncthing/lib/protocol"
 )
diff --git a/lib/xaapiv1/config.go b/lib/xaapiv1/config.go
index 3bc25e3..b1c5fec 100644
--- a/lib/xaapiv1/config.go
+++ b/lib/xaapiv1/config.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/xaapiv1/events.go b/lib/xaapiv1/events.go
index 16c2dd7..ab08d0f 100644
--- a/lib/xaapiv1/events.go
+++ b/lib/xaapiv1/events.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/xaapiv1/exec.go b/lib/xaapiv1/exec.go
index c2335f6..4b089e7 100644
--- a/lib/xaapiv1/exec.go
+++ b/lib/xaapiv1/exec.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/xaapiv1/projects.go b/lib/xaapiv1/projects.go
index 05888a5..567ed1c 100644
--- a/lib/xaapiv1/projects.go
+++ b/lib/xaapiv1/projects.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/xaapiv1/sdks.go b/lib/xaapiv1/sdks.go
index 5a20571..7f2ab02 100644
--- a/lib/xaapiv1/sdks.go
+++ b/lib/xaapiv1/sdks.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/xaapiv1/version.go b/lib/xaapiv1/version.go
index d37c55d..e611e22 100644
--- a/lib/xaapiv1/version.go
+++ b/lib/xaapiv1/version.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/xdsconfig/config.go b/lib/xdsconfig/config.go
index fd9b034..b7bf57b 100644
--- a/lib/xdsconfig/config.go
+++ b/lib/xdsconfig/config.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,8 +24,8 @@ import (
 
 	"os"
 
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
 	"github.com/Sirupsen/logrus"
-	common "github.com/iotbzh/xds-common/golib"
 	uuid "github.com/satori/go.uuid"
 	"github.com/urfave/cli"
 )
diff --git a/lib/xdsconfig/configfile.go b/lib/xdsconfig/configfile.go
index 500c195..27456e7 100644
--- a/lib/xdsconfig/configfile.go
+++ b/lib/xdsconfig/configfile.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,7 @@ import (
 	"os"
 	"path"
 
-	common "github.com/iotbzh/xds-common/golib"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
 )
 
 type SyncThingConf struct {