Browse files

Merge pull request #14 from scala-ide/issue/clean-up-scala-versions-i…

…n-pom

Cleaned up profiles in POM
  • Loading branch information...
2 parents f7043ac + 9308550 commit d0f6caeec5858de5d84bf79e6d20177d1eb51dbb @dotta dotta committed Feb 15, 2013
Showing with 6 additions and 30 deletions.
  1. +2 −2 README.md
  2. +4 −28 pom.xml
View
4 README.md
@@ -9,7 +9,7 @@ Building
The build is configured using maven so you build by invoking the following:
- mvn -P scala-ide-master-scala-trunk clean package
+ mvn clean package
Running it
----------
@@ -25,4 +25,4 @@ This adds the run configuration `Eclipse Application with Equinox Weaving`.
Links
-----
-- [Jenkins Job](https://jenkins.scala-ide.org:8496/jenkins/job/scala-search-nightly-2.1-2.10/)
+- [Jenkins Job](https://jenkins.scala-ide.org:8496/jenkins/view/Plugins%20%28Scala%20IDE%29/job/scala-search-nightly-master-2.10/?)
View
32 pom.xml
@@ -43,42 +43,18 @@
<repo.ajdt>${repo.ajdt.indigo}</repo.ajdt>
<!-- some default values, can be overwritten by profiles -->
- <scala.version>2.9.3-SNAPSHOT</scala.version>
- <version.suffix>2_09</version.suffix>
- <scala.version.short>2.9</scala.version.short>
+ <scala.version>2.10.1-SNAPSHOT</scala.version>
+ <version.suffix>2_10</version.suffix>
+ <scala.version.short>2.10</scala.version.short>
<version.tag>local</version.tag>
- <repo.scala-ide>${repo.scala-ide.root}/releases-29/stable/site</repo.scala-ide>
+ <repo.scala-ide>${repo.scala-ide.root}/nightly-update-master-trunk</repo.scala-ide>
<junit.version>4.10</junit.version>
</properties>
<profiles>
<profile>
<!-- this is the default profile, using the stable builds-->
- <id>scala-ide-2.0-scala-2.9</id>
- </profile>
- <profile>
- <!-- 2.0.x Scala IDE with Scala 2.9 -->
- <id>scala-ide-2.0.x-scala-2.9</id>
- <properties>
- <repo.scala-ide>${repo.scala-ide.root}/nightly-update-2-0-x-29x</repo.scala-ide>
- </properties>
- </profile>
- <profile>
- <!-- nightly Scala IDE with Scala 2.9 -->
- <id>scala-ide-master-scala-2.9</id>
- <properties>
- <repo.scala-ide>${repo.scala-ide.root}/nightly-update-master-29x</repo.scala-ide>
- </properties>
- </profile>
- <profile>
- <!-- nightly Scala IDE with Scala trunk -->
<id>scala-ide-master-scala-trunk</id>
- <properties>
- <scala.version>2.10.0-SNAPSHOT</scala.version>
- <version.suffix>2_10</version.suffix>
- <scala.version.short>2.10</scala.version.short>
- <repo.scala-ide>${repo.scala-ide.root}/nightly-update-master-trunk</repo.scala-ide>
- </properties>
</profile>
<profile>

0 comments on commit d0f6cae

Please sign in to comment.