Merge branch 'apache:master' into DIRSTUDIO-1317-Improve-CI
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0c1ae00..2ae3d40 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -39,11 +39,11 @@
steps:
- name: Checkout repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@v2
+ uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -68,4 +68,4 @@
mvn clean install
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v2
+ uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml
index fa01159..a60b7fc 100644
--- a/.github/workflows/pull-request-build.yml
+++ b/.github/workflows/pull-request-build.yml
@@ -30,7 +30,7 @@
pull-requests: read
timeout-minutes: 130
steps:
- - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+ - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
- name: Set up JDK 11
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
with:
diff --git a/Jenkinsfile b/Jenkinsfile
index 40dd12a..036182f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -135,7 +135,7 @@
def inTestLab(String dockerImageTag, Closure action){
docker.image('coheigea/kerby').withRun('-h kerby.example.com -v $(pwd)/tools/testlab/kerby-data:/kerby-data') { kerby ->
docker.image('osixia/openldap:1.5.0').withRun('-h openldap.example.com -v $(pwd)/tools/testlab/ldap.keytab:/etc/krb5.keytab -v $(pwd)/tools/testlab/krb5.conf:/etc/krb5.conf -e LDAP_TLS_VERIFY_CLIENT=never') { openldap ->
- docker.image('389ds/dirsrv').withRun('-h fedora389ds.example.com -v $(pwd)/tools/testlab/ldap.keytab:/etc/krb5.keytab -v $(pwd)/tools/testlab/krb5.conf:/etc/krb5.conf -e DS_DM_PASSWORD=admin', 'bash -c "zypper install -y cyrus-sasl-crammd5 cyrus-sasl-digestmd5 cyrus-sasl-gssapi; set -m; /usr/lib/dirsrv/dscontainer -r & while ! /usr/lib/dirsrv/dscontainer -H; do sleep 5; done; sleep 5; /usr/sbin/dsconf localhost backend create --suffix dc=example,dc=org --be-name example; fg"') { fedora389ds ->
+ docker.image('389ds/dirsrv:2.2').withRun('-h fedora389ds.example.com -v $(pwd)/tools/testlab/ldap.keytab:/etc/krb5.keytab -v $(pwd)/tools/testlab/krb5.conf:/etc/krb5.conf -e DS_DM_PASSWORD=admin', 'bash -c "zypper install -y cyrus-sasl-crammd5 cyrus-sasl-digestmd5 cyrus-sasl-gssapi; set -m; /usr/lib/dirsrv/dscontainer -r & while ! /usr/lib/dirsrv/dscontainer -H; do sleep 5; done; sleep 5; /usr/sbin/dsconf localhost backend create --suffix dc=example,dc=org --be-name example; fg"') { fedora389ds ->
docker.image("apachedirectory/maven-build:${dockerImageTag}").inside("-v ${env.WORKSPACE}/tools/testlab/krb5.conf:/etc/krb5.conf --link=${kerby.id}:kerby.example.com --link=${openldap.id}:openldap.example.com -e OPENLDAP_HOST=openldap.example.com -e OPENLDAP_PORT=389 -e OPENLDAP_PORT_SSL=636 --link=${fedora389ds.id}:fedora389ds.example.com -e FEDORA_389DS_HOST=fedora389ds.example.com -e FEDORA_389DS_PORT=3389 -e FEDORA_389DS_PORT_SSL=3636") {
action()
}
diff --git a/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template b/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
index 842990d..c6251b1 100644
--- a/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
+++ b/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
@@ -111,17 +111,17 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.rcp.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.platform.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.pde.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
- <repository location="https://download.eclipse.org/eclipse/updates/4.22/R-4.22-202111241800"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.24.0.v20220607-0700"/>
+ <unit id="org.eclipse.rcp.source.feature.group" version="4.24.0.v20220607-0700"/>
+ <unit id="org.eclipse.platform.feature.group" version="4.24.0.v20220607-0700"/>
+ <unit id="org.eclipse.platform.source.feature.group" version="4.24.0.v20220607-0700"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.18.1200.v20220607-0700"/>
+ <unit id="org.eclipse.jdt.source.feature.group" version="3.18.1200.v20220607-0700"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.14.1200.v20220607-0700"/>
+ <unit id="org.eclipse.pde.source.feature.group" version="3.14.1200.v20220607-0700"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.4.1600.v20220518-1326"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1700.v20220509-0833"/>
+ <repository location="https://download.eclipse.org/eclipse/updates/4.24"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/helps/pom.xml b/helps/pom.xml
index af159cd..353ad0c 100644
--- a/helps/pom.xml
+++ b/helps/pom.xml
@@ -174,7 +174,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
- <version>2.6</version>
+ <version>2.9</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/installers/pom.xml b/installers/pom.xml
index 76e35da..d29abc6 100644
--- a/installers/pom.xml
+++ b/installers/pom.xml
@@ -54,7 +54,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.5.0</version>
+ <version>3.1.1</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/pom.xml b/pom.xml
index 0992602..f344084 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.directory.project</groupId>
<artifactId>project</artifactId>
- <version>45</version>
+ <version>48</version>
<relativePath />
</parent>
@@ -74,8 +74,8 @@
<!-- Set versions for dependencies -->
<antlr.version>2.7.7</antlr.version>
<antlr.bundleversion>2.7.7</antlr.bundleversion>
- <junit.platform.version>1.7.1</junit.platform.version>
- <junit.jupiter.version>5.7.1</junit.jupiter.version>
+ <junit.platform.version>1.10.2</junit.platform.version>
+ <junit.jupiter.version>5.10.2</junit.jupiter.version>
<log4j.log4j.version>1.2.17</log4j.log4j.version>
<log4j.log4j.bundleversion>1.2.17</log4j.log4j.bundleversion>
<com.github.ben-manes.caffeine.version>2.7.0</com.github.ben-manes.caffeine.version>
@@ -103,7 +103,7 @@
<org.apache.mina.bundleversion>2.1.3</org.apache.mina.bundleversion>
<org.apache.poi.version>3.9</org.apache.poi.version>
<org.apache.poi.bundleversion>3.9.0</org.apache.poi.bundleversion>
- <org.apache.xmlgraphics.fop.version>2.2</org.apache.xmlgraphics.fop.version>
+ <org.apache.xmlgraphics.fop.version>2.9</org.apache.xmlgraphics.fop.version>
<org.bouncycastle.version>1.62</org.bouncycastle.version>
<org.slf4j.version>1.7.25</org.slf4j.version>
<org.slf4j.bundleversion>1.7.25</org.slf4j.bundleversion>
@@ -235,7 +235,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-regexp</artifactId>
- <version>1.7.1</version>
+ <version>1.10.14</version>
<scope>compile</scope>
</dependency>
