[26388] Prepare for 3.13 and target 2023-09-java21 (#37)

elexis · Aug 14, 2024 · a905796 · a905796
1 parent b48f604
commit a905796
Show file tree

Hide file tree

Showing 81 changed files with 343 additions and 2,484 deletions.
diff --git a/.github/workflows/build-p2-site.yaml b/.github/workflows/build-p2-site.yaml
@@ -1,20 +1,56 @@
 name: Build P2 Site
 
 env:
-  TARGET: '2023-09-java17'
+  TARGET: '2023-09-java21'
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   DEPLOY_SECRET: ${{ secrets.SSH_PRIVATE_KEY_ED25519_BASE64 }}
-
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
 on:
   push:
   workflow_dispatch:
 
 jobs:
   build:
     runs-on: [self-hosted, Linux, x64, Docker]
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
     steps:
       - uses: actions/checkout@v4
       - name: pull docker image docker-build:${{ env.TARGET }}
         run: docker pull ghcr.io/elexis/docker-build:${{ env.TARGET }}
       - name: build using docker image docker-build:${{ env.TARGET }}
         run: docker run --rm --init -v "$(pwd)":/usr/src/mymaven -v "$(eval echo ~$USER)/m2-${{ env.BRANCH_NAME }}":/root/.m2 -w /usr/src/mymaven ghcr.io/elexis/docker-build:${{ env.TARGET }} mvn -f releng/es.parent/pom.xml clean verify -Delexis.branch=${{ env.BRANCH_NAME }}
+
+      - name: upload artifacts
+        run: |
+          eval $(ssh-agent -s)
+          ssh-add <(echo "${{ env.DEPLOY_SECRET }}" | base64 -d)
+          rsync -aiv --delete --mkpath -e ssh products/es.updatesite/target/repository/ [email protected]:download.elexis.info/elexis-server/${{ env.BRANCH_NAME }}/p2/elexis-server/
+          rsync -aiv --no-recursive -e ssh products/es.core.product.runtime/target/products/* [email protected]:download.elexis.info/elexis-server/${{ env.BRANCH_NAME }}/products/
+          eval $(ssh-agent -k)
+          
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+      - name: Build and push Docker image
+        id: push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          pull: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/bundles/at.medevit.logback.pushnotification/.project b/bundles/at.medevit.logback.pushnotification/.project
diff --git a/bundles/es.core.common/.classpath b/bundles/es.core.common/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/bundles/es.core.common/.settings/org.eclipse.jdt.core.prefs b/bundles/es.core.common/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=21
diff --git a/bundles/es.core.common/META-INF/MANIFEST.MF b/bundles/es.core.common/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Elexis Server Core Common
 Bundle-SymbolicName: info.elexis.server.core.common
-Bundle-Version: 3.12.0.qualifier
+Bundle-Version: 3.13.0.qualifier
 Bundle-Vendor: elexis.info
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Import-Package: org.slf4j
 Export-Package: info.elexis.server.core.common,
  info.elexis.server.core.common.util

diff --git a/bundles/es.core.connector.elexis/.classpath b/bundles/es.core.connector.elexis/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>

diff --git a/bundles/es.core.connector.elexis/.settings/org.eclipse.jdt.core.prefs b/bundles/es.core.connector.elexis/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/bundles/es.core.connector.elexis/META-INF/MANIFEST.MF b/bundles/es.core.connector.elexis/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Elexis
 Bundle-SymbolicName: info.elexis.server.core.connector.elexis
-Bundle-Version: 3.12.0.qualifier
+Bundle-Version: 3.13.0.qualifier
 Bundle-Vendor: elexis.info
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Multi-Release: true
 Service-Component: OSGI-INF/*.xml
 Bundle-ActivationPolicy: lazy
@@ -22,10 +22,10 @@ Export-Package: info.elexis.server.core.connector.elexis,
  info.elexis.server.core.connector.elexis.common,
  info.elexis.server.core.connector.elexis.locking
 Bundle-Activator: info.elexis.server.core.connector.elexis.internal.Activator
-Require-Bundle: info.elexis.server.core.common;bundle-version="3.12.0",
- info.elexis.server.core;bundle-version="3.12.0",
- ch.rgw.utility;bundle-version="3.12.0",
- ch.elexis.core;bundle-version="3.12.0",
- ch.elexis.core.services;bundle-version="3.12.0",
+Require-Bundle: info.elexis.server.core.common;bundle-version="3.13.0",
+ info.elexis.server.core;bundle-version="3.13.0",
+ ch.rgw.utility;bundle-version="3.13.0",
+ ch.elexis.core;bundle-version="3.13.0",
+ ch.elexis.core.services;bundle-version="3.13.0",
  com.mysql.cj;bundle-version="8.0.22",
  info.elexis.jaxrs.service;bundle-version="3.12.0"
diff --git a/bundles/es.core.jetty.homebundle/.project b/bundles/es.core.jetty.homebundle/.project
diff --git a/bundles/es.core.jetty.homebundle/META-INF/MANIFEST.MF b/bundles/es.core.jetty.homebundle/META-INF/MANIFEST.MF
diff --git a/bundles/es.core.jetty.homebundle/README.md b/bundles/es.core.jetty.homebundle/README.md
diff --git a/bundles/es.core.jetty.homebundle/build.properties b/bundles/es.core.jetty.homebundle/build.properties
diff --git a/bundles/es.core.jetty.homebundle/jettyhome/etc/jetty-deploy.xml b/bundles/es.core.jetty.homebundle/jettyhome/etc/jetty-deploy.xml
diff --git a/bundles/es.core.jetty.homebundle/jettyhome/etc/jetty-http.xml b/bundles/es.core.jetty.homebundle/jettyhome/etc/jetty-http.xml