Skip to content
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

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

Merged
merged 10 commits into from
Aug 14, 2024
Merged
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
40 changes: 38 additions & 2 deletions .github/workflows/build-p2-site.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
33 changes: 0 additions & 33 deletions .gitlab-ci.yml

This file was deleted.

50 changes: 0 additions & 50 deletions .travis.yml

This file was deleted.

28 changes: 0 additions & 28 deletions bundles/at.medevit.logback.pushnotification/.project

This file was deleted.

2 changes: 1 addition & 1 deletion bundles/es.core.common/.classpath
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
6 changes: 3 additions & 3 deletions bundles/es.core.common/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions bundles/es.core.common/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bundles/es.core.connector.elexis/.classpath
Original file line number Diff line number Diff line change
@@ -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"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -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
14 changes: 7 additions & 7 deletions bundles/es.core.connector.elexis/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
22 changes: 0 additions & 22 deletions bundles/es.core.jetty.homebundle/.project

This file was deleted.

8 changes: 0 additions & 8 deletions bundles/es.core.jetty.homebundle/META-INF/MANIFEST.MF

This file was deleted.

14 changes: 0 additions & 14 deletions bundles/es.core.jetty.homebundle/README.md

This file was deleted.

2 changes: 0 additions & 2 deletions bundles/es.core.jetty.homebundle/build.properties

This file was deleted.

25 changes: 0 additions & 25 deletions bundles/es.core.jetty.homebundle/jettyhome/etc/jetty-deploy.xml

This file was deleted.

41 changes: 0 additions & 41 deletions bundles/es.core.jetty.homebundle/jettyhome/etc/jetty-http.xml

This file was deleted.

Loading
Loading