Skip to content

Commit

Permalink
Merge branch 'master' into license
Browse files Browse the repository at this point in the history
  • Loading branch information
coderzc authored Nov 28, 2022
2 parents 9d4fe64 + 79776c5 commit dd6c678
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ gen-java
build
*.class
**/dependency-reduced-pom.xml

dist.sh

### STS ###
.apt_generated
Expand Down
41 changes: 21 additions & 20 deletions computer-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,7 @@
<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">
<!--
/**
* 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.
*/
-->

<parent>
<artifactId>hugegraph-computer</artifactId>
<groupId>org.apache.hugegraph</groupId>
Expand All @@ -53,11 +35,30 @@
</properties>

<dependencies>

<dependency>
<groupId>org.apache.hugegraph</groupId>
<artifactId>computer-algorithm</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.hugegraph</groupId>
<artifactId>computer-core</artifactId>
<version>${revision}</version>
</dependency>

<dependency>
<groupId>org.apache.hugegraph</groupId>
<artifactId>computer-k8s-operator</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.hugegraph</groupId>
<artifactId>computer-yarn</artifactId>
<scope>provided</scope>
</dependency>

</dependencies>

<build>
Expand Down
19 changes: 0 additions & 19 deletions computer-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,6 @@
<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">
<!--
/**
* 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.
*/
-->
<parent>
<artifactId>hugegraph-computer</artifactId>
<groupId>org.apache.hugegraph</groupId>
Expand Down
38 changes: 32 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
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</groupId>
<artifactId>apache</artifactId>
<version>23</version>
</parent>

<groupId>org.apache.hugegraph</groupId>
<artifactId>hugegraph-computer</artifactId>
<version>${revision}</version>
Expand All @@ -25,12 +32,6 @@
</license>
</licenses>

<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>23</version>
</parent>

<scm>
<url>https://github.com/apache/hugegraph-computer</url>
<connection>https://github.com/apache/hugegraph-computer</connection>
Expand Down Expand Up @@ -96,6 +97,31 @@
<artifactId>hugegraph-client</artifactId>
<version>${hugegraph-client-version}</version>
</dependency>

<dependency>
<groupId>org.apache.hugegraph</groupId>
<artifactId>computer-algorithm</artifactId>
<version>${revision}</version>
</dependency>

<dependency>
<groupId>org.apache.hugegraph</groupId>
<artifactId>computer-core</artifactId>
<version>${revision}</version>
</dependency>

<dependency>
<groupId>org.apache.hugegraph</groupId>
<artifactId>computer-k8s-operator</artifactId>
<version>${revision}</version>
</dependency>

<dependency>
<groupId>org.apache.hugegraph</groupId>
<artifactId>computer-yarn</artifactId>
<version>${revision}</version>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
Expand Down

0 comments on commit dd6c678

Please sign in to comment.