Skip to content
Browse files

Some heavy cleanup of pom files and scripts. Further, I have created …

…a parent

pom project that contains properties common to all subprojects.
  • Loading branch information...
1 parent 2ad36f2 commit 89f293def10b2d45334f2246e99c0d6f58f6ef75 @dotta dotta committed Mar 16, 2012
Showing with 140 additions and 406 deletions.
  1. +0 −29 org.scala-ide.build-toolchain/build-toolchain-2.8.x.sh
  2. +0 −14 org.scala-ide.build-toolchain/build-toolchain-2.9.0-1.sh
  3. +0 −14 org.scala-ide.build-toolchain/build-toolchain-2.9.0.final.sh
  4. +0 −26 org.scala-ide.build-toolchain/build-toolchain-2.9.1.sh
  5. +3 −3 org.scala-ide.build-toolchain/{build-toolchain-2.9.x.sh → build-toolchain-2.9.sh}
  6. +0 −11 org.scala-ide.build-toolchain/build-toolchain-local-2.8.x.sh
  7. +0 −24 org.scala-ide.build-toolchain/build-toolchain-local-trunk.sh
  8. +0 −15 org.scala-ide.build-toolchain/build-toolchain-maintenance-2.8.0.final.sh
  9. +0 −27 org.scala-ide.build-toolchain/build-toolchain-trunk.sh
  10. +14 −53 org.scala-ide.build-toolchain/pom.xml
  11. +0 −7 org.scala-ide.build/build-ide-2.8.3-SNAPSHOT
  12. +0 −7 org.scala-ide.build/build-ide-2.9.2-SNAPSHOT
  13. +9 −0 org.scala-ide.build/build-ide-2.9.sh
  14. +0 −11 org.scala-ide.build/build-ide-local-2.8.x.sh
  15. +0 −10 org.scala-ide.build/build-ide-local-2.9.x.sh
  16. +0 −9 org.scala-ide.build/build-ide-local-trunk.sh
  17. +0 −11 org.scala-ide.build/build-ide-maintenance-2.8.0.final.sh
  18. +0 −7 org.scala-ide.build/build-ide-trunk.sh
  19. +1 −1 org.scala-ide.build/env.sh
  20. +44 −42 org.scala-ide.build/pom.xml
  21. +9 −0 org.scala-ide.build/release-build-ide-2.9.sh
  22. +2 −52 org.scala-ide.sbt.full.library/pom.xml
  23. +9 −9 org.scala-ide.scala.compiler/pom.xml
  24. +3 −4 org.scala-ide.scala.library/pom.xml
  25. +1 −1 org.scala-ide.sdt.aspects/pom.xml
  26. +1 −1 org.scala-ide.sdt.core.tests/pom.xml
  27. +1 −14 org.scala-ide.sdt.core/pom.xml
  28. +1 −1 org.scala-ide.sdt.feature/pom.xml
  29. +1 −1 org.scala-ide.sdt.source.feature/pom.xml
  30. +1 −1 org.scala-ide.sdt.update-site/pom.xml
  31. +1 −1 org.scala-ide.sdt.weaving.feature/pom.xml
  32. +39 −0 org.scala-ide/pom.xml
View
29 org.scala-ide.build-toolchain/build-toolchain-2.8.x.sh
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-# Scala compiler version to be used as a dependency
-SCALA_VERSION=2.8.3-SNAPSHOT
-
-# Scala library version
-SCALA_LIBRARY_VERSION=2.8.3-SNAPSHOT
-
-#THIS NEEDS TO BE UPDATED ONCE WE HAVE SNAPSHOTS
-
-# The precompiled compiler-interface.jar that SBT uses to communicate with scalac
-# This is usually the same as Scala version, and it is not enough to be just binary
-# compatible (compiler interface depends on scalac, not just std library)
-SCALA_PRECOMPILED=2_8_3-SNAPSHOT
-
-# The scala version that was used to compile SBT dependencies (it is part of the artifact name)
-# It is usually enough to have a binary compatible version of SCALA_VERSION
-# For instance, here we can use 2.8.0, for a 2.8.1 compiler
-SBT_SCALA_VERSION=2.8.3-SNAPSHOT
-
-SBINARY_VERSION=0.4.0
-
-set_version ${SCALA_VERSION}
-
-PROFILE="-P sbt-2.8,default"
-
-build $*
View
14 org.scala-ide.build-toolchain/build-toolchain-2.9.0-1.sh
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.9.0-1
-SCALA_PRECOMPILED=2_9_0-1
-SBT_SCALA_VERSION=2.9.0-1
-SBINARY_VERSION=0.4.0
-
-set_version ${SCALA_VERSION}
-
-PROFILE="-P sbt-2.9,default"
-
-build $*
View
14 org.scala-ide.build-toolchain/build-toolchain-2.9.0.final.sh
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.9.0
-SCALA_PRECOMPILED=2_9_0
-SBT_SCALA_VERSION=2.9.0
-SBINARY_VERSION=0.4.0
-
-set_version ${SCALA_VERSION}
-
-PROFILE="-P sbt-2.9,default"
-
-build $*
View
26 org.scala-ide.build-toolchain/build-toolchain-2.9.1.sh
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-# Scala compiler version to be used as a dependency
-SCALA_VERSION=2.9.1
-
-#THIS NEEDS TO BE UPDATED ONCE WE HAVE SNAPSHOTS
-
-# The precompiled compiler-interface.jar that SBT uses to communicate with scalac
-# This is usually the same as Scala version, and it is not enough to be just binary
-# compatible (compiler interface depends on scalac, not just std library)
-SCALA_PRECOMPILED=2_9_1
-
-# The scala version that was used to compile SBT dependencies (it is part of the artifact name)
-# It is usually enough to have a binary compatible version of SCALA_VERSION
-# For instance, here we can use 2.9.0, for a 2.9.1 compiler
-SBT_SCALA_VERSION=2.9.1
-
-SBINARY_VERSION=0.4.0
-
-set_version ${SCALA_VERSION}
-
-PROFILE="-P sbt-2.9,default"
-
-build $*
View
6 ....build-toolchain/build-toolchain-2.9.x.sh → ...de.build-toolchain/build-toolchain-2.9.sh
@@ -3,10 +3,10 @@
. $(dirname $0)/env.sh
# Scala compiler version to be used as a dependency
-SCALA_VERSION=2.9.2-SNAPSHOT
+SCALA_VERSION=2.9.2-RC1
# Scala library version
-SCALA_LIBRARY_VERSION=2.9.1
+SCALA_LIBRARY_VERSION=2.9.2-RC1
#THIS NEEDS TO BE UPDATED ONCE WE HAVE SNAPSHOTS
@@ -24,6 +24,6 @@ SBINARY_VERSION=0.4.0
set_version ${SCALA_VERSION}
-PROFILE="-P sbt-2.9,default"
+# PROFILE="-P "
build $*
View
11 org.scala-ide.build-toolchain/build-toolchain-local-2.8.x.sh
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.8.2-SNAPSHOT
-
-set_version ${SCALA_VERSION}
-
-PROFILE="-P local"
-
-build $*
View
24 org.scala-ide.build-toolchain/build-toolchain-local-trunk.sh
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-# Scala compiler version to be used as a dependency
-SCALA_VERSION=2.10.0-SNAPSHOT
-
-# The precompiled compiler-interface.jar that SBT uses to communicate with scalac
-# This is usually the same as Scala version, and it is not enough to be just binary
-# compatible (compiler interface depends on scalac, not just std library)
-SCALA_PRECOMPILED=2_10_0-SNAPSHOT
-
-# The scala version that was used to compile SBT dependencies (it is part of the artifact name)
-# It is usually enough to have a binary compatible version of SCALA_VERSION
-# For instance, here we can use 2.9.0, for a 2.9.1 compiler
-SBT_SCALA_VERSION=2.10.0-SNAPSHOT
-
-SBINARY_VERSION=0.4.0
-
-set_version ${SCALA_VERSION}
-
-PROFILE="-P sbt-2.10,local,!default"
-
-build $*
View
15 org.scala-ide.build-toolchain/build-toolchain-maintenance-2.8.0.final.sh
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.8.0
-SCALA_MAINTENANCE_VERSION=2.8.0.final-maintenance
-
-set_version ${SCALA_VERSION}
-
-${MAVEN} \
- -U \
- -P maintenance,!default \
- -Dscala.version=${SCALA_VERSION} \
- -Dscala.maintenance.version=${SCALA_MAINTENANCE_VERSION} \
- clean install $*
View
27 org.scala-ide.build-toolchain/build-toolchain-trunk.sh
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-# Scala compiler version to be used as a dependency
-SCALA_VERSION=2.10.0-SNAPSHOT
-
-# Scala library version
-SCALA_LIBRARY_VERSION=2.10.0-SNAPSHOT
-
-# The precompiled compiler-interface.jar that SBT uses to communicate with scalac
-# This is usually the same as Scala version, and it is not enough to be just binary
-# compatible (compiler interface depends on scalac, not just std library)
-SCALA_PRECOMPILED=2_10_0-SNAPSHOT
-
-# The scala version that was used to compile SBT dependencies (it is part of the artifact name)
-# It is usually enough to have a binary compatible version of SCALA_VERSION
-# For instance, here we can use 2.9.0, for a 2.9.1 compiler
-SBT_SCALA_VERSION=2.10.0-SNAPSHOT
-
-SBINARY_VERSION=0.4.0
-
-set_version ${SCALA_VERSION}
-
-PROFILE="-P sbt-2.10,default"
-
-build $*
View
67 org.scala-ide.build-toolchain/pom.xml
@@ -2,24 +2,28 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.scala-ide</groupId>
+ <parent>
+ <groupId>org.scala-ide</groupId>
+ <artifactId>scala-ide-for-eclipse</artifactId>
+ <version>1</version>
+ <relativePath>../org.scala-ide/pom.xml</relativePath>
+ </parent>
+ <version>2.9.2-RC1</version>
<artifactId>scala-toolchain-for-eclipse</artifactId>
- <version>2.9.2-SNAPSHOT</version>
- <name>The Scala Toolchain for Eclipse</name>
<packaging>pom</packaging>
<properties>
- <sbt.version>0.11.4</sbt.version>
- <patch.level>p0002</patch.level>
- <encoding>UTF-8</encoding>
+ <scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
<scala.library.version>${scala.version}</scala.library.version>
+ <scala.compiler.version>${scala.version}</scala.compiler.version>
</properties>
<modules>
<module>../org.scala-ide.scala.compiler</module>
<module>../org.scala-ide.scala.library</module>
<module>../org.scala-ide.sbt.full.library</module>
</modules>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -44,6 +48,7 @@
</dependency>
</dependencies>
</dependencyManagement>
+
<build>
<pluginManagement>
<plugins>
@@ -60,63 +65,19 @@
</plugins>
</pluginManagement>
</build>
+
<profiles>
<profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
- <scala.compiler.version>${scala.version}</scala.compiler.version>
- <maintenance.suffix></maintenance.suffix>
- <patch.level.suffix></patch.level.suffix>
- </properties>
-
- <repositories>
- <repository>
- <id>sonatype.releases</id>
- <name>Replacement for Scala Tools Maven2 Repository</name>
- <url>https://oss.sonatype.org/content/repositories/releases/</url>
- </repository>
- <repository>
- <id>sonatype.snapshot</id>
- <name>Replacement for Scala Tools maven snapshot repository</name>
- <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
- <snapshots>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
- </profile>
-
- <profile>
- <id>local</id>
+ <id>sbt-2.9</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
- <scala.compiler.version>${scala.version}</scala.compiler.version>
- <maintenance.suffix></maintenance.suffix>
- <patch.level.suffix></patch.level.suffix>
- </properties>
- </profile>
- <profile>
- <id>sbt-2.9</id>
- <properties>
- <scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
- <scala.compiler.version>${scala.version}</scala.compiler.version>
- <version.suffix>2_09</version.suffix>
-
<!-- Used as part of the directory name for compiler-interface.jar. -->
- <scala.major.minor.version>2.9</scala.major.minor.version>
+ <scala.major.minor.version>${scala.version.short}</scala.major.minor.version>
<!-- Used as part of the artifact name for SBT cross-compiled modules. -->
<sbt.compiled.version>${sbt.scala.version}</sbt.compiled.version>
-
- <maintenance.suffix></maintenance.suffix>
- <patch.level.suffix></patch.level.suffix>
</properties>
<repositories>
<repository>
View
7 org.scala-ide.build/build-ide-2.8.3-SNAPSHOT
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.8.3-SNAPSHOT
-
-build $*
View
7 org.scala-ide.build/build-ide-2.9.2-SNAPSHOT
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.9.2-SNAPSHOT
-
-build $*
View
9 org.scala-ide.build/build-ide-2.9.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+. $(dirname $0)/env.sh
+
+SCALA_VERSION=2.9.2-RC1
+
+PROFILE="-P scala-2.9.2-SNAPSHOT"
+
+build $*
View
11 org.scala-ide.build/build-ide-local-2.8.x.sh
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.8.2-SNAPSHOT
-
-${MAVEN} \
- -U \
- -P local-scala-2.8.1,!scala-2.8.1 \
- -Dscala.version=${SCALA_VERSION} \
- clean install $*
View
10 org.scala-ide.build/build-ide-local-2.9.x.sh
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.9.2-SNAPSHOT
-SCALA_LIBRARY_VERSION=2.9.1
-
-PROFILE_NAME="-P local-scala-2.9.x,!scala-trunk,!scala-2.9.2-SNAPSHOT"
-
-build $*
View
9 org.scala-ide.build/build-ide-local-trunk.sh
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.10.0-SNAPSHOT
-SBT_VERSION=2.10.0-SNAPSHOT
-PROFILE_NAME="-P local-scala-trunk,!scala-trunk"
-
-build $*
View
11 org.scala-ide.build/build-ide-maintenance-2.8.0.final.sh
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.8.0
-
-${MAVEN} \
- -U \
- -P scala-2.8.0-maintenance,!scala-2.8.0 \
- -Dscala.version=${SCALA_VERSION} \
- clean install $*
View
7 org.scala-ide.build/build-ide-trunk.sh
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.10.0-SNAPSHOT
-
-build $*
View
2 org.scala-ide.build/env.sh
@@ -32,7 +32,7 @@ build()
{
${MAVEN} \
- $PROFILE_NAME -U \
+ $PROFILE -U \
-Dscala.version=${SCALA_VERSION} \
-Dscala.library.version=${SCALA_LIBRARY_VERSION} \
-Dgit.hash=${GIT_HASH} \
View
86 org.scala-ide.build/pom.xml
@@ -2,21 +2,19 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.scala-ide</groupId>
- <artifactId>scala-ide-for-eclipse</artifactId>
+ <parent>
+ <groupId>org.scala-ide</groupId>
+ <artifactId>scala-ide-for-eclipse</artifactId>
+ <version>1</version>
+ <relativePath>../org.scala-ide/pom.xml</relativePath>
+ </parent>
<version>2.0.1-SNAPSHOT</version>
- <name>The Scala IDE for Eclipse</name>
+ <artifactId>org.scala-ide.build</artifactId>
<packaging>pom</packaging>
<properties>
<version.tag>nightly</version.tag>
- <version.suffix>2_09</version.suffix>
- <scala.version.short>2.9</scala.version.short>
- <sbt.version>0.11.4</sbt.version>
<tycho.version>0.12.0</tycho.version>
- <maven.compiler.source>1.5</maven.compiler.source>
- <maven.compiler.target>1.5</maven.compiler.target>
- <encoding>UTF-8</encoding>
<repo.scala-ide>http://download.scala-ide.org</repo.scala-ide>
<repo.helios>http://download.eclipse.org/releases/helios/</repo.helios>
</properties>
@@ -98,6 +96,7 @@
</plugin>
</plugins>
</build>
+
<repositories>
<repository>
<id>Helios</id>
@@ -113,21 +112,8 @@
<url>http://download.eclipse.org/tools/ajdt/36/update</url>
<snapshots><enabled>false</enabled></snapshots>
</repository>
- <repository>
- <id>scala-tools.release</id>
- <name>Scala Tools maven release repository</name>
- <url>https://oss.sonatype.org/content/repositories/releases/</url>
- <snapshots><enabled>false</enabled></snapshots>
- </repository>
- <repository>
- <id>scala-tools.snapshot</id>
- <name>Scala Tools maven snapshot repository</name>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- <snapshots>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </repository>
</repositories>
+
<pluginRepositories>
<pluginRepository>
<id>org.eclipse.tycho</id>
@@ -138,49 +124,65 @@
</snapshots>
</pluginRepository>
<pluginRepository>
- <id>scala-tools.release</id>
- <name>Scala Tools maven release repository</name>
+ <id>sonatype.release</id>
+ <name>Sonatype maven release repository</name>
<url>https://oss.sonatype.org/content/repositories/releases/</url>
<snapshots><enabled>false</enabled></snapshots>
</pluginRepository>
<pluginRepository>
- <id>scala-tools.snapshot</id>
- <name>Scala Tools maven snapshot repository</name>
+ <id>sonatype.snapshot</id>
+ <name>Sonatype maven snapshot repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</pluginRepository>
</pluginRepositories>
+
<profiles>
<profile>
<id>scala-2.9.2-SNAPSHOT</id>
- <activation>
- <property>
- <name>scala.version</name>
- <value>2.9.2-SNAPSHOT</value>
- </property>
- </activation>
- <properties>
- <version.suffix>2_09</version.suffix>
- </properties>
<repositories>
<repository>
- <id>scala-refactoring-trunk</id>
- <name>Scala Refactoring Scala 2.9.2-SNAPSHOT p2 repository</name>
+ <id>scala-refactoring-scalaide-2.0.x</id>
+ <name>Scala Refactoring for Scala IDE 2.0.x p2 repository</name>
<layout>p2</layout>
<url>${repo.scala-ide}/scala-refactoring-2-0-x-2.9.x</url>
</repository>
<repository>
- <id>scalariform-trunk</id>
- <name>Scalariform Scala 2.9.2-SNAPSHOT p2 repo</name>
+ <id>scalariform-scalaide-2.0.x</id>
+ <name>Scalariform for Scala IDE 2.0.x p2 repo</name>
<layout>p2</layout>
<url>${repo.scala-ide}/scalariform-2-0-x-2.9.x</url>
</repository>
<repository>
- <id>scala-toolchain-2.9.2-SNAPSHOT</id>
- <name>Scala Toolchain 2.9.2-SNAPSHOT p2 repository</name>
+ <id>scala-toolchain-scalaide-2.0.x</id>
+ <name>Scala Toolchain for Scala IDE 2.0.x p2 repository</name>
<layout>p2</layout>
<url>${repo.scala-ide}/scala-eclipse-toolchain-osgi-2.9.2-SNAPSHOT</url>
</repository>
</repositories>
</profile>
+
+ <profile>
+ <id>release-ide-29</id>
+ <repositories>
+ <repository>
+ <id>scala-refactoring-scalaide-2.0</id>
+ <name>Scala Refactoring for Scala IDE 2.0 p2 repository</name>
+ <layout>p2</layout>
+ <url>${repo.scala-ide}/incoming-release-29/dependencies/scala-refactoring</url>
+ </repository>
+ <repository>
+ <id>scalariform-scalaide-2.0</id>
+ <name>Scalariform for Scala IDE 2.0 p2 repo</name>
+ <layout>p2</layout>
+ <url>${repo.scala-ide}/incoming-release-29/dependencies/scalariform</url>
+ </repository>
+ <repository>
+ <id>scala-toolchain-scalaide-2.0</id>
+ <name>Scala Toolchain for Scala IDE 2.0 p2 repository</name>
+ <layout>p2</layout>
+ <url>${repo.scala-ide}/incoming-release-29/dependencies/osgi-toolchain</url>
+ </repository>
+ </repositories>
+ </profile>
</profiles>
</project>
View
9 org.scala-ide.build/release-build-ide-2.9.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+. $(dirname $0)/env.sh
+
+SCALA_VERSION=2.9.2-RC1
+
+PROFILE="-P release-ide-29"
+
+build $*
View
54 org.scala-ide.sbt.full.library/pom.xml
@@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scala-ide</groupId>
+ <version>2.9.2-RC1</version>
<artifactId>scala-toolchain-for-eclipse</artifactId>
- <version>2.9.2-SNAPSHOT</version>
<relativePath>../org.scala-ide.build-toolchain/pom.xml</relativePath>
</parent>
<artifactId>org.scala-ide.sbt.full.library</artifactId>
- <version>${sbt.version}.${version.suffix}-${maven.build.timestamp}</version>
<packaging>bundle</packaging>
+
<dependencies>
<dependency>
<groupId>org.scala-tools.sbt</groupId>
@@ -365,36 +365,6 @@
</goals>
<configuration>
<artifactItems>
-<!-- <artifactItem>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala.compiler.version}</version>
- <classifier>sources</classifier>
- <type>jar</type>
- <destFileName>scala-${scala.major.minor.version}/lib/scala-library-src.jar</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala.compiler.version}</version>
- <type>jar</type>
- <destFileName>scala-${scala.major.minor.version}/lib/scala-library.jar</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala.compiler.version}</version>
- <classifier>sources</classifier>
- <type>jar</type>
- <destFileName>scala-${scala.major.minor.version}/lib/scala-compiler-src.jar</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala.compiler.version}</version>
- <type>jar</type>
- <destFileName>scala-${scala.major.minor.version}/lib/scala-compiler.jar</destFileName>
- </artifactItem> -->
<artifactItem>
<groupId>org.scala-tools.sbt</groupId>
<artifactId>precompiled-${sbt.compiled.version}-${scala.precompiled.version}</artifactId>
@@ -409,26 +379,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- <executions>
- <execution>
- <phase>initialize</phase>
- <goals>
- <goal>read-project-properties</goal>
- </goals>
- <configuration>
- <files>
-<!-- <file>${project.build.directory}/xsbt.version.properties</file>-->
-<!-- <file>${project.build.directory}/library.properties</file>
- <file>${project.build.directory}/compiler.properties</file>-->
- </files>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.1.0</version>
View
18 org.scala-ide.scala.compiler/pom.xml
@@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scala-ide</groupId>
+ <version>2.9.2-RC1</version>
<artifactId>scala-toolchain-for-eclipse</artifactId>
- <version>2.9.2-SNAPSHOT</version>
<relativePath>../org.scala-ide.build-toolchain/pom.xml</relativePath>
</parent>
<artifactId>org.scala-ide.scala.compiler</artifactId>
@@ -144,16 +144,16 @@
<instructions>
<Bundle-SymbolicName>org.scala-ide.scala.compiler</Bundle-SymbolicName>
<Bundle-Name>Scala Compiler for Eclipse</Bundle-Name>
- <Bundle-Version>${version.number}${maintenance.suffix}${patch.level.suffix}</Bundle-Version>
+ <Bundle-Version>${osgi.version.number}</Bundle-Version>
<Bundle-Vendor>scala-ide.org</Bundle-Vendor>
<Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
- <_exportcontents>scala.reflect.internal.*;version=${version.number},
- scala.reflect.api.*;version=${version.number},
- scala.reflect.runtime.*;version=${version.number},
- scala.reflect.std.*;version=${version.number},
- scala.reflect.internal.transform.*;version=${version.number},
- scala.tools.*;version=${version.number},
- ch.epfl.lamp.*;version=${version.number}</_exportcontents>
+ <_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>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripVersion>true</Embed-StripVersion>
<Include-Resource>lib=${project.build.directory}/lib</Include-Resource>
View
7 org.scala-ide.scala.library/pom.xml
@@ -5,11 +5,10 @@
<parent>
<groupId>org.scala-ide</groupId>
<artifactId>scala-toolchain-for-eclipse</artifactId>
- <version>2.9.2-SNAPSHOT</version>
+ <version>2.9.2-RC1</version>
<relativePath>../org.scala-ide.build-toolchain/pom.xml</relativePath>
</parent>
<artifactId>org.scala-ide.scala.library</artifactId>
- <version>${scala.library.version}</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
@@ -136,10 +135,10 @@
<instructions>
<Bundle-SymbolicName>org.scala-ide.scala.library</Bundle-SymbolicName>
<Bundle-Name>Scala Library for Eclipse</Bundle-Name>
- <Bundle-Version>${version.number}${patch.level.suffix}</Bundle-Version>
+ <Bundle-Version>${osgi.version.number}</Bundle-Version>
<Bundle-Vendor>scala-ide.org</Bundle-Vendor>
<Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
- <_exportcontents>scala.reflect;version=${version.number},scala.*;version=${version.number}</_exportcontents>
+ <_exportcontents>scala.reflect;version=${osgi.version.number},scala.*;version=${osgi.version.number}</_exportcontents>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripVersion>true</Embed-StripVersion>
<Include-Resource>lib=${project.build.directory}/lib</Include-Resource>
View
2 org.scala-ide.sdt.aspects/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scala-ide</groupId>
- <artifactId>scala-ide-for-eclipse</artifactId>
+ <artifactId>org.scala-ide.build</artifactId>
<version>2.0.1-SNAPSHOT</version>
<relativePath>../org.scala-ide.build/pom.xml</relativePath>
</parent>
View
2 org.scala-ide.sdt.core.tests/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scala-ide</groupId>
- <artifactId>scala-ide-for-eclipse</artifactId>
+ <artifactId>org.scala-ide.build</artifactId>
<version>2.0.1-SNAPSHOT</version>
<relativePath>../org.scala-ide.build/pom.xml</relativePath>
</parent>
View
15 org.scala-ide.sdt.core/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scala-ide</groupId>
- <artifactId>scala-ide-for-eclipse</artifactId>
+ <artifactId>org.scala-ide.build</artifactId>
<version>2.0.1-SNAPSHOT</version>
<relativePath>../org.scala-ide.build/pom.xml</relativePath>
</parent>
@@ -19,11 +19,6 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
- <!-- <dependency> -->
- <!-- <groupId>org.scala-ide</groupId> -->
- <!-- <artifactId>org.scala-ide.sbt.full.library</artifactId> -->
- <!-- <version>${sbt.version}.${version.suffix}</version> -->
- <!-- </dependency> -->
</dependencies>
<build>
@@ -66,13 +61,5 @@
</configuration>
</plugin>
</plugins>
-<!--
- <resources>
- <resource>
- <directory>src/resources</directory>
- <filtering>true</filtering>
- <targetPath>${basedir}/META-INF</targetPath>
- </resource>
- </resources> -->
</build>
</project>
View
2 org.scala-ide.sdt.feature/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scala-ide</groupId>
- <artifactId>scala-ide-for-eclipse</artifactId>
+ <artifactId>org.scala-ide.build</artifactId>
<version>2.0.1-SNAPSHOT</version>
<relativePath>../org.scala-ide.build/pom.xml</relativePath>
</parent>
View
2 org.scala-ide.sdt.source.feature/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scala-ide</groupId>
- <artifactId>scala-ide-for-eclipse</artifactId>
+ <artifactId>org.scala-ide.build</artifactId>
<version>2.0.1-SNAPSHOT</version>
<relativePath>../org.scala-ide.build/pom.xml</relativePath>
</parent>
View
2 org.scala-ide.sdt.update-site/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scala-ide</groupId>
- <artifactId>scala-ide-for-eclipse</artifactId>
+ <artifactId>org.scala-ide.build</artifactId>
<version>2.0.1-SNAPSHOT</version>
<relativePath>../org.scala-ide.build/pom.xml</relativePath>
</parent>
View
2 org.scala-ide.sdt.weaving.feature/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scala-ide</groupId>
- <artifactId>scala-ide-for-eclipse</artifactId>
+ <artifactId>org.scala-ide.build</artifactId>
<version>2.0.1-SNAPSHOT</version>
<relativePath>../org.scala-ide.build/pom.xml</relativePath>
</parent>
View
39 org.scala-ide/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.scala-ide</groupId>
+ <artifactId>scala-ide-for-eclipse</artifactId>
+ <version>1</version>
+ <name>The Scala IDE for Eclipse</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <sbt.version>0.11.4</sbt.version>
+ <encoding>UTF-8</encoding>
+ <version.suffix>2_09</version.suffix>
+ <scala.version.short>2.9</scala.version.short>
+ </properties>
+
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+
+ <repositories>
+ <repository>
+ <id>sonatype.release</id>
+ <name>Sonatype maven release repository</name>
+ <url>https://oss.sonatype.org/content/repositories/releases/</url>
+ <snapshots><enabled>false</enabled></snapshots>
+ </repository>
+ <repository>
+ <id>sonatype.snapshot</id>
+ <name>Sonatype maven snapshot repository</name>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ <snapshots>
+ <updatePolicy>daily</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+</project>

0 comments on commit 89f293d

Please sign in to comment.
Something went wrong with that request. Please try again.