This is an automated email from the ASF dual-hosted git repository.
piergiorgio pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/manifoldcf.git
The following commit(s) were added to refs/heads/trunk by this push:
new 901ad2ac2 HSQL updated to version 2.6.1, fix for create release github
workflow (CONNECTORS-1768)
901ad2ac2 is described below
commit 901ad2ac25c810b0b48acad7ea57bb01aeb0a9ec
Author: Piergiorgio Lucidi <[email protected]>
AuthorDate: Mon Dec 16 14:57:21 2024 +0100
HSQL updated to version 2.6.1, fix for create release github workflow
(CONNECTORS-1768)
---
.github/workflows/create-release-candidate.yml | 29 +++++++++++++-------------
CHANGES.txt | 6 ++++++
build.xml | 2 +-
pom.xml | 2 +-
4 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/create-release-candidate.yml
b/.github/workflows/create-release-candidate.yml
index 5c3d2ca70..d0c329785 100644
--- a/.github/workflows/create-release-candidate.yml
+++ b/.github/workflows/create-release-candidate.yml
@@ -36,10 +36,10 @@ jobs:
run: echo "Starting Apache ManifoldCF workflow for building ${{
github.event.inputs.releasecandidatetag }}"
- name: Checkout
- uses: actions/[email protected]
+ uses: actions/[email protected]
- name: Set up OpenJDK 11 Temurin x64
- uses: actions/[email protected]
+ uses: actions/[email protected]
with:
java-version: '11'
distribution: 'temurin'
@@ -70,7 +70,8 @@ jobs:
- name: Create Release Version
id: releaseVersion
run: |
- releaseVersion=${branchVersion%"-"}
+ branchVersionOutput=${{ steps.branchVersion.outputs.version }}
+ releaseVersion=${branchVersionOutput%"-"}
echo "version=${releaseVersion}" >> $GITHUB_OUTPUT
- name: Set Branch Tag output
@@ -144,7 +145,7 @@ jobs:
cp CHANGES.txt apache-manifoldcf-${{
steps.artifactVersion.outputs.version }}.CHANGES.txt
- name: Upload artifacts - KEYS - text format
- uses: actions/[email protected]
+ uses: actions/[email protected]
with:
name: apache-manifoldcf-${{ steps.artifactVersion.outputs.version
}}.KEYS
path: apache-manifoldcf-${{ steps.artifactVersion.outputs.version
}}.KEYS
@@ -160,7 +161,7 @@ jobs:
asset_content_type: text/plain
- name: Upload artifacts - CHANGES
- uses: actions/[email protected]
+ uses: actions/[email protected]
with:
name: apache-manifoldcf-${{ steps.artifactVersion.outputs.version
}}.CHANGES.txt
path: apache-manifoldcf-${{ steps.artifactVersion.outputs.version
}}.CHANGES.txt
@@ -176,7 +177,7 @@ jobs:
asset_content_type: text/plain
- name: Upload artifacts - Binary - zip format
- uses: actions/[email protected]
+ uses: actions/[email protected]
with:
name: apache-manifoldcf-${{ steps.artifactVersion.outputs.version
}}-bin.zip
path: apache-manifoldcf-${{ steps.artifactVersion.outputs.version
}}-bin.zip
@@ -192,7 +193,7 @@ jobs:
asset_content_type: application/zip
- name: Upload artifacts - Binary - tar.gz format
- uses: actions/[email protected]
+ uses: actions/[email protected]
with:
name: apache-manifoldcf-${{ steps.artifactVersion.outputs.version
}}-bin.tar.gz
path: apache-manifoldcf-${{ steps.artifactVersion.outputs.version
}}-bin.tar.gz
@@ -208,7 +209,7 @@ jobs:
asset_content_type: application/gzip
- name: Upload artifacts - Lib - tar.gz format
- uses: actions/[email protected]
+ uses: actions/[email protected]
with:
name: apache-manifoldcf-${{ steps.artifactVersion.outputs.version
}}-lib.tar.gz
path: apache-manifoldcf-${{ steps.artifactVersion.outputs.version
}}-lib.tar.gz
@@ -224,7 +225,7 @@ jobs:
asset_content_type: application/gzip
- name: Upload artifacts - Lib - zip format
- uses: actions/[email protected]
+ uses: actions/[email protected]
with:
name: apache-manifoldcf-${{ steps.artifactVersion.outputs.version
}}-lib.zip
path: apache-manifoldcf-${{ steps.artifactVersion.outputs.version
}}-lib.zip
@@ -240,7 +241,7 @@ jobs:
asset_content_type: application/zip
- name: Upload artifacts - Source code - tar.gz format
- uses: actions/[email protected]
+ uses: actions/[email protected]
with:
name: apache-manifoldcf-${{ steps.artifactVersion.outputs.version
}}-src.tar.gz
path: apache-manifoldcf-${{ steps.artifactVersion.outputs.version
}}-src.tar.gz
@@ -256,7 +257,7 @@ jobs:
asset_content_type: application/gzip
- name: Upload artifacts - Source code - zip format
- uses: actions/[email protected]
+ uses: actions/[email protected]
with:
name: apache-manifoldcf-${{ steps.artifactVersion.outputs.version
}}-src.zip
path: apache-manifoldcf-${{ steps.artifactVersion.outputs.version
}}-src.zip
@@ -275,7 +276,7 @@ jobs:
uses: docker/[email protected]
- name: Set up Docker Buildx
- uses: docker/[email protected]
+ uses: docker/[email protected]
- name: Login to Docker Hub
uses: docker/[email protected]
@@ -285,7 +286,7 @@ jobs:
- name: Docker meta
id: meta
- uses: docker/[email protected]
+ uses: docker/[email protected]
with:
images: apache/manifoldcf
labels: |
@@ -305,7 +306,7 @@ jobs:
run: sed -i 's/SNAPSHOT/${{ github.event.inputs.releasecandidatetag
}}/g' Dockerfile;
- name: Build and push ManifoldCF Docker Image
- uses: docker/[email protected]
+ uses: docker/[email protected]
with:
context: .
file: Dockerfile
diff --git a/CHANGES.txt b/CHANGES.txt
index 281456fa4..97684e47a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -29,6 +29,12 @@ CONNECTORS-1758: Google drive api upgrade
CONNECTORS-1759: A new generic authority connector for JSON data exchange
format
(Guylaine Bassett)
+CONNECTORS-1105: Add maven delivery targets to poms
+(Karl Wright, Markus Schuch, Maurizio Pillitu, Piergiorgio Lucidi)
+
+CONNECTORS-1767: Update the documentation adding the New Generic Authority
Connector
+(Piergiorgio Lucidi, Guylaine Bassett)
+
======================= Release 2.27 =====================
CONNECTORS-1755: Copyright footer must be updated
diff --git a/build.xml b/build.xml
index f98a36762..81abec611 100644
--- a/build.xml
+++ b/build.xml
@@ -30,7 +30,7 @@
<defaultexcludes add="**/.idea/**"/>
<property name="javax-activation.version" value="1.2.0"/>
- <property name="hsqldb.version" value="2.3.2"/>
+ <property name="hsqldb.version" value="2.6.1"/>
<property name="jetty.version" value="9.4.48.v20220622"/>
<property name="httpclient.version" value="4.5.13"/>
<property name="httpmime.version" value="4.5.13"/>
diff --git a/pom.xml b/pom.xml
index 4f7531702..3f7fa4213 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<wiremock.version>2.5.1</wiremock.version>
<postgresql.version>42.7.4</postgresql.version>
<mysql.version>5.1.47</mysql.version>
- <hsqldb.version>2.3.2</hsqldb.version>
+ <hsqldb.version>2.6.1</hsqldb.version>
<jetty.version>9.4.48.v20220622</jetty.version>
<jetty-jsp-jdt.version>2.3.3</jetty-jsp-jdt.version>
<jetty-schemas.version>3.1.M0</jetty-schemas.version>
