Skip to content

Commit

Permalink
[GIE POM] Unify GIE version by the global flag 'revision' (#2243)
Browse files Browse the repository at this point in the history
* [GIE POM] unify GIE version by 'revision' flag in pom
* [GIE POM] add flatten maven plugin to generate an actual version instead of variable
* [GIE POM] unify the version of compiler module
  • Loading branch information
shirly121 committed Nov 28, 2022
1 parent 71d61e3 commit 2b7cf00
Show file tree
Hide file tree
Showing 15 changed files with 86 additions and 40 deletions.
14 changes: 7 additions & 7 deletions interactive_engine/assembly/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>maxgraph-parent</artifactId>
<groupId>com.alibaba.maxgraph</groupId>
<version>0.0.1-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -39,12 +39,12 @@
<dependency>
<groupId>com.alibaba.maxgraph</groupId>
<artifactId>frontend</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.maxgraph</groupId>
<artifactId>executor</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
Expand All @@ -68,22 +68,22 @@
<dependency>
<groupId>com.alibaba.maxgraph</groupId>
<artifactId>groot-server</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.maxgraph</groupId>
<artifactId>data_load_tools</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.maxgraph</groupId>
<artifactId>executor</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.maxgraph</groupId>
<artifactId>c-end-lgraph</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
Expand Down
2 changes: 1 addition & 1 deletion interactive_engine/common/pom.xml
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>maxgraph-parent</artifactId>
<groupId>com.alibaba.maxgraph</groupId>
<version>0.0.1-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
9 changes: 5 additions & 4 deletions interactive_engine/compiler/Makefile
Expand Up @@ -16,17 +16,18 @@ graph.schema:=

rpc.target:=start_rpc_server

target.revision:=1.0-SNAPSHOT

ifeq ($(UNAME_S),Darwin)
ifeq ($(UNAME_M),arm64)
OSFLAG += -Dos.detected.classifier=osx-x86_64
endif
endif

build:
cd $(CUR_DIR)/../executor/engine/pegasus/clients/java/client && \
mvn clean install -DskipTests --quiet $(OSFLAG) && \
cd $(CUR_DIR)/../executor/ir/integrated && cargo build --release --bin $(rpc.target) && \
cd $(CUR_DIR) && mvn clean package -DskipTests --quiet $(OSFLAG)
cd $(CUR_DIR)/.. && \
mvn clean install -DskipTests -Drevision=${target.revision} -Pexperimental --quiet $(OSFLAG) && \
cd $(CUR_DIR)/../executor/ir/integrated && cargo build --release --bin $(rpc.target)

clean:
cd $(CUR_DIR)/../executor/engine/pegasus/clients/java/client && mvn clean && \
Expand Down
10 changes: 8 additions & 2 deletions interactive_engine/compiler/pom.xml
Expand Up @@ -5,9 +5,15 @@

<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>maxgraph-parent</artifactId>
<groupId>com.alibaba.maxgraph</groupId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>compiler</artifactId>
<groupId>com.alibaba.graphscope</groupId>
<version>1.0-SNAPSHOT</version>

<properties>
<jackson.version>2.14.0-rc1</jackson.version>
Expand Down Expand Up @@ -45,7 +51,7 @@
<dependency>
<groupId>com.alibaba.pegasus</groupId>
<artifactId>pegasus-client</artifactId>
<version>1.0-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
4 changes: 2 additions & 2 deletions interactive_engine/data_load_tools/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>maxgraph-parent</artifactId>
<groupId>com.alibaba.maxgraph</groupId>
<version>0.0.1-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -42,7 +42,7 @@
<artifactId>hadoop-common</artifactId>
</exclusion>
</exclusions>
<version>${project.parent.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.rocksdb</groupId>
Expand Down
Expand Up @@ -4,14 +4,18 @@
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>
<artifactId>maxgraph-parent</artifactId>
<groupId>com.alibaba.maxgraph</groupId>
<version>${revision}</version>
<relativePath>../../../../../../pom.xml</relativePath>
</parent>

<groupId>com.alibaba.pegasus</groupId>
<artifactId>pegasus-client</artifactId>
<version>1.0-SNAPSHOT</version>

<properties>
<protobuf.version>3.19.6</protobuf.version>
<protoc.grpc.version>1.42.1</protoc.grpc.version>
<grpc.version>1.42.1</grpc.version>
<protoc.grpc.version>${grpc.version}</protoc.grpc.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion interactive_engine/executor/pom.xml
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>maxgraph-parent</artifactId>
<groupId>com.alibaba.maxgraph</groupId>
<version>0.0.1-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
6 changes: 3 additions & 3 deletions interactive_engine/frontend/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>maxgraph-parent</artifactId>
<groupId>com.alibaba.maxgraph</groupId>
<version>0.0.1-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -15,12 +15,12 @@
<dependency>
<artifactId>compiler</artifactId>
<groupId>com.alibaba.graphscope</groupId>
<version>1.0-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.maxgraph</groupId>
<artifactId>maxgraph-common</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions interactive_engine/groot-module/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>maxgraph-parent</artifactId>
<groupId>com.alibaba.maxgraph</groupId>
<version>0.0.1-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -16,12 +16,12 @@
<dependency>
<groupId>com.alibaba.maxgraph</groupId>
<artifactId>maxgraph-common</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.maxgraph</groupId>
<artifactId>maxgraph-sdk-common</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
8 changes: 4 additions & 4 deletions interactive_engine/groot-server/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>maxgraph-parent</artifactId>
<groupId>com.alibaba.maxgraph</groupId>
<version>0.0.1-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>com.alibaba.maxgraph</groupId>
<artifactId>sdk</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
Expand All @@ -31,7 +31,7 @@
<dependency>
<groupId>com.alibaba.maxgraph</groupId>
<artifactId>groot-module</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
Expand All @@ -42,7 +42,7 @@
<dependency>
<artifactId>compiler</artifactId>
<groupId>com.alibaba.graphscope</groupId>
<version>1.0-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
4 changes: 2 additions & 2 deletions interactive_engine/lgraph/pom.xml
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>maxgraph-parent</artifactId>
<groupId>com.alibaba.maxgraph</groupId>
<version>0.0.1-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>com.alibaba.maxgraph</groupId>
<artifactId>executor</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>

Expand Down
40 changes: 38 additions & 2 deletions interactive_engine/pom.xml
Expand Up @@ -5,11 +5,18 @@
<groupId>com.alibaba.maxgraph</groupId>
<artifactId>maxgraph-parent</artifactId>
<packaging>pom</packaging>
<version>0.0.1-SNAPSHOT</version>
<version>${revision}</version>

<name>MaxGraph</name>
<profiles>
<!-- DO NOT CHANGE THE *ORDER* IN WHICH THESE PROFILES ARE DEFINED! -->
<profile>
<id>experimental</id>
<modules>
<module>executor/engine/pegasus/clients/java/client</module>
<module>compiler</module>
</modules>
</profile>
<profile>
<id>graphscope</id>
<properties>
Expand Down Expand Up @@ -68,6 +75,7 @@
</profiles>

<properties>
<revision>0.0.1-SNAPSHOT</revision>
<rust.compile.skip>false</rust.compile.skip>
<rust.compile.mode>debug</rust.compile.mode>
<rust.compile.target>v6d</rust.compile.target>
Expand Down Expand Up @@ -101,6 +109,7 @@
<metrics.core.version>3.2.5</metrics.core.version>
<aliyun.oss.version>3.14.1</aliyun.oss.version>
<skip.tests>true</skip.tests>
<flatten.maven.plugin>1.1.0</flatten.maven.plugin>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -713,5 +722,32 @@
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${flatten.maven.plugin}</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
</project>
2 changes: 1 addition & 1 deletion interactive_engine/sdk-common/pom.xml
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>maxgraph-parent</artifactId>
<groupId>com.alibaba.maxgraph</groupId>
<version>0.0.1-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions interactive_engine/sdk/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>maxgraph-parent</artifactId>
<groupId>com.alibaba.maxgraph</groupId>
<version>0.0.1-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -16,7 +16,7 @@
<dependency>
<groupId>com.alibaba.maxgraph</groupId>
<artifactId>maxgraph-sdk-common</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
3 changes: 1 addition & 2 deletions interactive_engine/tests/pom.xml
Expand Up @@ -7,13 +7,12 @@
<parent>
<artifactId>maxgraph-parent</artifactId>
<groupId>com.alibaba.maxgraph</groupId>
<version>0.0.1-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>com.alibaba.maxgraph</groupId>
<artifactId>maxgraph-tests</artifactId>
<version>0.0.1-SNAPSHOT</version>

<dependencies>
<dependency>
Expand Down

0 comments on commit 2b7cf00

Please sign in to comment.