[Truffle] Update to Truffle 0.18

jruby · Oct 10, 2016 · ff04687 · ff04687
1 parent a1a1fe1
commit ff04687
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/mx.jruby/suite.py b/mx.jruby/suite.py
@@ -34,7 +34,7 @@ def mavenLib(mavenDep, sha1, sourceSha1):
         "suites": [
             {
                 "name": "truffle",
-                # Must be the same as in truffle/pom.rb (except for the -SNAPSHOT part only in pom.rb)
+                # Must be the same as in truffle/pom.rb (except for the -SNAPSHOT part only in pom.rb, and there we can use a release name)
                 "version": "26a836113b25ee06102940e88da92cc6016922b5",
                 "urls": [
                     {"url": "https://github.com/graalvm/truffle.git", "kind": "git"},

diff --git a/truffle/pom.rb b/truffle/pom.rb
@@ -9,8 +9,8 @@
 
   properties( 'polyglot.dump.pom' => 'pom.xml',
               'polyglot.dump.readonly' => true,
-              # Must be the same as in mx.jruby/suite.py (except for the -SNAPSHOT part only in this file)
-              'truffle.version' => '26a836113b25ee06102940e88da92cc6016922b5-SNAPSHOT',
+              # Must be the same as in mx.jruby/suite.py (except for the -SNAPSHOT part only in this file, and here we can use a release name)
+              'truffle.version' => '0.18',
               'jruby.basedir' => '${basedir}/..',
               'maven.test.skip' => 'true' )
 
@@ -19,8 +19,8 @@
 
   jar 'org.jruby:jruby-core', '${project.version}', :scope => 'provided'
 
-  repository( :url => 'http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/',
-              :id => 'truffle' )
+  #repository( :url => 'http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/',
+  #            :id => 'truffle' )
 
   truffle_version = '${truffle.version}'
   jar 'com.oracle.truffle:truffle-api:' + truffle_version

diff --git a/truffle/pom.xml b/truffle/pom.xml
@@ -21,7 +21,7 @@ DO NOT MODIFIY - GENERATED CODE
     <jruby.basedir>${basedir}/..</jruby.basedir>
     <polyglot.dump.readonly>true</polyglot.dump.readonly>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
-    <truffle.version>26a836113b25ee06102940e88da92cc6016922b5-SNAPSHOT</truffle.version>
+    <truffle.version>0.18</truffle.version>
   </properties>
   <dependencies>
     <dependency>
@@ -68,12 +68,6 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <repositories>
-    <repository>
-      <id>truffle</id>
-      <url>http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/</url>
-    </repository>
-  </repositories>
   <build>
     <defaultGoal>package</defaultGoal>
     <resources>