Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Clean up pom.xml and add Travis CI support

Would also like to acknowledge github user @eirslett for
help with a variety of pull requests issued against scrooge.

Signed-off-by: Chris Aniszczyk <zx@twitter.com>
  • Loading branch information...
commit aafe643740b653bd9f5b6af713d9ba9c0618a723 1 parent 441b4fe
@caniszczyk caniszczyk authored Chris Aniszczyk committed
View
3  .travis.yml
@@ -0,0 +1,3 @@
+language: scala
+scala:
+ - 2.9.2
View
4 README.md
@@ -1,4 +1,4 @@
-# Scrooge
+# Scrooge [![Build Status](https://secure.travis-ci.org/twitter/scrooge.png)](http://travis-ci.org/twitter/scrooge)
Scrooge is a [thrift](http://thrift.apache.org/) code generator written in
Scala, which currently generates code for Scala and Java.
@@ -376,4 +376,4 @@ included file `LICENSE`.
- Jeremy Cloud
- Nick Kallen
- Kevin Oliver
-- Dana Contreras
+- Dana Contreras
View
58 pom.xml
@@ -5,20 +5,62 @@
<artifactId>scrooge</artifactId>
<packaging>pom</packaging>
<version>3.0.3-SNAPSHOT</version>
+ <url>http://github.com/twitter/scrooge</url>
+ <description>A Thrift generator for Scala</description>
+
+ <scm>
+ <connection>scm:git:git@github.com:twitter/scrooge.git</connection>
+ <url>scm:git:git@github.com:twitter/scrooge.git</url>
+ <developerConnection>scm:git:git@github.com:twitter/scrooge.git</developerConnection>
+ </scm>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+
+ <developers>
+ <developer>
+ <name>Chunyan Song</name>
+ <email>csong@twitter.com</email>
+ </developer>
+ </developers>
+
+ <properties>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <encoding>UTF-8</encoding>
+ <scala.version>2.9.2</scala.version>
+ </properties>
+
<distributionManagement>
<repository>
- <id>artifactory-release</id>
- <name>Twitter Artifactory Releases</name>
- <url>http://artifactory.local.twitter.com/libs-releases-local</url>
+ <id>sonatype-release</id>
+ <name>Sonatype OSS</name>
+ <url>https://oss.sonatype.org/content/groups/public/</url>
</repository>
- <snapshotRepository>
- <id>artifactory-snapshot</id>
- <name>Twitter Artifactory Snapshots</name>
- <url>http://artifactory.local.twitter.com/libs-snapshots-local</url>
- </snapshotRepository>
</distributionManagement>
+
+ <repositories>
+ <repository>
+ <id>twitter-maven-repository</id>
+ <name>Twitter's public artifact repository</name>
+ <url>http://maven.twttr.com/</url>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>Twitter public Maven repo</id>
+ <url>http://maven.twttr.com</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<modules>
<module>scrooge-runtime</module>
<module>scrooge-generator</module>
</modules>
+
</project>
View
53 scrooge-generator/pom.xml
@@ -8,15 +8,20 @@
<version>3.0.3-SNAPSHOT</version>
<parent>
<groupId>com.twitter</groupId>
- <artifactId>service-292</artifactId>
- <version>0.0.2</version>
- <relativePath/>
+ <artifactId>scrooge</artifactId>
+ <version>3.0.2</version>
</parent>
<properties>
<git.dir>${project.basedir}/../../.git</git.dir>
<mainClass>com.twitter.scrooge.Main</mainClass>
</properties>
<dependencies>
+ <!-- scala library -->
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.9.2</version>
+ </dependency>
<!-- project dependencies -->
<dependency>
<groupId>com.twitter</groupId>
@@ -46,6 +51,11 @@
<version>5.3.13</version>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ </dependency>
+ <dependency>
<groupId>org.scala-tools.testing</groupId>
<artifactId>specs_2.9.1</artifactId>
<version>1.6.9</version>
@@ -121,6 +131,43 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ <goal>testCompile</goal>
+ </goals>
+ <configuration>
+ <args>
+ <param>-unchecked</param>
+ <param>-deprecation</param>
+ <param>-encoding</param>
+ <param>utf8</param>
+ </args>
+ <jvmArgs>
+ <jvmArg>-Xmx2G</jvmArg>
+ </jvmArgs>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <sourceDir>src/main/scala</sourceDir>
+ <testSourceDir>src/test/scala</testSourceDir>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<executions>
View
0  ...tor/src/test/thrift/relative/Candy.thrift → ...tor/src/test/thrift/relative/candy.thrift
File renamed without changes
View
37 scrooge-runtime/pom.xml
@@ -7,14 +7,19 @@
<version>3.0.3-SNAPSHOT</version>
<parent>
<groupId>com.twitter</groupId>
- <artifactId>scala-parent-292</artifactId>
- <version>0.0.2</version>
- <relativePath/>
+ <artifactId>scrooge</artifactId>
+ <version>3.0.2</version>
</parent>
<properties>
<git.dir>${project.basedir}/../../.git</git.dir>
</properties>
<dependencies>
+ <!-- scala library -->
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.9.2</version>
+ </dependency>
<!-- library dependencies -->
<dependency>
<groupId>org.apache.thrift</groupId>
@@ -28,4 +33,30 @@
<version>5.3.13</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Please sign in to comment.
Something went wrong with that request. Please try again.