Skip to content

Commit

Permalink
Merge pull request #393 from the-qa-company/master
Browse files Browse the repository at this point in the history
Sync master into dev
  • Loading branch information
ate47 authored Aug 17, 2023
2 parents 0c700fc + 8e239ec commit 42d3aa6
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 38 deletions.
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>1.13.1</version>
<version>1.13.2</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>1.13.1</version>
<version>1.13.2</version>

<packaging>jar</packaging>

Expand All @@ -15,7 +15,7 @@
<parent>
<groupId>com.the-qa-company</groupId>
<artifactId>qendpoint-parent</artifactId>
<version>1.13.1</version>
<version>1.13.2</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>1.13.1</version>
<version>1.13.2</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>1.13.1</version>
<version>1.13.2</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>1.13.1</version>
<version>1.13.2</version>

<packaging>jar</packaging>

Expand All @@ -29,7 +29,7 @@
<artifactId>
qendpoint-parent
</artifactId>
<version>1.13.1</version>
<version>1.13.2</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>1.13.1</version>
<version>1.13.2</version>

<packaging>jar</packaging>

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

<licenses>
Expand Down
4 changes: 2 additions & 2 deletions release/RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
- Multi Section Dictionary Lang (#378)
- fix FTS index (#387)
- Dump dataset while running the endpoint (#391)
- Fix new architecture to handle SPARQL (#336)
5 changes: 5 additions & 0 deletions release/RELEASE.md_old
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## Version 1.13.1

- Multi Section Dictionary Lang (#378)
- fix FTS index (#387)

## Version 1.13.0

- update RDF4J to 4.3.2 (#379)
Expand Down
58 changes: 31 additions & 27 deletions scripts/set_version.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
param(
$Version,
[switch]
$Edit
$Edit,
[switch]
$NoReleaseUpdate
)

$prevPwd = $PWD
Expand Down Expand Up @@ -47,45 +49,47 @@ try {

Write-Host "new version: $NewVersion"

New-Item -Type File release/RELEASE.md_old -ErrorAction Ignore > $null
Remove-Item release/RELEASE.md_old_backupsv -ErrorAction Ignore > $null
Move-Item release/RELEASE.md_old release/RELEASE.md_old_backupsv
if (!$NoReleaseUpdate) {
New-Item -Type File release/RELEASE.md_old -ErrorAction Ignore > $null
Remove-Item release/RELEASE.md_old_backupsv -ErrorAction Ignore > $null
Move-Item release/RELEASE.md_old release/RELEASE.md_old_backupsv

# Write new lines
# Write new lines

"## Version $OldVersion
" > release/RELEASE.md_old
"## Version $OldVersion
" > release/RELEASE.md_old

gc release/RELEASE.md >> release/RELEASE.md_old
gc release/RELEASE.md >> release/RELEASE.md_old

# Write old lines
# Write old lines

gc release/RELEASE.md_old_backupsv >> release/RELEASE.md_old
gc release/RELEASE.md_old_backupsv >> release/RELEASE.md_old

Remove-Item release/RELEASE.md_backupsv -ErrorAction Ignore > $null
Move-Item release/RELEASE.md release/RELEASE.md_backupsv
Remove-Item release/RELEASE.md_backupsv -ErrorAction Ignore > $null
Move-Item release/RELEASE.md release/RELEASE.md_backupsv

Remove-Item -Force release/RELEASE.md -ErrorAction Ignore > $null
Remove-Item -Force release/RELEASE.md -ErrorAction Ignore > $null

Write-Host "Open release file"
Write-Host "Open release file"

vim release/RELEASE.md
vim release/RELEASE.md

if (!(Test-Path "release/RELEASE.md")) {
Write-Error "no release file created, abort"
Remove-Item release/RELEASE.md -ErrorAction Ignore > $null
Remove-Item release/RELEASE.md_old -ErrorAction Ignore > $null
Move-Item release/RELEASE.md_backupsv release/RELEASE.md
Move-Item release/RELEASE.md_old_backupsv release/RELEASE.md_old
mvn versions:set versions:commit -DnewVersion="$OldVersion" -q
exit -1
}
if (!(Test-Path "release/RELEASE.md")) {
Write-Error "no release file created, abort"
Remove-Item release/RELEASE.md -ErrorAction Ignore > $null
Remove-Item release/RELEASE.md_old -ErrorAction Ignore > $null
Move-Item release/RELEASE.md_backupsv release/RELEASE.md
Move-Item release/RELEASE.md_old_backupsv release/RELEASE.md_old
mvn versions:set versions:commit -DnewVersion="$OldVersion" -q
exit -1
}

Write-Host "Remove backup files"
Write-Host "Remove backup files"

Remove-Item -Force release/RELEASE.md_backupsv -ErrorAction Ignore > $null
Remove-Item -Force release/RELEASE.md_old_backupsv -ErrorAction Ignore > $null
}
Remove-Item -Force pom.xml_backupsv -ErrorAction Ignore > $null
Remove-Item -Force release/RELEASE.md_backupsv -ErrorAction Ignore > $null
Remove-Item -Force release/RELEASE.md_old_backupsv -ErrorAction Ignore > $null
} finally {
$prevPwd | Set-Location
}

0 comments on commit 42d3aa6

Please sign in to comment.