diff options
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | core/pom.xml | 41 | ||||
| -rw-r--r-- | core_native/pom.xml | 39 | ||||
| -rw-r--r-- | pom.xml | 42 | ||||
| m--------- | proto | 0 |
6 files changed, 90 insertions, 42 deletions
diff --git a/.gitmodules b/.gitmodules index 9370a70b..bda32e2b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "proto"] path = proto - url = https://github.com/google/census-proto + url = https://github.com/google/census-proto.git diff --git a/.travis.yml b/.travis.yml index e5e29680..ec30de3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,14 @@ install: - case "$BUILD" in "BAZEL") sudo apt-get install bazel ;; + "MVN") + mkdir protoc ; + cd protoc ; + curl -L -o protoc.zip https://github.com/google/protobuf/releases/download/v3.0.2/protoc-3.0.2-linux-x86_64.zip ; + unzip protoc.zip ; + export PATH=`pwd`/bin/:$PATH ; + protoc --version ; + cd .. ;; esac script: diff --git a/core/pom.xml b/core/pom.xml index 36a3a8ea..4bb28c75 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -15,4 +15,45 @@ <artifactId>census-parent</artifactId> <version>0.1.0-SNAPSHOT</version> </parent> + <build> + <sourceDirectory>java</sourceDirectory> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.5.1</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.3.1</version> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.2</version> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.8.1</version> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/core_native/pom.xml b/core_native/pom.xml index 6bbf3633..9db95af2 100644 --- a/core_native/pom.xml +++ b/core_native/pom.xml @@ -22,11 +22,50 @@ <artifactId>census-core</artifactId> <version>0.1.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>com.google.census</groupId> + <artifactId>census-proto</artifactId> + <version>0.1.0-SNAPSHOT</version> + </dependency> </dependencies> <build> + <sourceDirectory>java</sourceDirectory> <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.5.1</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.3.1</version> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.2</version> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-javadoc-plugin</artifactId> + <version>2.8.1</version> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> <configuration> <show>private</show> </configuration> @@ -34,6 +34,7 @@ <modules> <module>core</module> <module>core_native</module> + <module>proto</module> </modules> <dependencies> @@ -48,45 +49,4 @@ <version>3.0.0</version> </dependency> </dependencies> - <build> - <sourceDirectory>java</sourceDirectory> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <version>2.3.1</version> - </plugin> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <version>2.1.2</version> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8.1</version> - <executions> - <execution> - <id>attach-javadocs</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> diff --git a/proto b/proto -Subproject f48b527a96b4c968ef94a27274e26aec3221d77 +Subproject 644e1bb2524776a4f6f976bc45c1ad095f002cb |