[releng] changed to eclipse maven central proxy repository

7 files changed, 21 insertions, 27 deletions

diff --git a/build.gradle b/build.gradle
index 2d21c1458..89db21087 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,4 +12,10 @@ ext {
 allprojects {
 	group = 'org.eclipse.etrice'
 	version = '1.0.0-SNAPSHOT'
+	
+	repositories {
+		maven {
+			url 'https://repo.eclipse.org/content/repositories/maven_central/'
+		}
+	}
 }
\ No newline at end of file
diff --git a/plugins/build.gradle b/plugins/build.gradle
index 3c483f924..fb1a53d72 100644
--- a/plugins/build.gradle
+++ b/plugins/build.gradle
@@ -1,12 +1,4 @@
 subprojects {
-	repositories {
-		maven {
-			name 'Protos Nexus'
-			url 'http://10.8.1.101:8081/repository/maven-public'
-		}
-		mavenCentral()
-	}
-	
 	apply plugin: 'maven-publish'
 	
 	publishing {
@@ -17,21 +9,21 @@ subprojects {
 		}
 		repositories {
 			maven {
-				name 'maven-snapshots'
-				url "http://10.8.1.101:8081/repository/maven-snapshots"
+				name 'snapshots'
+				url "https://repo.eclipse.org/content/repositories/etrice-snapshots"
 				credentials {
-					username project.properties.nexusUser
-					password project.properties.nexusPassword
+					username project.properties.eclipseRepoUsername
+					password project.properties.eclipseRepoPassword
 				}
 			}
-			/*maven {
-				name 'maven-releases'
-				url "http://10.8.1.101:8081/repository/maven-releases"
+			maven {
+				name 'releases'
+				url "https://repo.eclipse.org/content/repositories/etrice-releases"
 				credentials {
-					username properties.nexusUser
-					password properties.nexusPassword
+					username project.properties.eclipseRepoUsername
+					password project.properties.eclipseRepoPassword
 				}
-			}*/
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/RunCRuntimeTestcases.c b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/RunCRuntimeTestcases.c
index d011b03e8..8aed2e209 100644
--- a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/RunCRuntimeTestcases.c
+++ b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/RunCRuntimeTestcases.c
@@ -56,7 +56,7 @@ void RunCRuntimeTestcases(void){
 
 	/* special situation for testing openAll and closeAll of etUnit
 	 * this has to be done outside of etUnit_open and etUnit_close */
-	id = etUnit_openAll("log","TestEtUnitSpecial", "etUnit", "org.eclipse.etrice.runtime.c.tests.openAll_and_closeAll");
+	id = etUnit_openAll("log","TestEtUnitSpecial", "org.eclipse.etrice.runtime.c.tests.etUnit", "openAll_and_closeAll");
 	EXPECT_TRUE(id, "Open and Close", ET_TRUE);
 	etUnit_closeAll(id);
 
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/util/TestUtil.c b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/util/TestUtil.c
index 6c6a5f4ea..335a792c5 100644
--- a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/util/TestUtil.c
+++ b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/util/TestUtil.c
@@ -49,7 +49,7 @@ static void TestRandomGenerator (etInt16 id) {
 #endif
 
 void TestUtil_runSuite(void){
-	etUnit_openTestSuite("org.eclipse.etrice.runtime.c.TestUtil");
+	etUnit_openTestSuite("org.eclipse.etrice.runtime.c.tests.TestUtil");
 
 #ifdef ET_FLOAT64
 	ADD_TESTCASE(TestRandomGenerator);
diff --git a/tests/org.eclipse.etrice.runtime.java.tests/build.gradle b/tests/org.eclipse.etrice.runtime.java.tests/build.gradle
index 63cdcb3bd..ad80588e9 100644
--- a/tests/org.eclipse.etrice.runtime.java.tests/build.gradle
+++ b/tests/org.eclipse.etrice.runtime.java.tests/build.gradle
@@ -2,10 +2,6 @@ plugins {
 	id 'java'
 }
 
-repositories {
-	mavenCentral()
-}
-
 dependencies {
 	testCompile project(':runtime:org.eclipse.etrice.runtime.java')
 	testCompile 'junit:junit:4.12'
diff --git a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/debugging/MSCLoggerTest.java b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/debugging/MSCLoggerTest.java
index 055a31f46..704bfe90b 100644
--- a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/debugging/MSCLoggerTest.java
+++ b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/debugging/MSCLoggerTest.java
@@ -16,7 +16,7 @@ public class MSCLoggerTest extends TestCase {
 
 	public void testMSCLogger() {
 		MSCLogger logger = new MSCLogger();
-		logger.setMSC("MSC1", ".\\");
+		logger.setMSC("MSC1", "./");
 		logger.open();
 		logger.addMessageAsyncOut("Inst1", "Inst2", "msg1");
 		logger.addMessageAsyncIn("Inst1", "Inst2", "msg1");
diff --git a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/etunit/EtUnitTest.java b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/etunit/EtUnitTest.java
index 99c7f60d8..1916f84ab 100644
--- a/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/etunit/EtUnitTest.java
+++ b/tests/org.eclipse.etrice.runtime.java.tests/src/org/eclipse/etrice/runtime/java/etunit/EtUnitTest.java
@@ -80,7 +80,7 @@ public class EtUnitTest extends TestCase {
 	}
 
 	public void testSuite() throws IOException {
-		etUnit_open(null, "test");
+		etUnit_open("log", "test");
 		etUnit_openTestSuite("TestEtUnit");
 		
 		int id = etUnit_openTestCase("doTestExpect");
@@ -96,7 +96,7 @@ public class EtUnitTest extends TestCase {
 		
 		ArrayList<String> lines = new ArrayList<String>();
 		{
-			FileReader fr = new FileReader("test.etu");
+			FileReader fr = new FileReader("log/test.etu");
 			BufferedReader br = new BufferedReader(fr);
 			String line;
 			while ((line=br.readLine())!=null)