Permalink
Browse files

build tweaks contributed by Fabian Steeg

  • Loading branch information...
Debasish Ghosh
Debasish Ghosh committed Aug 7, 2010
1 parent 6e83a8e commit f8afb58f4fca4caa808f39411279680aaefac216
View
@@ -9,8 +9,8 @@ lib_managed
etags
TAGS
dist
-build
target
+build/target
deploy/*.jar
data
out
View
@@ -12,6 +12,7 @@ h2. Running the Test Cases
* Ensure that the Scala View Server is set up as per the document "Scala View Server":http://wiki.github.com/debasishg/scouchdb/scala-view-server
* run couchdb server
* sbt
+ * update
* clean
* compile
* test-only scouch.db.SCouchDbSpec
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
- <groupId>sjson.json</groupId>
- <artifactId>sjson</artifactId>
- <version>0.5-SNAPSHOT</version>
- <versioning>
- <snapshot>
- <localCopy>true</localCopy>
- </snapshot>
- <lastUpdated>20100314052127</lastUpdated>
- </versioning>
-</metadata>
@@ -1,274 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>sjson.json</groupId>
- <artifactId>sjson</artifactId>
- <packaging>jar</packaging>
- <version>0.5-SNAPSHOT</version>
- <name>sjson</name>
-
- <properties>
- <sjson.version>0.5-SNAPSHOT</sjson.version>
- <sjson.groupId>sjson</sjson.groupId>
- <scala.version>2.7.7</scala.version>
- </properties>
-
- <licenses>
- <license>
- <name>the Apache License, ASL Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
- <repositories>
- <repository>
- <id>repo1.maven</id>
- <name>Maven Main Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- </repository>
- <repository>
- <id>project.embedded.module</id>
- <name>Project Embedded Repository</name>
- <url>file://${basedir}/embedded-repo</url>
- </repository>
- <repository>
- <id>scala-tools-snapshots</id>
- <name>Scala-Tools Maven2 Snapshot Repository</name>
- <url>http://scala-tools.org/repo-snapshots</url>
- </repository>
- <repository>
- <id>scala-tools</id>
- <name>Scala-Tools Maven2 Repository</name>
- <url>http://scala-tools.org/repo-releases</url>
- </repository>
- <repository>
- <id>databinder.net/repo/</id>
- <name>dbDispatch Repository for Maven</name>
- <url>http://databinder.net/repo</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>onejar-maven-plugin.googlecode.com</id>
- <url>http://onejar-maven-plugin.googlecode.com/svn/mavenrepo</url>
- </pluginRepository>
- <pluginRepository>
- <id>scala-tools.org</id>
- <name>Scala-Tools Maven2 Repository</name>
- <url>http://scala-tools.org/repo-releases</url>
- </pluginRepository>
- </pluginRepositories>
-
- <build>
- <sourceDirectory>src/main/scala</sourceDirectory>
- <testSourceDirectory>src/test/scala/sjson/json</testSourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/main/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <mainClass>sjson.json.Driver</mainClass>
- <classpathScope>test</classpathScope>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Spec.java</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <version>2.10.1</version>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jvmArgs>
- <jvmArg>-Xmx1024m</jvmArg>
- </jvmArgs>
- <args>
- <!--arg>-unchecked</arg>
- <arg>-deprecation</arg>
- <arg>-Xno-varargs-conversion</arg-->
- </args>
- <scalaVersion>${scala.version}</scalaVersion>
- </configuration>
- </plugin>
- <plugin>
- <inherited>true</inherited>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <archive>
- <manifestEntries>
- <akka_version>${akka.version}</akka_version>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-beta-1</version>
- <executions>
- <execution>
- <id>enforce-java</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>1.6.0</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <_versionpolicy>[$(@),$(version;=+;$(@)))</_versionpolicy>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>create-bundle</id>
- <phase>package</phase>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- <execution>
- <id>bundle-install</id>
- <phase>install</phase>
- <goals>
- <goal>install</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>2.7.7</version>
- </dependency>
- <dependency>
- <groupId>net.databinder</groupId>
- <artifactId>dispatch-json_2.7.7</artifactId>
- <version>0.6.5</version>
- </dependency>
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- <version>1.2</version>
- </dependency>
- <!-- For Testing -->
- <dependency>
- <groupId>org.scalatest</groupId>
- <artifactId>scalatest</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
File renamed without changes.
@@ -0,0 +1,32 @@
+import sbt._
+
+class SCouchDbProject(info: ProjectInfo) extends DefaultProject(info)
+{
+ val scalaToolsSnapshots = "Scala-Tools Maven2 Snapshots Repository" at "http://scala-tools.org/repo-snapshots"
+ val scalaToolsReleases = "Scala-Tools Maven2 Releases Repository" at "http://scala-tools.org/repo-releases"
+ // val embeddedRepo = MavenRepository("Embedded Repo", (info.projectPath / "embedded-repo").asURL.toString)
+ val dispatch_json = "net.databinder" % "dispatch-json_2.8.0" % "0.7.4" % "compile"
+ val dispatch_http_json = "net.databinder" % "dispatch-http-json_2.8.0" % "0.7.4" % "compile"
+ val dispatch_http = "net.databinder" % "dispatch-http_2.8.0" % "0.7.4" % "compile"
+ val commons_logging = "commons-logging" % "commons-logging" % "1.1.1" % "compile"
+ val httpclient = "org.apache.httpcomponents" % "httpclient" % "4.0.1" % "compile"
+ val sjson = "sjson.json" % "sjson" % "0.7" % "compile"
+
+ val scalatest =
+ buildScalaVersion match {
+ case "2.7.7" =>
+ "org.scalatest" % "scalatest" % "1.0"
+ case "2.8.0.Beta1" =>
+ "org.scalatest" % "scalatest" % "1.0.1-for-scala-2.8.0.Beta1-with-test-interfaces-0.3-SNAPSHOT"
+ case "2.8.0.RC2" =>
+ "org.scalatest" % "scalatest" % "1.2-for-scala-2.8.0.RC2-SNAPSHOT" % "test"
+ case "2.8.0.RC3" =>
+ "org.scalatest" % "scalatest" % "1.2-for-scala-2.8.0.RC2-SNAPSHOT" % "test"
+ case "2.8.0.RC7" =>
+ "org.scalatest" % "scalatest" % "1.2-for-scala-2.8.0.RC7-SNAPSHOT" % "test"
+ case "2.8.0" =>
+ "org.scalatest" % "scalatest" % "1.2" % "test"
+ }
+
+ val junit = "junit" % "junit" % "4.8.1"
+}

0 comments on commit f8afb58

Please sign in to comment.