Skip to content
This repository was archived by the owner on Dec 23, 2023. It is now read-only.

Commit ff4c066

Browse files
committed
Builds Protocol Buffers with Maven.
1 parent ae7d644 commit ff4c066

File tree

6 files changed

+91
-43
lines changed

6 files changed

+91
-43
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "proto"]
22
path = proto
3-
url = https://github.com/google/census-proto
3+
url = https://github.com/google/census-proto.git

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ install:
2525
- case "$BUILD" in
2626
"BAZEL")
2727
sudo apt-get install bazel ;;
28+
"MVN")
29+
mkdir protoc ;
30+
cd protoc ;
31+
curl -L -o protoc.zip https://github.com/google/protobuf/releases/download/v3.0.2/protoc-3.0.2-linux-x86_64.zip ;
32+
unzip protoc.zip ;
33+
export PATH=`pwd`/bin/:$PATH ;
34+
protoc --version ;
35+
cd .. ;;
2836
esac
2937

3038
script:

core/pom.xml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,45 @@
1515
<artifactId>census-parent</artifactId>
1616
<version>0.1.0-SNAPSHOT</version>
1717
</parent>
18+
<build>
19+
<sourceDirectory>java</sourceDirectory>
20+
<plugins>
21+
<plugin>
22+
<artifactId>maven-compiler-plugin</artifactId>
23+
<version>3.5.1</version>
24+
<configuration>
25+
<source>1.6</source>
26+
<target>1.6</target>
27+
</configuration>
28+
</plugin>
29+
<plugin>
30+
<artifactId>maven-jar-plugin</artifactId>
31+
<version>2.3.1</version>
32+
</plugin>
33+
<plugin>
34+
<artifactId>maven-source-plugin</artifactId>
35+
<version>2.1.2</version>
36+
<executions>
37+
<execution>
38+
<id>attach-sources</id>
39+
<goals>
40+
<goal>jar-no-fork</goal>
41+
</goals>
42+
</execution>
43+
</executions>
44+
</plugin>
45+
<plugin>
46+
<artifactId>maven-javadoc-plugin</artifactId>
47+
<version>2.8.1</version>
48+
<executions>
49+
<execution>
50+
<id>attach-javadocs</id>
51+
<goals>
52+
<goal>jar</goal>
53+
</goals>
54+
</execution>
55+
</executions>
56+
</plugin>
57+
</plugins>
58+
</build>
1859
</project>

core_native/pom.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,50 @@
2222
<artifactId>census-core</artifactId>
2323
<version>0.1.0-SNAPSHOT</version>
2424
</dependency>
25+
<dependency>
26+
<groupId>com.google.census</groupId>
27+
<artifactId>census-proto</artifactId>
28+
<version>0.1.0-SNAPSHOT</version>
29+
</dependency>
2530
</dependencies>
2631
<build>
32+
<sourceDirectory>java</sourceDirectory>
2733
<plugins>
34+
<plugin>
35+
<artifactId>maven-compiler-plugin</artifactId>
36+
<version>3.5.1</version>
37+
<configuration>
38+
<source>1.6</source>
39+
<target>1.6</target>
40+
</configuration>
41+
</plugin>
42+
<plugin>
43+
<artifactId>maven-jar-plugin</artifactId>
44+
<version>2.3.1</version>
45+
</plugin>
46+
<plugin>
47+
<artifactId>maven-source-plugin</artifactId>
48+
<version>2.1.2</version>
49+
<executions>
50+
<execution>
51+
<id>attach-sources</id>
52+
<goals>
53+
<goal>jar-no-fork</goal>
54+
</goals>
55+
</execution>
56+
</executions>
57+
</plugin>
2858
<plugin>
2959
<artifactId>maven-javadoc-plugin</artifactId>
60+
<version>2.8.1</version>
61+
<executions>
62+
<execution>
63+
<id>attach-javadocs</id>
64+
<goals>
65+
<goal>jar</goal>
66+
</goals>
67+
</execution>
68+
</executions>
3069
<configuration>
3170
<show>private</show>
3271
</configuration>

pom.xml

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<modules>
3535
<module>core</module>
3636
<module>core_native</module>
37+
<module>proto</module>
3738
</modules>
3839

3940
<dependencies>
@@ -48,45 +49,4 @@
4849
<version>3.0.0</version>
4950
</dependency>
5051
</dependencies>
51-
<build>
52-
<sourceDirectory>java</sourceDirectory>
53-
<plugins>
54-
<plugin>
55-
<artifactId>maven-compiler-plugin</artifactId>
56-
<version>3.5.1</version>
57-
<configuration>
58-
<source>1.6</source>
59-
<target>1.6</target>
60-
</configuration>
61-
</plugin>
62-
<plugin>
63-
<artifactId>maven-jar-plugin</artifactId>
64-
<version>2.3.1</version>
65-
</plugin>
66-
<plugin>
67-
<artifactId>maven-source-plugin</artifactId>
68-
<version>2.1.2</version>
69-
<executions>
70-
<execution>
71-
<id>attach-sources</id>
72-
<goals>
73-
<goal>jar-no-fork</goal>
74-
</goals>
75-
</execution>
76-
</executions>
77-
</plugin>
78-
<plugin>
79-
<artifactId>maven-javadoc-plugin</artifactId>
80-
<version>2.8.1</version>
81-
<executions>
82-
<execution>
83-
<id>attach-javadocs</id>
84-
<goals>
85-
<goal>jar</goal>
86-
</goals>
87-
</execution>
88-
</executions>
89-
</plugin>
90-
</plugins>
91-
</build>
9252
</project>

proto

Submodule proto updated from f48b527 to 644e1bb

0 commit comments

Comments
 (0)