Permalink
Browse files

Removed unused properties and small cleanup in POMs

* Removed any reference to 2.9 profile
* Removed special-casing of dependencies due to Scala 2.9 (this is
  no longer needed as we dropped support for 2.9 a while ago)
* Removed a few properties that were not referenced.
  • Loading branch information...
dotta committed Aug 7, 2013
1 parent 741e581 commit 68914958ca78b51a44ff8aaca41e712a44cc498e
Showing with 15 additions and 110 deletions.
  1. +12 −93 org.scala-ide.scala.compiler/pom.xml
  2. +3 −13 org.scala-ide.scala.library/pom.xml
  3. +0 −4 pom.xml
@@ -17,101 +17,13 @@
<artifactId>scala-compiler</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-reflect</artifactId>
+ <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.reflect</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>
-
- <profile>
- <!-- Scala 2.11.x -->
- <!-- Scala reflect was extracted in a different jar in 2.11 -->
- <id>scala-2.11.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.reflect</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>
<plugin>
@@ -157,6 +69,13 @@
<artifactId>continuations</artifactId>
<type>jar</type>
</artifactItem>
+ <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>
@@ -12,25 +12,15 @@
<description>Bundle containing the Scala library</description>
<packaging>bundle</packaging>
- <properties>
- <!-- default value for Scala 2.9.x, can be overwritten by profiles -->
- <scala.library.third-part>scala-dbc</scala.library.third-part>
- </properties>
<profiles>
<profile>
<!--- the profile using the default values. Scala 2.10.x -->
<id>scala-2.10.x</id>
- <properties>
- <scala.library.third-part>scala-actors</scala.library.third-part>
- </properties>
</profile>
<profile>
<!--- the profile using the default values. Scala 2.11.x -->
<id>scala-2.11.x</id>
- <properties>
- <scala.library.third-part>scala-actors</scala.library.third-part>
- </properties>
<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
@@ -96,7 +86,7 @@
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
- <artifactId>${scala.library.third-part}</artifactId>
+ <artifactId>scala-actors</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
@@ -132,10 +122,10 @@
</artifactItem>
<artifactItem>
<groupId>org.scala-lang</groupId>
- <artifactId>${scala.library.third-part}</artifactId>
+ <artifactId>scala-actors</artifactId>
<classifier>sources</classifier>
<type>jar</type>
- <destFileName>${scala.library.third-part}-src.jar</destFileName>
+ <destFileName>scala-actors-src.jar</destFileName>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
View
@@ -24,7 +24,6 @@
<repo.scala-ide.root>http://download.scala-ide.org</repo.scala-ide.root>
<!-- fixed versions -->
- <ivy.version>2.2.0</ivy.version>
<miglayout.version>3.7.4</miglayout.version>
<log4j.version>1.2.17</log4j.version>
<mockito.version>1.9.5</mockito.version>
@@ -55,7 +54,6 @@
<!-- default values, can be overwritten by profiles -->
<scala.version>2.10.0</scala.version>
- <scala.era.major.version>2.10</scala.era.major.version>
<scala.library.version>${scala.version}</scala.library.version>
<version.suffix>2_10</version.suffix>
<version.tag>local</version.tag>
@@ -74,7 +72,6 @@
<id>scala-2.10.x</id>
<properties>
<scala.version>2.10.3-SNAPSHOT</scala.version>
- <scala.era.major.version>2.10</scala.era.major.version>
<version.suffix>2_10</version.suffix>
<repo.scala-refactoring>${repo.scala-ide.root}/scala-refactoring-210x</repo.scala-refactoring>
@@ -87,7 +84,6 @@
<id>scala-2.11.x</id>
<properties>
<scala.version>2.11.0-SNAPSHOT</scala.version>
- <scala.era.major.version>2.11</scala.era.major.version>
<version.suffix>2_11</version.suffix>
<repo.scala-refactoring>${repo.scala-ide.root}/scala-refactoring-211x</repo.scala-refactoring>

0 comments on commit 6891495

Please sign in to comment.