Permalink
Browse files

Added ``-vfinal`` to bundled Scala compiler+library

  • Loading branch information...
dotta committed Apr 23, 2012
1 parent 5df6e03 commit dae5cd4bd39cfffd429a117905f6c1b0442f0547
@@ -3,10 +3,10 @@
. $(dirname $0)/env.sh
# Scala compiler version to be used as a dependency
-SCALA_VERSION=2.9.2-RC2
+SCALA_VERSION=2.9.2
# Scala library version
-SCALA_LIBRARY_VERSION=2.9.2-RC2
+SCALA_LIBRARY_VERSION=2.9.2
#THIS NEEDS TO BE UPDATED ONCE WE HAVE SNAPSHOTS
@@ -8,7 +8,7 @@
<version>1</version>
<relativePath>../org.scala-ide/pom.xml</relativePath>
</parent>
- <version>2.9.2-RC1</version>
+ <version>2.9.2</version>
<artifactId>scala-toolchain-for-eclipse</artifactId>
<packaging>pom</packaging>
@@ -2,7 +2,7 @@
. $(dirname $0)/env.sh
-SCALA_VERSION=2.9.2-RC2
+SCALA_VERSION=2.9.2
PROFILE="-P scala-2.9.2-SNAPSHOT"
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scala-ide</groupId>
- <version>2.9.2-RC1</version>
+ <version>2.9.2</version>
<artifactId>scala-toolchain-for-eclipse</artifactId>
<relativePath>../org.scala-ide.build-toolchain/pom.xml</relativePath>
</parent>
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scala-ide</groupId>
- <version>2.9.2-RC1</version>
+ <version>2.9.2</version>
<artifactId>scala-toolchain-for-eclipse</artifactId>
<relativePath>../org.scala-ide.build-toolchain/pom.xml</relativePath>
</parent>
@@ -144,16 +144,16 @@
<instructions>
<Bundle-SymbolicName>org.scala-ide.scala.compiler</Bundle-SymbolicName>
<Bundle-Name>Scala Compiler for Eclipse</Bundle-Name>
- <Bundle-Version>${osgi.version.number}</Bundle-Version>
+ <Bundle-Version>${osgi.version.number}-vfinal</Bundle-Version>
<Bundle-Vendor>scala-ide.org</Bundle-Vendor>
<Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
- <_exportcontents>scala.reflect.internal.*;version=${osgi.version.number},
- scala.reflect.api.*;version=${osgi.version.number},
- scala.reflect.runtime.*;version=${osgi.version.number},
- scala.reflect.std.*;version=${osgi.version.number},
- scala.reflect.internal.transform.*;version=${osgi.version.number},
- scala.tools.*;version=${osgi.version.number},
- ch.epfl.lamp.*;version=${osgi.version.number}</_exportcontents>
+ <_exportcontents>scala.reflect.internal.*;version=${osgi.version.number}-vfinal,
+ scala.reflect.api.*;version=${osgi.version.number}-vfinal,
+ scala.reflect.runtime.*;version=${osgi.version.number}-vfinal,
+ scala.reflect.std.*;version=${osgi.version.number}-vfinal,
+ scala.reflect.internal.transform.*;version=${osgi.version.number}-vfinal,
+ scala.tools.*;version=${osgi.version.number}-vfinal,
+ ch.epfl.lamp.*;version=${osgi.version.number}-vfinal</_exportcontents>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripVersion>true</Embed-StripVersion>
<Include-Resource>lib=${project.build.directory}/lib</Include-Resource>
@@ -5,7 +5,7 @@
<parent>
<groupId>org.scala-ide</groupId>
<artifactId>scala-toolchain-for-eclipse</artifactId>
- <version>2.9.2-RC1</version>
+ <version>2.9.2</version>
<relativePath>../org.scala-ide.build-toolchain/pom.xml</relativePath>
</parent>
<artifactId>org.scala-ide.scala.library</artifactId>
@@ -135,10 +135,10 @@
<instructions>
<Bundle-SymbolicName>org.scala-ide.scala.library</Bundle-SymbolicName>
<Bundle-Name>Scala Library for Eclipse</Bundle-Name>
- <Bundle-Version>${osgi.version.number}</Bundle-Version>
+ <Bundle-Version>${osgi.version.number}-vfinal</Bundle-Version>
<Bundle-Vendor>scala-ide.org</Bundle-Vendor>
<Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
- <_exportcontents>scala.reflect;version=${osgi.version.number},scala.*;version=${osgi.version.number}</_exportcontents>
+ <_exportcontents>scala.reflect;version=${osgi.version.number}-vfinal,scala.*;version=${osgi.version.number}-vfinal</_exportcontents>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripVersion>true</Embed-StripVersion>
<Include-Resource>lib=${project.build.directory}/lib</Include-Resource>

0 comments on commit dae5cd4

Please sign in to comment.