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.

Sign up for GitHub

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

Jump to bottom

fix outdated manifest version & use project.version instead #2033

Merged
merged 5 commits into from
Nov 26, 2022
Merged

fix outdated manifest version & use project.version instead #2033

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d34b01
fix outdated manifest version & use project.version instead
z7658329 Nov 24, 2022
4871d16
fix outdated manifest version & use project.version instead
z7658329 Nov 26, 2022
e6b5281
Merge branch 'master' into feat/adapt_manifest
imbajin Nov 26, 2022
0e09799
fix outdated manifest version & use project.version instead
z7658329 Nov 26, 2022
e601d31
Merge remote-tracking branch 'origin/feat/adapt_manifest' into feat/a…
z7658329 Nov 26, 2022
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
2 changes: 1 addition & 1 deletion hugegraph-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
</manifest>
<manifestEntries>
<!-- TODO: update it -->
<Implementation-Version>0.69.0.0</Implementation-Version>
<Implementation-Version>${project.version}</Implementation-Version>
z7658329 marked this conversation as resolved.
Show resolved Hide resolved
</manifestEntries>
</archive>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions hugegraph-api/src/main/java/org/apache/hugegraph/version/ApiVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ public final class ApiVersion {
* The second parameter of Version.of() is for IDE running without JAR
* TODO: what shall we set for this version? (consider the basic compatibility)
*/
public static final Version VERSION = Version.of(ApiVersion.class, "0.69");
z7658329 marked this conversation as resolved.
Show resolved Hide resolved
public static final Version VERSION = Version.of(ApiVersion.class, "1.0.0");

public static void check() {
// Check version of hugegraph-core. Firstly do check from version 0.3
// TODO: what shall we set for this version? (consider the basic compatibility)
VersionUtil.check(CoreVersion.VERSION, "0.13", "0.14", CoreVersion.NAME);
VersionUtil.check(CoreVersion.VERSION, "1.0.0", "1.0.1", CoreVersion.NAME);
z7658329 marked this conversation as resolved.
Show resolved Hide resolved
}
}
2 changes: 1 addition & 1 deletion hugegraph-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@
</addDefaultSpecificationEntries>
</manifest>
<manifestEntries>
<Implementation-Version>0.13.0.0</Implementation-Version>
<Implementation-Version>${project.version}</Implementation-Version>
z7658329 marked this conversation as resolved.
Show resolved Hide resolved
</manifestEntries>
</archive>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion hugegraph-core/src/main/java/org/apache/hugegraph/version/CoreVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ public class CoreVersion {
public static void check() {
// Check version of hugegraph-common
// TODO: why shall we check it? Update it if need
VersionUtil.check(CommonVersion.VERSION, "2.1.0", "2.2.0", CommonVersion.NAME);
VersionUtil.check(CommonVersion.VERSION, "1.0.0", "1.0.1", CommonVersion.NAME);
z7658329 marked this conversation as resolved.
Show resolved Hide resolved
}
}
7 changes: 7 additions & 0 deletions hugegraph-test/src/main/java/org/apache/hugegraph/unit/util/VersionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.apache.hugegraph.unit.util;

import org.apache.hugegraph.version.ApiVersion;
import org.junit.Test;

import org.apache.hugegraph.testutil.Assert;
Expand All @@ -41,4 +42,10 @@ public void testCoreVersionCheck() {
// Expect not throw exception
CoreVersion.check();
}

@Test
public void testApiVersionCheck() {
// Expect not throw exception
ApiVersion.check();
}
}