Permalink
Browse files

Clean up of the build configurations

Moved all profile information to the top pom.
Use dependenciesManagement for all dependencies.
Use always the same name for the copied jars, to simply configuration.
Updated versions to Play 2.1-RC2.
Re-enabled the tests.
  • Loading branch information...
1 parent 25da099 commit 682f85bdc92df99cb524db4ce71a9da842dad98b @skyluc skyluc committed Jan 16, 2013
View
@@ -1,2 +1,3 @@
.cache
target/
+.settings/
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/classes"/>
@@ -8,18 +8,10 @@ import org.junit.runners.Suite.SuiteClasses
import org.scalaide.play2.templateeditor.lexical.TemplatePartitionTokeniserTest
import org.scalaide.play2.templateeditor.lexical.TemplateCompilationUnitTest
-class DummyTest extends scala.tools.eclipse.testsetup.TestProjectSetup("aProject", bundleName = "org.scala-ide.play2.tests") {
- @Test
- def dummyTest() = {
- }
-}
-
@RunWith(value = classOf[org.junit.runners.Suite])
-@SuiteClasses(value = Array(classOf[DummyTest]))
-// NOTE: The following test are commented due to the error:
-//[org.eclipse.debug.core] error can't determine modifiers of missing type org.eclipse.pde.internal.ui.wizards.imports.PluginImportHelper
- // classOf[TemplatePartitionTokeniserTest],
- // classOf[TemplateCompilationUnitTest]))
+@SuiteClasses(value = Array(
+ classOf[TemplatePartitionTokeniserTest],
+ classOf[TemplateCompilationUnitTest]))
class TemplateTestSuite {
}
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src"/>
- <classpathentry exported="true" kind="lib" path="target/lib/templates_2.9.2-2.1-09142012.jar"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="target/lib/play_2.9.2-2.1-08292012.jar"/>
- <classpathentry kind="lib" path="target/lib/scala-arm_2.9.1-1.1.jar"/>
- <classpathentry kind="lib" path="target/lib/scala-io-core_2.9.2-0.4.0.jar"/>
- <classpathentry kind="lib" path="target/lib/scala-io-file_2.9.2-0.4.0.jar"/>
+ <classpathentry kind="lib" path="target/lib/play.jar"/>
+ <classpathentry kind="lib" path="target/lib/scala-arm.jar"/>
+ <classpathentry kind="lib" path="target/lib/scala-io-core.jar"/>
+ <classpathentry kind="lib" path="target/lib/scala-io-file.jar"/>
+ <classpathentry kind="lib" path="target/lib/templates.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -34,8 +34,8 @@ Import-Package:
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Activator: org.scalaide.play2.PlayPlugin
Bundle-ClassPath: .,
- target/lib/_PLAY_.jar,
- target/lib/_SCALA_ARM_.jar,
- target/lib/_SCALA_IO_CORE_.jar,
- target/lib/_SCALA_IO_FILE_.jar,
- target/lib/_TEMPLATES_.jar
+ target/lib/play.jar,
+ target/lib/scala-arm.jar,
+ target/lib/scala-io-core.jar,
+ target/lib/scala-io-file.jar,
+ target/lib/templates.jar
@@ -5,6 +5,6 @@ bin.includes = META-INF/,\
plugin.xml,\
plugin.properties,\
icons/,\
- target/lib/,\
about.ini,\
- about.png
+ about.png,\
+ target/lib/
@@ -10,116 +10,33 @@
<artifactId>org.scala-ide.play2</artifactId>
<packaging>eclipse-plugin</packaging>
- <properties>
- <play.artifactId>play_2.9.2</play.artifactId>
- <play.version>2.1-08292012</play.version>
- <templates.artifactId>templates_2.9.2</templates.artifactId>
- <templates.version>2.1-09142012</templates.version>
- <scala.io.core.artifactId>scala-io-core_2.9.2</scala.io.core.artifactId>
- <scala.io.core.version>0.4.0</scala.io.core.version>
- <scala.io.file.artifactId>scala-io-file_2.9.2</scala.io.file.artifactId>
- <scala.io.file.version>0.4.0</scala.io.file.version>
- <scala.arm.groupId>com.github.jsuereth.scala-arm</scala.arm.groupId>
- <scala.arm.artifactId>scala-arm_2.9.1</scala.arm.artifactId>
- <scala.arm.version>1.1</scala.arm.version>
- </properties>
-
- <profiles>
- <profile>
- <!-- nightly Scala IDE with Scala 2.10 -->
- <id>scala-ide-juno-scala-2.10</id>
- <properties>
- <play.artifactId>play_2.10</play.artifactId>
- <play.version>2.1-12142012</play.version>
- <templates.artifactId>templates_2.10</templates.artifactId>
- <templates.version>2.1-12142012</templates.version>
- <scala.io.core.artifactId>scala-io-core_2.10.0-RC1</scala.io.core.artifactId>
- <scala.io.core.version>0.4.1</scala.io.core.version>
- <scala.io.file.artifactId>scala-io-file_2.10.0-RC1</scala.io.file.artifactId>
- <scala.io.file.version>0.4.1</scala.io.file.version>
- <scala.arm.groupId>com.jsuereth</scala.arm.groupId>
- <scala.arm.artifactId>scala-arm_2.10</scala.arm.artifactId>
- <scala.arm.version>1.2</scala.arm.version>
- </properties>
- </profile>
- </profiles>
-
-
<dependencies>
<dependency>
<groupId>play</groupId>
<artifactId>${play.artifactId}</artifactId>
- <version>${play.version}</version>
</dependency>
<dependency>
<groupId>play</groupId>
<artifactId>${templates.artifactId}</artifactId>
- <version>${templates.version}</version>
</dependency>
<dependency>
<groupId>com.github.scala-incubator.io</groupId>
<artifactId>${scala.io.core.artifactId}</artifactId>
- <version>${scala.io.core.version}</version>
</dependency>
<dependency>
<groupId>com.github.scala-incubator.io</groupId>
<artifactId>${scala.io.file.artifactId}</artifactId>
- <version>${scala.io.file.version}</version>
</dependency>
<dependency>
<groupId>${scala.arm.groupId}</groupId>
<artifactId>${scala.arm.artifactId}</artifactId>
- <version>${scala.arm.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <id>prepare-package</id>
- <phase>prepare-package</phase>
- <configuration>
- <target>
- <replace file="META-INF/MANIFEST.MF">
- <replacefilter token="_PLAY_" value="${play.artifactId}-${play.version}" />
- <replacefilter token="_SCALA_ARM_" value="${scala.arm.artifactId}-${scala.arm.version}" />
- <replacefilter token="_SCALA_IO_CORE_" value="${scala.io.core.artifactId}-${scala.io.core.version}" />
- <replacefilter token="_SCALA_IO_FILE_" value="${scala.io.file.artifactId}-${scala.io.file.version}" />
- <replacefilter token="_TEMPLATES_" value="${templates.artifactId}-${templates.version}" />
- </replace>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <configuration>
- <target>
- <replace file="META-INF/MANIFEST.MF">
- <replacefilter token="${play.artifactId}-${play.version}" value="_PLAY_" />
- <replacefilter token="${scala.arm.artifactId}-${scala.arm.version}" value="_SCALA_ARM_" />
- <replacefilter token="${scala.io.core.artifactId}-${scala.io.core.version}" value="_SCALA_IO_CORE_" />
- <replacefilter token="${scala.io.file.artifactId}-${scala.io.file.version}" value="_SCALA_IO_FILE_" />
- <replacefilter token="${templates.artifactId}-${templates.version}" value="_TEMPLATES_" />
- </replace>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!-- copy the mockito jar, so it can be used in eclipse -->
+ <!-- copy the play jars needed by the plugin -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -134,29 +51,31 @@
<artifactItem>
<groupId>play</groupId>
<artifactId>${play.artifactId}</artifactId>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ <destFileName>play.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>play</groupId>
<artifactId>${templates.artifactId}</artifactId>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ <destFileName>templates.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>com.github.scala-incubator.io</groupId>
<artifactId>${scala.io.core.artifactId}</artifactId>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ <destFileName>scala-io-core.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>com.github.scala-incubator.io</groupId>
<artifactId>${scala.io.file.artifactId}</artifactId>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ <destFileName>scala-io-file.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>${scala.arm.groupId}</groupId>
<artifactId>${scala.arm.artifactId}</artifactId>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ <destFileName>scala-arm.jar</destFileName>
</artifactItem>
</artifactItems>
+ <stripVersion>true</stripVersion>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
View
49 pom.xml
@@ -50,7 +50,18 @@
<version.tag>local</version.tag>
<repo.scala-ide>${repo.scala-ide.root}/releases-29/stable/site</repo.scala-ide>
<junit.version>4.10</junit.version>
- </properties>
+ <play.artifactId>play_2.9.2</play.artifactId>
+ <play.version>2.1-08292012</play.version>
+ <templates.artifactId>templates_2.9.2</templates.artifactId>
+ <templates.version>2.1-09142012</templates.version>
+ <scala.io.core.artifactId>scala-io-core_2.9.2</scala.io.core.artifactId>
+ <scala.io.core.version>0.4.0</scala.io.core.version>
+ <scala.io.file.artifactId>scala-io-file_2.9.2</scala.io.file.artifactId>
+ <scala.io.file.version>0.4.0</scala.io.file.version>
+ <scala.arm.groupId>com.github.jsuereth.scala-arm</scala.arm.groupId>
+ <scala.arm.artifactId>scala-arm_2.9.1</scala.arm.artifactId>
+ <scala.arm.version>1.1</scala.arm.version>
+ </properties>
<profiles>
<!-- this is the default profile, using the stable builds-->
@@ -92,6 +103,17 @@
<version.suffix>2_10</version.suffix>
<scala.version.short>2.10</scala.version.short>
<repo.scala-ide>${repo.scala-ide.root}/sdk/e38/scala210/dev/site</repo.scala-ide>
+ <play.artifactId>play_2.10</play.artifactId>
+ <play.version>2.1-RC2</play.version>
+ <templates.artifactId>templates_2.10</templates.artifactId>
+ <templates.version>2.1-RC2</templates.version>
+ <scala.io.core.artifactId>scala-io-core_2.10.0-RC1</scala.io.core.artifactId>
+ <scala.io.core.version>0.4.1</scala.io.core.version>
+ <scala.io.file.artifactId>scala-io-file_2.10.0-RC1</scala.io.file.artifactId>
+ <scala.io.file.version>0.4.1</scala.io.file.version>
+ <scala.arm.groupId>com.jsuereth</scala.arm.groupId>
+ <scala.arm.artifactId>scala-arm_2.10</scala.arm.artifactId>
+ <scala.arm.version>1.2</scala.arm.version>
</properties>
</profile>
<profile>
@@ -180,6 +202,31 @@
<artifactId>junit</artifactId>
<version>${junit.version}</version>
</dependency>
+ <dependency>
+ <groupId>play</groupId>
+ <artifactId>${play.artifactId}</artifactId>
+ <version>${play.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>play</groupId>
+ <artifactId>${templates.artifactId}</artifactId>
+ <version>${templates.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.scala-incubator.io</groupId>
+ <artifactId>${scala.io.core.artifactId}</artifactId>
+ <version>${scala.io.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.scala-incubator.io</groupId>
+ <artifactId>${scala.io.file.artifactId}</artifactId>
+ <version>${scala.io.file.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${scala.arm.groupId}</groupId>
+ <artifactId>${scala.arm.artifactId}</artifactId>
+ <version>${scala.arm.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>

0 comments on commit 682f85b

Please sign in to comment.