Merge pull request #47 from mickaelistria/issue-19

Issue #19: Use Joni and JCodings from Orbit

org.eclipse.tm4e.core/META-INF/MANIFEST.MF

@@ -8,7 +8,10 @@ Bundle-Version: 0.1.0.qualifier
 Require-Bundle: org.apache.batik.css;bundle-version="1.7.0";resolution:=optional,
  org.apache.batik.util;bundle-version="1.7.0";resolution:=optional,
  com.google.gson;resolution:=optional,
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ org.jcodings;bundle-version="1.0.18",
+ org.joni;bundle-version="2.1.11",
+ org.junit;bundle-version="4.11.0"
 Import-Package: org.w3c.css.sac;resolution:=optional,
  org.w3c.css.sac.helpers;resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -20,7 +23,4 @@ Export-Package: org.eclipse.tm4e.core,
  org.eclipse.tm4e.core.registry,
  org.eclipse.tm4e.core.theme,
  org.eclipse.tm4e.core.theme.css
-Bundle-ClassPath: lib/jcodings-1.0.13.jar,
- lib/joni-2.1.11.jar,
- .
 Bundle-ActivationPolicy: lazy

org.eclipse.tm4e.core/build.properties

@@ -3,7 +3,5 @@ source.. = src/main/java/,\
 bin.includes = META-INF/,\
                .,\
                plugin.properties,\
-               lib/jcodings-1.0.13.jar,\
-               lib/joni-2.1.11.jar,\
                schema/,\
                plugin.xml

org.eclipse.tm4e.core/pom.xml

@@ -7,4 +7,21 @@
     <artifactId>org.eclipse.tm4e</artifactId>
     <version>0.1.0-SNAPSHOT</version>
   </parent>
+
+  <!-- Repeat dependencies as Mvn artifacts to org.eclipse.tm4e.core
+   can be consumed as a Java lib with Mvn (without OSGi not p2).
+   Tycho's pomDependencies must NOT be set to "consider" -->
+  <dependencies>
+		<dependency>
+			<groupId>org.jruby.joni</groupId>
+			<artifactId>joni</artifactId>
+			<version>2.1.11</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 </project>

pom.xml

@@ -179,20 +179,6 @@
 
 		</plugins>
 	</build>
-	<dependencies>
-		<!-- https://mvnrepository.com/artifact/org.jruby.joni/joni -->
-		<dependency>
-			<groupId>org.jruby.joni</groupId>
-			<artifactId>joni</artifactId>
-			<version>2.1.11</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
 
 	<repositories>
 		<repository>
@@ -203,7 +189,7 @@
 		<repository>
 			<id>orbit</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/</url>
+			<url>http://download.eclipse.org/tools/orbit/S-builds/S20170306214312/repository</url>
 		</repository>
 		<repository>
 			<id>license-feature</id>