Merge pull request #102 from iExecBlockchainComputing/rename

Rename

Author: Ugo Plouviez

README.md

@@ -1,4 +1,4 @@
-# iexec-worker-new
+# iexec-worker
 
 ### Overview
 
@@ -15,12 +15,12 @@ The iExec-Worker component is in charge of running computing tasks sent by reque
 * for dev purposes:
 
 ```
-cd iexec-worker-new
+cd iexec-worker
 gradle bootRun --refresh-dependencies
 ```
 * or on a remote instance:
 ```
-cd iexec-worker-new
+cd iexec-worker
 ./gradlew bootRun --refresh-dependencies
 ```
 

build.gradle

@@ -24,14 +24,14 @@ group = 'com.iexec.worker'
 sourceCompatibility = 1.8
 
 def UNIQUE_ID='hostname -f'.execute().text.trim()
-def token='curl -XPOST --data name=${UNIQUE_ID} https://c770a93177c87a84c17cdfadc2f2a14f504988b89998083a:@packagecloud.io/install/repositories/iexec/common-new/tokens.text'.execute().text.trim()
+def token='curl -XPOST --data name=${UNIQUE_ID} https://58448eb9dc6e105c7a3f77c74880f451234251ea3eeae544:@packagecloud.io/install/repositories/iexec/common/tokens.text'.execute().text.trim()
 
 
 repositories {
 	mavenCentral()
 	jcenter()
     maven {
-        url "https://packagecloud.io/priv/${token}/iexec/common-new/maven2"
+        url "https://packagecloud.io/priv/${token}/iexec/common/maven2"
     }
 }
 
@@ -52,8 +52,8 @@ dependencyManagement {
 
 dependencies {
     // iexec
-    compile "com.iexec.common:iexec-common-new:$iexecCommonVersion"
-    //compile files('../iexec-common-new/build/libs/iexec-common-new-3.0.0-SNAPSHOT.jar')
+    compile "com.iexec.common:iexec-common:$iexecCommonVersion"
+    //compile files('../iexec-common/build/libs/iexec-common-3.0.0-SNAPSHOT.jar')
 
     // spring
     compile "org.springframework.boot:spring-boot-starter"
@@ -94,7 +94,7 @@ def isSnapshotVersion = project.version.contains("SNAPSHOT")
 uploadArchives {
     repositories.mavenDeployer {
         configuration = configurations.deployerJars
-        repository(url: "packagecloud+https://packagecloud.io/iexec/worker-new") {
+        repository(url: "packagecloud+https://packagecloud.io/iexec/worker") {
             authentication(password: packageCloudPassword)
         }
     }

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'iexec-worker-new'
+rootProject.name = 'iexec-worker'

src/main/resources/Dockerfile

@@ -1,5 +1,5 @@
 FROM openjdk:8u171-jre-alpine
 
-ADD build/libs/iexec-worker-new-@projectversion@.jar iexec-worker.jar
+ADD build/libs/iexec-worker-@projectversion@.jar iexec-worker.jar
 
-ENTRYPOINT ["java","-jar","/iexec-worker.jar"]
+ENTRYPOINT ["java","-jar","/iexec-worker.jar"]