Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added extra compiler jar

Correctly configure optional dependencies
  • Loading branch information...
commit d2eab2fd68a593ba2223dfa4ab0d9ea21d4d5e79 1 parent 79faf45
@skyluc skyluc authored
View
54 org.scala-ide.sbt.full.library/pom.xml
@@ -25,140 +25,140 @@
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>actions_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>api_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>cache_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>classfile_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>classpath_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>collections_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>compile_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>control_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>incremental-compiler_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>io_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>ivy_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>launcher-interface_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>logging_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>main_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>persist_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>process_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>run_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>tasks_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>task-system_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>sbt_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>completion_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<!-- all the other dependencies -->
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>launcher_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<!-- use the interface with which we were built -->
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>precompiled-${sbt.compiled.version}-${scala.precompiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>interface_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<!-- all the dependencies necessary for running like sbinary, ivy, jline -->
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.ivy</groupId>
<artifactId>ivy</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbinary</groupId>
<artifactId>sbinary_${sbt.compiled.version}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
</dependencies>
View
52 org.scala-ide.scala.compiler/pom.xml
@@ -20,10 +20,60 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <!--- the profile using the default values. Scala 2.9.x -->
+ <id>scala-2.9.x</id>
+ </profile>
+
+ <profile>
+ <!-- Scala 2.10.x -->
+ <!-- Scala reflect was extracted in a different jar in 2.10 -->
+ <id>scala-2.10.x</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-reflect</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- add the source jar, to be able to attach the source to the Scala container. And the continuation plug-in -->
+ <id>copy</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-reflect</artifactId>
+ <classifier>sources</classifier>
+ <type>jar</type>
+ <destFileName>scala-reflect-src.jar</destFileName>
+ </artifactItem>
+ </artifactItems>
+ <stripVersion>true</stripVersion>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<!-- Needed for memorytest
View
6 org.scala-ide.scala.library/pom.xml
@@ -37,17 +37,17 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-swing</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>${scala.library.third-part}</artifactId>
- <optional/>
+ <optional>true</optional>
</dependency>
</dependencies>
View
5 pom.xml
@@ -168,6 +168,11 @@
<version>${scala.version}</version>
</dependency>
<dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-reflect</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.scala-lang.plugins</groupId>
<artifactId>continuations</artifactId>
<version>${scala.version}</version>
Please sign in to comment.
Something went wrong with that request. Please try again.