Skip to content

Sync master into dev #577

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

Open
wants to merge 8 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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
20 changes: 10 additions & 10 deletions .github/workflows/package-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ jobs:
- name: move endpoint
run: mv qendpoint-backend/target/qendpoint-*-exec.jar qendpoint.jar
- name: Deploy jar
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "qendpoint.jar"
path: "qendpoint.jar"
- name: move cli
run: mv qendpoint-cli/target/qendpoint-cli-*-distribution.zip qendpoint-cli.zip
- name: Deploy CLI zip
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "qendpoint-cli.zip"
path: "qendpoint-cli.zip"
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
distribution: 'microsoft'
java-version: 17
- name: Download qendpoint jar
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: "qendpoint.jar"
- name: Create Icon
Expand All @@ -135,7 +135,7 @@ jobs:

run: scripts/build_package_osx.sh qendpoint.jar
- name: Upload dmg
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "qendpoint.dmg"
path: "qendpoint.dmg"
Expand All @@ -152,15 +152,15 @@ jobs:
distribution: 'microsoft'
java-version: 17
- name: Download endpoint jar
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: "qendpoint.jar"
- name: Package jar as msi installer
run: |
scripts/build_package.ps1 scripts/jpackage_windows.cfg qendpoint.jar
mv scripts/build/distributions/*.msi qendpoint.msi
- name: Upload installer
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "qendpoint.msi"
path: "qendpoint.msi"
Expand All @@ -177,15 +177,15 @@ jobs:
distribution: 'microsoft'
java-version: 17
- name: Download endpoint jar
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: "qendpoint.jar"
- name: Package jar as deb installer
run: |
scripts/build_package.sh scripts/jpackage_linux.cfg qendpoint.jar
mv scripts/build/distributions/*.deb qendpoint.deb
- name: Upload installer
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "qendpoint.deb"
path: "qendpoint.deb"
Expand All @@ -202,7 +202,7 @@ jobs:
- name: Check out the repo
uses: actions/checkout@v3
- name: Download qendpoint jar
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: "qendpoint.jar"
- name: Move endpoint
Expand Down Expand Up @@ -282,7 +282,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
- name: Extract artifacts
run: |
mkdir -p deploy_file
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/sync-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,4 @@ jobs:
pr_title: "Sync master into dev"
pr_body: "Sync master into dev."
pr_label: "sync"
pr_assignee: "ate47"
github_token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion pom.xml
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.4.1</version>
<version>2.5.0</version>

<packaging>pom</packaging>

Expand Down
4 changes: 2 additions & 2 deletions qendpoint-backend/pom.xml
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.4.1</version>
<version>2.5.0</version>

<packaging>jar</packaging>

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

<licenses>
Expand Down
4 changes: 2 additions & 2 deletions qendpoint-cli/pom.xml
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.4.1</version>
<version>2.5.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.4.1</version>
<version>2.5.0</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions qendpoint-core/pom.xml
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.4.1</version>
<version>2.5.0</version>

<packaging>jar</packaging>

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

<licenses>
Expand Down
4 changes: 2 additions & 2 deletions qendpoint-store/pom.xml
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.4.1</version>
<version>2.5.0</version>

<packaging>jar</packaging>

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

<licenses>
Expand Down
4 changes: 3 additions & 1 deletion release/RELEASE.md
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
- fix multi-index merge (#560)
- Reuse permutation for other indexes generation (#589)
- Better compression of intermediate graph (#541)
- Fix dump copy call (#583)
6 changes: 6 additions & 0 deletions release/RELEASE.md_old
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## Version 2.4.2

- fix computation issue (#573)
## Version 2.4.1

- fix multi-index merge (#560)
## Version 2.4.0

- show lucene indexes names when loading (#537)
Expand Down
2 changes: 1 addition & 1 deletion scripts/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM maven:3.8.5-openjdk-17-slim AS build-backend
FROM maven:3.9.9-amazoncorretto-23-debian-bookworm AS build-backend

WORKDIR /app

Expand Down