Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix macro expansion in sbt archetype; fixes #1109

  • Loading branch information...
commit 884332a12ab6dc037d7b577bc82ff739ec832dac 1 parent 5d18e6a
@indrajitr indrajitr authored
View
9 lift-archetype-sbt/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -13,6 +13,15 @@
</requiredProperties>
<fileSets>
<fileSet encoding="UTF-8" filtered="true">
+ <directory>project</directory>
+ </fileSet>
+ <fileSet encoding="UTF-8" filtered="false">
+ <directory>src</directory>
+ <includes>
+ <include>packageLinkDefs.properties</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8" filtered="true">
<directory>src/main/resources</directory>
</fileSet>
<fileSet encoding="UTF-8" filtered="true">
View
25 lift-archetype-sbt/src/main/resources/archetype-resources/pom.xml
@@ -4,6 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
#set($scala_version_unevaled = '\${scala.version}')
+ #set($project_basedir = '\${project.basedir}')
+ #set($project_build_sourceEncoding_unevaled = '\${project.build.sourceEncoding}')
+ #set($project_build_directory_unevaled = '\${project.build.directory}')
<modelVersion>4.0.0</modelVersion>
<groupId>$groupId</groupId>
@@ -16,7 +19,7 @@
<scala.version>$scalaVersion</scala.version>
<!-- Common plugin settings -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
+ <project.reporting.outputEncoding>$project_build_sourceEncoding_unevaled</project.reporting.outputEncoding>
<!-- vscaladoc settings -->
<maven.scaladoc.vscaladocVersion>1.2-m1</maven.scaladoc.vscaladocVersion>
<vscaladoc.links.liftweb.pathsufix>scaladocs/</vscaladoc.links.liftweb.pathsufix>
@@ -50,7 +53,7 @@
<pluginRepositories>
<pluginRepository>
- <id>scala-tools.org.releases</id>
+ <id>scala-tools.releases</id>
<name>Scala-Tools Plugins Repository for Releases</name>
<url>http://scala-tools.org/repo-releases</url>
</pluginRepository>
@@ -59,7 +62,7 @@
<dependencies>
<dependency>
<groupId>net.liftweb</groupId>
- <artifactId>lift-mapper</artifactId>
+ <artifactId>lift-mapper_$scalaVersion</artifactId>
<version>$liftVersion</version>
</dependency>
#if ($logBackend.equalsIgnoreCase("logback"))
@@ -100,8 +103,8 @@
</dependency>
<dependency>
<groupId>org.scala-tools.testing</groupId>
- <artifactId>specs</artifactId>
- <version>1.6.1</version>
+ <artifactId>specs_${scala.version}</artifactId>
+ <version>${specs.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -128,10 +131,10 @@
<artifactId>maven-scala-plugin</artifactId>
<version>2.15.2</version>
<configuration>
- <charset>${project.build.sourceEncoding}</charset>
+ <charset>$project_build_sourceEncoding_unevaled</charset>
<jvmArgs>
<jvmArg>-Xmx1024m</jvmArg>
- <jvmArg>-DpackageLinkDefs=file://${project.build.directory}/packageLinkDefs.properties</jvmArg>
+ <jvmArg>-DpackageLinkDefs=file://$project_build_directory_unevaled/packageLinkDefs.properties</jvmArg>
</jvmArgs>
</configuration>
<executions>
@@ -156,10 +159,10 @@
</goals>
<configuration>
<overwrite>true</overwrite>
- <outputDirectory>${project.build.directory}</outputDirectory>
+ <outputDirectory>$project_build_directory_unevaled</outputDirectory>
<resources>
<resource>
- <directory>${project.basedir}/src</directory>
+ <directory>$project_basedir/src</directory>
<includes>
<include>packageLinkDefs.properties</include>
</includes>
@@ -229,10 +232,10 @@
<artifactId>maven-scala-plugin</artifactId>
<version>2.15.2</version>
<configuration>
- <charset>${project.build.sourceEncoding}</charset>
+ <charset>$project_build_sourceEncoding_unevaled</charset>
<jvmArgs>
<jvmArg>-Xmx1024m</jvmArg>
- <jvmArg>-DpackageLinkDefs=file://${project.build.directory}/packageLinkDefs.properties</jvmArg>
+ <jvmArg>-DpackageLinkDefs=file://$project_build_directory_unevaled/packageLinkDefs.properties</jvmArg>
</jvmArgs>
</configuration>
</plugin>
View
9 lift-archetype-sbt/src/main/resources/archetype-resources/project/build.properties
@@ -1,8 +1,7 @@
-#Project properties
-project.organization=Lift
-project.name=Lift SBT Tempalte
+project.organization=$groupId
+project.name=$artifactId
+project.version=$version
sbt.version=0.7.4
-project.version=0.1
def.scala.version=2.7.7
-build.scala.versions=2.7.7
+build.scala.versions=$scalaVersion
project.initialize=false
Please sign in to comment.
Something went wrong with that request. Please try again.