Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Maven-project] Incorporate maven-proto-plugin into build of Maven projects #535

Merged
merged 7 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,10 @@ jobs:

- name: Buf Generate
run: buf generate


- name: Java Code Generate
run: |
pushd maven-projects/proto
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Minor] why compile, not generate-sources?

mvn clean compile
popd

6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,8 @@ venv.bak/

### Scala ###
*.bloop
*.metals
*.metals

### Java ###
target/
maven-projects/proto/src/main/java
4 changes: 1 addition & 3 deletions buf.gen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,4 @@ plugins:
# Cpp
- remote: buf.build/protocolbuffers/cpp:v27.1
out: cpp/proto
# Java
- remote: buf.build/protocolbuffers/java:v27.1
out: maven-projects/info/src/main/java/
# Java code well be generated by maven plugin
2 changes: 1 addition & 1 deletion format/adjacent_list.proto
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ syntax = "proto3";

package graphar;
option java_multiple_files = true;
option java_package = "org.apache.graphar.info.proto";
option java_package = "org.apache.graphar.proto";

import "enums.proto";

Expand Down
2 changes: 1 addition & 1 deletion format/edge_info.proto
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ syntax = "proto3";

package graphar;
option java_multiple_files = true;
option java_package = "org.apache.graphar.info.proto";
option java_package = "org.apache.graphar.proto";

import "property_group.proto";
import "adjacent_list.proto";
Expand Down
2 changes: 1 addition & 1 deletion format/enums.proto
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ syntax = "proto3";

package graphar;
option java_multiple_files = true;
option java_package = "org.apache.graphar.info.proto";
option java_package = "org.apache.graphar.proto";

enum DataType {
BOOL = 0;
Expand Down
2 changes: 1 addition & 1 deletion format/graph_info.proto
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ syntax = "proto3";

package graphar;
option java_multiple_files = true;
option java_package = "org.apache.graphar.info.proto";
option java_package = "org.apache.graphar.proto";

import "vertex_info.proto";
import "edge_info.proto";
Expand Down
2 changes: 1 addition & 1 deletion format/property_group.proto
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ syntax = "proto3";

package graphar;
option java_multiple_files = true;
option java_package = "org.apache.graphar.info.proto";
option java_package = "org.apache.graphar.proto";

import "enums.proto";

Expand Down
2 changes: 1 addition & 1 deletion format/vertex_info.proto
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ syntax = "proto3";

package graphar;
option java_multiple_files = true;
option java_package = "org.apache.graphar.info.proto";
option java_package = "org.apache.graphar.proto";

import "property_group.proto";

Expand Down
1 change: 0 additions & 1 deletion maven-projects/info/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,4 @@
</dependency>
</dependencies>


</project>
1 change: 1 addition & 0 deletions maven-projects/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,6 @@
<module>java</module>
<module>spark</module>
<module>info</module>
<module>proto</module>
</modules>
</project>
81 changes: 81 additions & 0 deletions maven-projects/proto/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.

-->

<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.graphar</groupId>
<artifactId>graphar-root</artifactId>
<version>${graphar.version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>proto</artifactId>
<packaging>jar</packaging>
<version>0.13.0.dev-SNAPSHOT</version>

<name>proto</name>

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<protobuf-maven-plugin.version>2.3.0</protobuf-maven-plugin.version>
<protobuf.version>4.27.1</protobuf.version>
</properties>

<dependencies>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>io.github.ascopes</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>${protobuf-maven-plugin.version}</version>
<configuration>
<sourceDirectories>
<sourceDirectory>${project.basedir}/../../format</sourceDirectory>
</sourceDirectories>
<outputDirectory>${project.basedir}/src/main/java</outputDirectory>
<protocVersion>${protobuf.version}</protocVersion>
</configuration>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading