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

Sync master into dev #484

Merged
merged 2 commits into from
Oct 11, 2024
Merged

Sync master into dev #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
511d5d2
prepare for release 2.1.0
ate47 Oct 2, 2024
74d99cc
GH-482 fix autoindexer
ate47 Oct 8, 2024
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 pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<groupId>com.the-qa-company</groupId>
<artifactId>qendpoint-parent</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>

<packaging>pom</packaging>

Expand Down
4 changes: 2 additions & 2 deletions qendpoint-backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
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>
<artifactId>qendpoint-backend</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>

<packaging>jar</packaging>

Expand All @@ -15,7 +15,7 @@
<parent>
<groupId>com.the-qa-company</groupId>
<artifactId>qendpoint-parent</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>
</parent>

<licenses>
Expand Down
4 changes: 2 additions & 2 deletions qendpoint-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>qendpoint-cli</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>

<name>qendpoint package</name>
<description>Package of the qendpoint.</description>
Expand All @@ -11,7 +11,7 @@
<parent>
<groupId>com.the-qa-company</groupId>
<artifactId>qendpoint-parent</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions qendpoint-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
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>
<artifactId>qendpoint-core</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>

<packaging>jar</packaging>

Expand All @@ -27,7 +27,7 @@
<parent>
<groupId>com.the-qa-company</groupId>
<artifactId>qendpoint-parent</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>
</parent>

<licenses>
Expand Down
9 changes: 7 additions & 2 deletions qendpoint-core/src/main/java/com/the_qa_company/qendpoint/core/tools/HDTAutoIndexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.the_qa_company.qendpoint.core.util.StopWatch;
import com.the_qa_company.qendpoint.core.util.io.IOUtil;
import com.the_qa_company.qendpoint.core.util.listener.ColorTool;
import com.the_qa_company.qendpoint.core.util.listener.MultiThreadListenerConsole;

import java.io.IOException;
import java.net.URI;
Expand Down Expand Up @@ -71,8 +72,10 @@ public void execute() throws IOException, InterruptedException {
}

boolean one = !IOUtil.isRemoteURL(path) && cfg.getBoolean(HDTOptionsKeys.AUTOINDEXER_RUN_ONLY_REMOTE, true);
colorTool.warn("The path is local, only one iteration will be performed, use "
+ HDTOptionsKeys.AUTOINDEXER_RUN_ONLY_REMOTE + "=false to index it");
if (one) {
colorTool.warn("The path is local, only one iteration will be performed, use "
+ HDTOptionsKeys.AUTOINDEXER_RUN_ONLY_REMOTE + "=false to index it");
}

HDTOptions spec = cfg.pushBottom();
Path outTmpDir = output.resolve("tmp_output");
Expand All @@ -92,6 +95,8 @@ public void execute() throws IOException, InterruptedException {
Path endIndex = output.resolve(hdtName);
Path tmpIndex = outTmpDir.resolve(hdtName);
Files.createDirectories(output);
MultiThreadListenerConsole console = !quiet ? new MultiThreadListenerConsole(color) : null;
colorTool.setConsole(console);

long currentId = 0;
while (true) {
Expand Down
4 changes: 2 additions & 2 deletions qendpoint-store/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
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>
<artifactId>qendpoint</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>

<packaging>jar</packaging>

Expand All @@ -13,7 +13,7 @@
<parent>
<groupId>com.the-qa-company</groupId>
<artifactId>qendpoint-parent</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>
</parent>

<licenses>
Expand Down
4 changes: 3 additions & 1 deletion release/RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
- deploy fixes
- add indexhdtrepo command (#482)
- allow predownload file (#480)

3 changes: 3 additions & 0 deletions release/RELEASE.md_old
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## Version 2.0.1

- deploy fixes
## Version 2.0.0

- reimplement #470 (#477)
Expand Down
Loading