Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: linkedin/sensei
...
head fork: rsumbaly/sensei
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
  • 5 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
4 .classpath
@@ -7,10 +7,10 @@
<classpathentry exported="true" kind="lib" path="lib/master/kamikaze-2.0.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/master/log4j.jar"/>
<classpathentry exported="true" kind="lib" path="lib/master/lucene-core.jar"/>
- <classpathentry kind="lib" path="lib/master/netty-3.2.3.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/master/netty-3.2.3.Final.jar"/>
<classpathentry exported="true" kind="lib" path="lib/master/protobuf-java.jar"/>
<classpathentry exported="true" kind="lib" path="lib/master/spring.jar"/>
- <classpathentry kind="lib" path="/Users/xgu/opensrc/sensei/lib/master/zoie-2.5.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/master/zoie-2.5.0.jar"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/master/norbert-cluster-2.8.0-0.5.1.jar"/>
View
6 README
@@ -1,7 +1,7 @@
-What is Sensi
+What is Sensei
===============
-Sensi is a distributed, elastic realtime searchable database.
+Sensei is a distributed, elastic realtime searchable database.
------------------------------------
@@ -19,4 +19,4 @@ http://snaprojects.jira.com/browse/SENSEI
### Mailing List / Discussion Group
-http://groups.google.com/group/sensei-search
+http://groups.google.com/group/sensei-search
View
7 bin/update-protobuf.sh
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-bin=`dirname "$0"`
-bin=`cd "$bin"; pwd`
-
-cd $bin/..
-protoc --java_out=src protobuf/*.proto
View
28 build.properties
@@ -0,0 +1,28 @@
+## Main
+src.dir=src
+lib.dir=lib
+
+## Conf
+conf.dir=node-conf
+avro.schema.dir=avro-schemas
+protobuf.schema.dir=protobuf
+
+## Test
+test.src.dir=test/src
+test.report.dir=dist/junit-reports
+test.html.dir=dist/junit-reports/html
+test.conf.dir=test/conf
+
+## Build
+ivy.install.version=2.0.0-beta1
+ivy.jar.dir=ivy
+
+resources.dir=resources
+dist.dir=dist
+logs.dir=logs
+
+build.dir=build
+build.test.dir=build-test
+
+## Release
+version=0.0.1
View
209 build.xml
@@ -1,52 +1,24 @@
<project xmlns:ivy="antlib:org.apache.ivy.ant" name="sensei" default="dist">
- <property name="sensei.root" location="." />
- <property name="src" value="src" />
-
- <property name="avro.schema.dir" value="avro-schemas" />
- <property name="conf.dir" location="node-conf" />
- <property name="test.conf.dir" location="test/conf"/>
-
- <property name="lib.base" location="lib" />
- <property name="lib.dir" location="${lib.base}/master" />
- <property name="lib.test" location="${lib.base}/test" />
-
- <property name="test" value="test/src" />
- <property name="resources" value="resources" />
-
- <property name="build" value="build" />
- <property name="build.test" value="build-test" />
- <property name="dist" location="dist" />
-
- <property name="test.report.dir" location="${dist}/junit-reports" />
- <property name="test.html.dir" location="${test.report.dir}/html" />
-
- <property name="logs" value="logs" />
-
- <property name="version" value="0.0.1" />
-
+ <property file="build.properties" />
+
<property name="project.name" value="sensei" />
-
- <property name="ivy.install.version" value="2.0.0-beta1" />
- <property name="ivy.jar.dir" value="${basedir}/ivy" />
- <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
- <property name="build.dir" value="build" />
-
+
<path id="compile.class.path">
- <fileset dir="${lib.dir}">
+ <fileset dir="${lib.dir}/master">
<include name="*.jar" />
</fileset>
</path>
<path id="test.class.path">
- <path location="${build}" />
- <path location="${build.test}" />
+ <path location="${build.dir}" />
+ <path location="${build.test.dir}" />
<fileset dir="${lib.test}" />
<path refid="compile.class.path" />
- <path location="${resources}" />
+ <path location="${resources.dir}" />
</path>
<path id="java.class.path">
- <dirset dir="${build}">
+ <dirset dir="${build.dir}">
<include name="**" />
</dirset>
<path refid="compile.class.path" />
@@ -59,7 +31,7 @@
<target name="download-ivy" unless="skip.download">
<mkdir dir="${ivy.jar.dir}" />
<echo message="installing ivy..." />
- <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" dest="${ivy.jar.file}" usetimestamp="true" />
+ <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" dest="${ivy.jar.dir}/ivy.jar" usetimestamp="true" />
</target>
<target name="install-ivy" depends="download-ivy" description="--> install ivy">
@@ -70,17 +42,17 @@
</target>
<target name="clean">
- <delete dir="${build}" />
- <delete dir="${build.test}" />
- <delete dir="${dist}" />
- <delete dir="${logs}" />
+ <delete dir="${build.dir}" />
+ <delete dir="${build.test.dir}" />
+ <delete dir="${dist.dir}" />
+ <delete dir="${logs.dir}" />
</target>
<target name="init" depends="resolve">
- <mkdir dir="${build}" />
- <mkdir dir="${build.test}" />
- <mkdir dir="${dist}" />
- <mkdir dir="${logs}" />
+ <mkdir dir="${build.dir}" />
+ <mkdir dir="${build.test.dir}" />
+ <mkdir dir="${dist.dir}" />
+ <mkdir dir="${logs.dir}" />
</target>
<target name="generate" depends="init">
@@ -88,7 +60,7 @@
<classpath refid="compile.class.path" />
</taskdef>
- <schema destdir="${src}">
+ <schema destdir="${src.dir}">
<fileset dir="${avro.schema.dir}">
<include name="**/*.avsc" />
</fileset>
@@ -96,82 +68,82 @@
</target>
<target name="compile" depends="init">
- <javac debug="true" destdir="${build}" compiler="javac1.6" source="1.6" target="1.6">
- <src path="${src}" />
+ <javac debug="true" destdir="${build.dir}" compiler="javac1.6" source="1.6" target="1.6">
+ <src path="${src.dir}" />
<classpath refid="compile.class.path" />
</javac>
</target>
- <target name="gitversion" description="--> create git version information">
- <exec executable="git" outputproperty="gitversion">
- <arg value="log"/>
- <arg value="-1"/>
- <arg value="--pretty=oneline"/>
- </exec>
- </target>
+ <target name="gitversion" description="--> create git version information">
+ <exec executable="git" outputproperty="gitversion">
+ <arg value="log"/>
+ <arg value="-1"/>
+ <arg value="--pretty=oneline"/>
+ </exec>
+ </target>
<target name="dist" depends="compile,gitversion">
- <tstamp>
- <format property="TODAY" pattern="yyyy-MM-dd HH:mm:ss" />
- </tstamp>
- <jar destfile="${dist}/${project.name}-${version}.jar" basedir="${build}">
- <fileset dir="src"/>
- <manifest>
- <attribute name="Built-By" value="${user.name}"/>
- <attribute name="Git-Version" value="${gitversion}"/>
- <attribute name="Built-Date" value="${TODAY}"/>
- </manifest>
+ <tstamp>
+ <format property="TODAY" pattern="yyyy-MM-dd HH:mm:ss" />
+ </tstamp>
+ <jar destfile="${dist.dir}/${project.name}-${version}.jar" basedir="${build.dir}">
+ <fileset dir="${src.dir}"/>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Git-Version" value="${gitversion}"/>
+ <attribute name="Built-Date" value="${TODAY}"/>
+ </manifest>
</jar>
</target>
- <target name="war" depends="dist">
- <war destfile="${dist}/${project.name}.war" webxml="${resources}/web.xml">
- <lib dir="${dist}">
- <include name="*.jar"/>
- </lib>
- <lib dir="${lib.dir}" excludes="servlet-api.jar">
- <include name="*.jar"/>
- </lib>
- <classes dir="${resources}" excludes="web.xml" />
- <fileset dir="client-app/" />
- </war>
- </target>
+ <target name="war" depends="dist">
+ <war destfile="${dist.dir}/${project.name}.war" webxml="${resources.dir}/web.xml">
+ <lib dir="${dist.dir}">
+ <include name="*.jar"/>
+ </lib>
+ <lib dir="${lib.dir}/master" excludes="servlet-api.jar">
+ <include name="*.jar"/>
+ </lib>
+ <classes dir="${resources.dir}" excludes="web.xml" />
+ <fileset dir="client-app/" />
+ </war>
+ </target>
- <target name="run-server" depends="war" description="--> run server">
- <java fork="true" jar="${lib.base}/server/zoie-server.jar" failonerror="true" maxmemory="1g">
- <sysproperty key="log.home" value="${logs}" />
- <sysproperty key="conf.dir" value="server-conf" />
- <!-- <jvmarg value="-d64" /> -->
- <jvmarg value="-server" />
- <jvmarg value="-Xms512m" />
- <jvmarg value="-Xmx1g" />
- <jvmarg value="-Xloggc:${logs}/gc.log" />
- <jvmarg value="-XX:+PrintGCTimeStamps" />
- <jvmarg value="-XX:+PrintGCDetails" />
- <jvmarg value="-XX:+AggressiveHeap" />
- <jvmarg value="-XX:+UseAdaptiveSizePolicy" />
- <!--jvmarg value="-XX:+UseConcMarkSweepGC" /-->
- <!--jvmarg value="-XX:MaxTenuringThreshold=10" /-->
- <!--jvmarg value="-XX:+UseParallelGC" /-->
- <jvmarg value="-XX:NewRatio=1" />
- <jvmarg value="-XX:SurvivorRatio=2" />
- <jvmarg value="-Dcom.sun.management.jmxremote" />
- <jvmarg value="-Dcom.sun.management.jmxremote.port=9999" />
- <jvmarg value="-Dcom.sun.management.jmxremote.authenticate=false" />
- <jvmarg value="-Dcom.sun.management.jmxremote.ssl=false" />
- <!-- uncomment to turn on debugging
+ <target name="run-server" depends="war" description="--> run server">
+ <java fork="true" jar="${lib.dir}/server/zoie-server.jar" failonerror="true" maxmemory="1g">
+ <sysproperty key="log.home" value="${logs.dir}" />
+ <sysproperty key="conf.dir" value="server-conf" />
+ <!-- <jvmarg value="-d64" /> -->
+ <jvmarg value="-server" />
+ <jvmarg value="-Xms512m" />
+ <jvmarg value="-Xmx1g" />
+ <jvmarg value="-Xloggc:${logs.dir}/gc.log" />
+ <jvmarg value="-XX:+PrintGCTimeStamps" />
+ <jvmarg value="-XX:+PrintGCDetails" />
+ <jvmarg value="-XX:+AggressiveHeap" />
+ <jvmarg value="-XX:+UseAdaptiveSizePolicy" />
+ <!--jvmarg value="-XX:+UseConcMarkSweepGC" /-->
+ <!--jvmarg value="-XX:MaxTenuringThreshold=10" /-->
+ <!--jvmarg value="-XX:+UseParallelGC" /-->
+ <jvmarg value="-XX:NewRatio=1" />
+ <jvmarg value="-XX:SurvivorRatio=2" />
+ <jvmarg value="-Dcom.sun.management.jmxremote" />
+ <jvmarg value="-Dcom.sun.management.jmxremote.port=9999" />
+ <jvmarg value="-Dcom.sun.management.jmxremote.authenticate=false" />
+ <jvmarg value="-Dcom.sun.management.jmxremote.ssl=false" />
+ <!-- uncomment to turn on debugging
<jvmarg value="-Xrunjdwp:transport=dt_socket,address=8886,server=y,suspend=y" />
- -->
- <!--jvmarg value="-agentpath:/Users/xgu/Downloads/YourKit_Java_Profiler_8.0.18.app/bin/mac/libyjpagent.jnilib" /-->
- <!-- uncomment to turn on yourkit profiling
+ -->
+ <!--jvmarg value="-agentpath:/Users/xgu/Downloads/YourKit_Java_Profiler_8.0.18.app/bin/mac/libyjpagent.jnilib" /-->
+ <!-- uncomment to turn on yourkit profiling
<jvmarg value="-agentlib:yjpagent" />
- -->
- </java>
- </target>
+ -->
+ </java>
+ </target>
<target name="test-build" depends="dist">
- <javac debug="true" destdir="${build.test}" compiler="javac1.6" source="1.6" target="1.6">
- <src path="${test}" />
+ <javac debug="true" destdir="${build.test.dir}" compiler="javac1.6" source="1.6" target="1.6">
+ <src path="${test.src.dir}" />
<classpath refid="java.class.path" />
</javac>
</target>
@@ -182,10 +154,10 @@
<mkdir dir="${test.html.dir}" />
<junit printsummary="yes" showoutput="yes">
- <sysproperty key="log.home" value="${logs}" />
+ <sysproperty key="log.home" value="${logs.dir}" />
<sysproperty key="idx.dir" value="data/cardata" />
<sysproperty key="uididx.dir" value="data/uiddata" />
- <sysproperty key="log4j.configuration" value="resources/log4j.properties" />
+ <sysproperty key="log4j.configuration" value="${resources.dir}/log4j.properties" />
<jvmarg value="-server" />
<jvmarg value="-Xms256m" />
@@ -204,7 +176,7 @@
<formatter type="xml" />
<batchtest fork="yes" todir="${test.report.dir}">
- <fileset dir="${test}">
+ <fileset dir="${test.src.dir}">
<include name="**/SenseiTestSuite.java" />
</fileset>
</batchtest>
@@ -216,4 +188,19 @@
<report todir="${test.html.dir}" format="frames" />
</junitreport>
</target>
+
+ <target name="protobuf" description="Generate source files from .proto files">
+ <pathconvert property="proto.sources" pathsep=" ">
+ <path id="proto-files">
+ <fileset dir="${protobuf.schema.dir}" />
+ </path>
+ </pathconvert>
+
+ <property name="proto.path" location="${protobuf.schema.dir}"/>
+ <exec executable="protoc" failonerror="true">
+ <arg value="--proto_path=${proto.path}"/>
+ <arg value="--java_out=${src.dir}"/>
+ <arg line="${proto.sources}"/>
+ </exec>
+ </target>
</project>
View
192 pom.xml
@@ -14,137 +14,195 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <lucene.version>2.9.1</lucene.version>
- <spring.version>3.0.0.RELEASE</spring.version>
- <norbert.version>1.0-SNAPSHOT</norbert.version>
- <zookeeper.version>3.3.0</zookeeper.version>
+
+ <!-- Remote artifacts -->
+ <commons-logging.version>1.1</commons-logging.version>
+ <commons-configuration.version>1.6</commons-configuration.version>
+ <commons-codec.version>1.4</commons-codec.version>
+ <commons-lang.version>2.5</commons-lang.version>
+ <commons-collections.version>3.2.1</commons-collections.version>
+ <javax.servlet.version>2.5</javax.servlet.version>
+ <fastutils.version>5.0.5</fastutils.version>
+ <junit.version>4.5</junit.version>
+ <log4j.version>1.2.16</log4j.version>
+ <lucene.version>3.0.2</lucene.version>
+ <spring.version>2.5.5</spring.version>
<protobuf.version>2.3.0</protobuf.version>
+ <zookeeper.version>3.3.1</zookeeper.version>
+ <json.version>20080701</json.version>
+ <avro.version>1.4.0</avro.version>
+ <jackson-mapper-asl.version>1.6.1</jackson-mapper-asl.version>
+ <jackson-core-asl.version>1.6.2</jackson-core-asl.version>
+
+ <!-- Local artifacts -->
+ <kafka.version>0.05</kafka.version>
+ <kamikaze.version>2.0.0</kamikaze.version>
+ <norbert.version>2.8.0-0.5.1</norbert.version>
<bobo.version>2.5.0</bobo.version>
- <netty.version>3.1.5.GA</netty.version>
- <scala.version>1.0</scala.version>
+ <netty.version>3.2.3.Final</netty.version>
+ <scala.version>2.8.0</scala.version>
+ <zoie.version>2.5.0</zoie.version>
</properties>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
</dependency>
-
<dependency>
- <groupId>com.snaprojects</groupId>
- <artifactId>zoie</artifactId>
- <version>2.0.0</version>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>${commons-configuration.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${javax.servlet.version}</version>
</dependency>
<dependency>
<groupId>fastutil</groupId>
<artifactId>fastutil</artifactId>
- <version>5.0.9</version>
+ <version>${fastutils.version}</version>
</dependency>
-
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
- <scope>test</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
</dependency>
-
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
+ <artifactId>spring</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${protobuf.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>${spring.version}</version>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
</dependency>
-
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.4.2</version>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${json.version}</version>
</dependency>
-
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>${avro.version}</version>
</dependency>
-
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>${lucene.version}</version>
- </dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson-mapper-asl.version}</version>
+ </dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-snowball</artifactId>
- <version>${lucene.version}</version>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson-core-asl.version}</version>
</dependency>
+
+
+ <dependency>
+ <groupId>com.linkedin</groupId>
+ <artifactId>kamikaze</artifactId>
+ <version>${kamikaze.version}</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/master/kamikaze-${kamikaze.version}.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>com.linkedin</groupId>
+ <artifactId>kafka</artifactId>
+ <version>${kafka.version}</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/master/kafka-${kafka.version}.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>com.snaprojects</groupId>
+ <artifactId>zoie</artifactId>
+ <version>${zoie.version}</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/master/zoie-${zoie.version}.jar</systemPath>
+ </dependency>
<dependency>
<groupId>com.snaprojects</groupId>
<artifactId>bobo-browse</artifactId>
<version>${bobo.version}</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/master/bobo-browse-${bobo.version}.jar</systemPath>
</dependency>
-
<dependency>
<groupId>com.linkedin</groupId>
<artifactId>norbert-java-cluster</artifactId>
<version>${norbert.version}</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/master/norbert-java-cluster-${norbert.version}.jar</systemPath>
</dependency>
<dependency>
<groupId>com.linkedin</groupId>
<artifactId>norbert-java-network</artifactId>
<version>${norbert.version}</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/master/norbert-java-network-${norbert.version}.jar</systemPath>
</dependency>
<dependency>
<groupId>com.linkedin</groupId>
<artifactId>norbert-network</artifactId>
<version>${norbert.version}</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/master/norbert-network-${norbert.version}.jar</systemPath>
</dependency>
<dependency>
<groupId>com.linkedin</groupId>
<artifactId>norbert-cluster</artifactId>
<version>${norbert.version}</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/master/norbert-cluster-${norbert.version}.jar</systemPath>
</dependency>
-
- <dependency>
- <groupId>org.apache</groupId>
- <artifactId>zookeeper</artifactId>
- <version>${zookeeper.version}</version>
- </dependency>
-
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
<version>${netty.version}</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/master/netty-${netty.version}.jar</systemPath>
</dependency>
-
<dependency>
<groupId>org.scala</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/master/scala-library-${scala.version}.jar</systemPath>
</dependency>
-
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${protobuf.version}</version>
- </dependency>
-
</dependencies>
<build>
@@ -153,8 +211,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
@@ -169,7 +227,7 @@
</configuration>
</plugin>
</plugins>
- <sourceDirectory>src/com</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>test/src</testSourceDirectory>
</build>
</project>

No commit comments for this range

Something went wrong with that request. Please try again.