diff --git a/.github/workflows/build-p2-site.yaml b/.github/workflows/build-p2-site.yaml index 998a4f3f..7ddec09e 100644 --- a/.github/workflows/build-p2-site.yaml +++ b/.github/workflows/build-p2-site.yaml @@ -1,10 +1,12 @@ 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: @@ -12,9 +14,43 @@ on: 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/ deploy@download.medelexis.ch:download.elexis.info/elexis-server/${{ env.BRANCH_NAME }}/p2/elexis-server/ + rsync -aiv --no-recursive -e ssh products/es.core.product.runtime/target/products/* deploy@download.medelexis.ch: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 }} \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index bf3e49ee..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,33 +0,0 @@ -# Build script used by gitlab.medelexis.ch -variables: - ORIGIN_BRANCH: "master" - TARGET: "2023-09-java17" - DOCKER_BUILD_IMAGE: "gitlab.medelexis.ch:4567/elexis/docker-build:${TARGET}" - -build: - stage: build - tags: - - docker-host - script: - - find features -type f -name p2.inf -exec sed -i "s@REPLACE_WITH_GIT_REV@$CI_COMMIT_SHA@g" {} \; - - find features -type f -name p2.inf -exec sed -i "s|REPLACE_WITH_GIT_REPO_URL|$CI_PROJECT_URL|g" {} \; - - docker pull gitlab.medelexis.ch:4567/elexis/docker-build:${TARGET} - - docker run --rm --init -v "$(pwd)":/usr/src/mymaven -v "/home/maven/m2-$CI_COMMIT_REF_NAME":/root/.m2 -w /usr/src/mymaven ${DOCKER_BUILD_IMAGE} mvn -f releng/es.parent/pom.xml clean verify -Delexis.branch=$CI_COMMIT_REF_NAME -P sonar -Dsonar.login=$SONAR_LOGIN_TOKEN - - eval $(ssh-agent -s) - - ssh-add <(echo "$SSH_PRIVATE_KEY_ED25519_BASE64" | base64 -d) - - rsync -aiv --delete --mkpath -e ssh products/es.updatesite/target/repository/ deploy@download.medelexis.ch:download.elexis.info/elexis-server/$CI_COMMIT_REF_NAME/p2/elexis-server/ - - rsync -aiv --no-recursive -e ssh products/es.core.product.runtime/target/products/* deploy@download.medelexis.ch:download.elexis.info/elexis-server/$CI_COMMIT_REF_NAME/products/ - - eval $(ssh-agent -k) - artifacts: - reports: - junit: - - tests/**/target/surefire-reports/TEST-*.xml -build_container: - stage: deploy - tags: - - docker-host - script: - - docker pull eclipse-temurin:21-jre-alpine - - docker build --no-cache --build-arg BRANCH=$CI_COMMIT_REF_NAME -t medevit/elexis-server:$CI_COMMIT_REF_NAME . - - docker push medevit/elexis-server:$CI_COMMIT_REF_NAME - - docker rmi medevit/elexis-server:$CI_COMMIT_REF_NAME diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index fe03fdaf..00000000 --- a/.travis.yml +++ /dev/null @@ -1,50 +0,0 @@ -language: java - -jdk: -- oraclejdk8 - -env: -- secure: "F26OErGQyK2ITOmAxxNiopSDfdAicRltiANRhgHVFsZGabWO6RDYM4iO0x+IFW7ViOuxK1TP2gpOliQO9a0epAsemyonjNIowsSSRZkfGoQN9FxRU3F/w4/+8toUXWdCDFaPUEbXhR3n3BGv0FA/fyRRrNdtZurBCUEQTJzx5OvjkRmbcjlQjt45xmmc+sAYh6LnMjJhNClSqXcJ8qZK8ASMXDWxTKoEf6E7b2XnfIhWU8a2eSvT4wvzzZqo7+eh5ZhsWmwmU3oJ20iTtcV4sVqm6K9M3tAIy34ToiquoISdU4KX1tMHuQhfg/6hUt5AqO5dJI0YzXLfqgYwi6ZmqOQkE5oliRijEiNvqFHmE4qtbvhWeKqd9laG+olRK+51QXy3cNOelsm4vWi4bCT15HV+Dc8Ww1vBHcQEFZ+w6Onr6zIP/z9LNOizVPpVs5aIopCesdbLH6tM2QX07bFrUGl/sC2qyxoCQ97RnW4+Gi+oSfcpZ7AygPEqstf21eo0AFzgO/I2q1hW3OY14nz/WTRDGwmMBqdV2dbraS+b8XtWw9tJnH+hgj3xQSUg44EtP4rV2jli2N9AYJXfgo4shmza0iMNCvwg1gAm3FLE5S7X6URuz6yvCTqMRNLZitZMnragXl0yt26xuLb0DYHwolITMJ7tiNuZgDfOffgysp0=" - -cache: - directories: - - $HOME/.m2 - -before_install: -- sudo apt-get install -qq davix -- mvn -version -- wget http://apache.claz.org/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz -- tar zxvf apache-maven-3.3.9-bin.tar.gz -- chmod +x apache-maven-3.3.9/bin/mvn -- export M2_HOME=$PWD/apache-maven-3.3.9 -- export PATH=$PWD/apache-maven-3.3.9/bin:${PATH} -- hash -r - -before_script: -- export M2_HOME=$PWD/apache-maven-3.3.9 -- export PATH=$PWD/apache-maven-3.3.9/bin:${PATH} -- hash -r - -script: -- mvn -f releng/es.parent/pom.xml clean verify - -after_success: -- BINTRAY_PACKAGE=elexis-server -- BINTRAY_DESC=bintray.desc.files.json -- sed -i -e 's|$DATE|'$DATE'|g' $BINTRAY_DESC* -- sed -i -e 's|$BINTRAY_PACKAGE|'$BINTRAY_PACKAGE'|g' $BINTRAY_DESC -- sed -i -e 's|$VERSION|'$VERSION'|g' $BINTRAY_DESC -- sed -i -e 's|$TRAVIS_BRANCH|'$TRAVIS_BRANCH'|g' $BINTRAY_DESC -- sed -i -e 's|$TRAVIS_JOB_NUMBER|'$TRAVIS_JOB_NUMBER'|g' $BINTRAY_DESC -- sed -i -e 's|$TRAVIS_BUILD_ID|'$TRAVIS_BUILD_ID'|g' $BINTRAY_DESC -- sed -i -e 's|$TRAVIS_BUILD_NUMBER|'$TRAVIS_BUILD_NUMBER'|g' $BINTRAY_DESC -- sed -i -e 's|$TRAVIS_COMMIT|'$TRAVIS_COMMIT'|g' $BINTRAY_DESC -- cat $BINTRAY_DESC - -#deploy: -# provider: bintray -# file: bintray.desc.files.json -# user: col-panic -# on: release -# key: -# secure: gNADh0hdU1H9OzIBQJRVqqSRj8POqz90G/ujYopPZtwn7ieWydyI2EHG0huAB7E84qWVNZH9dxZkWhU2pydqztaXlZUYYhiroZM7tEq3+2vAWwN4mV7FICe8mPCaKALMg03XevDmbeE18VmqH3E1vYKFxy0eUd44YVx72HYoB1QXegGra6hl5LKyUDSsegz5auu5cjrBa8D4t/8BKJJETKjlLLL8gFkgYvZYrZku5zVEi+cf2xMTESMNhRZwkhGhtz4ogsBmNnij5n+jTgqKxXwxhlu1Zjx4ifAxRyitbxI+oMVhsJ+t2qICsdk6L4TjJGcalap4XTqroEyDX3mTd11zS+i+lE1AxlGTWSt67UQqacNgI8w9pan24Kkboqf9R5qEpWbNFzHvj7i1hDwuqK8y5I4Gf+VhLBMSLKvjnaCnjMtfoBa8ErhmONYgh25A6IRr1RGvSlOEqyx8flOvCh8j9uxLH+rHnhBCnVL0+rV9y//esOJXTTBuQPx6lBqwARMalfzSX3dzuFjE0vPBzroeu4rYepDbrfhdYeWeSFDhySkbdLLQb/yJYYRbPIMZy/TsVHUTnxTI/hf7E2zQSUt8VYPprF5I1DH0b9FZkY92MWmLfhiHt/O/dE5mqyoOidMP3redb3oquw7F17HJh2soJyZt95839TB0v+yOURo= diff --git a/bundles/at.medevit.logback.pushnotification/.project b/bundles/at.medevit.logback.pushnotification/.project deleted file mode 100644 index 5f3bb5ae..00000000 --- a/bundles/at.medevit.logback.pushnotification/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - at.medevit.logback.pushnotification - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/bundles/es.core.common/.classpath b/bundles/es.core.common/.classpath index 26c8452a..f62087d7 100644 --- a/bundles/es.core.common/.classpath +++ b/bundles/es.core.common/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/es.core.common/.settings/org.eclipse.jdt.core.prefs b/bundles/es.core.common/.settings/org.eclipse.jdt.core.prefs index e8c450c0..7cbe36f2 100644 --- 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 index d5cfbc41..8d329921 100644 --- 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 index bbebf201..0b79a0cd 100644 --- a/bundles/es.core.connector.elexis/.classpath +++ b/bundles/es.core.connector.elexis/.classpath @@ -1,6 +1,6 @@ - + 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 index d089a9b7..7cbe36f2 100644 --- 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 index ceb3d1ec..7caeaa68 100644 --- 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 deleted file mode 100644 index 9cebbaad..00000000 --- a/bundles/es.core.jetty.homebundle/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - es.core.jetty.homebundle - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/bundles/es.core.jetty.homebundle/META-INF/MANIFEST.MF b/bundles/es.core.jetty.homebundle/META-INF/MANIFEST.MF deleted file mode 100644 index dda1dde2..00000000 --- a/bundles/es.core.jetty.homebundle/META-INF/MANIFEST.MF +++ /dev/null @@ -1,8 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Jetty Configuration Home Bundle -Bundle-SymbolicName: info.elexis.server.core.jetty.homebundle -Bundle-Version: 1.0.0.qualifier -Bundle-Vendor: elexis.info -Eclipse-BundleShape: dir -Require-Bundle: org.eclipse.jetty.osgi.boot;bundle-version="10.0.6" diff --git a/bundles/es.core.jetty.homebundle/README.md b/bundles/es.core.jetty.homebundle/README.md deleted file mode 100644 index e1345d08..00000000 --- a/bundles/es.core.jetty.homebundle/README.md +++ /dev/null @@ -1,14 +0,0 @@ - -# DEPRECATED - -Marked deprecated with 3.12, was bound to `org.eclipse.jetty.osgi.boot` - -This required service should also be addable using `org.eclipse.jetty.osgi.httpservice` which -is added as bundle to startlevel. - -If no additional usage, remove in 3.13 - -Removed from MAVEN build - - -In essence, while org.eclipse.jetty.osgi.boot is about integrating Jetty as a server into OSGi, org.eclipse.jetty.osgi.httpservice is about providing a standard OSGi HTTP service using Jetty. The httpservice bundle allows other OSGi bundles to easily expose web content and services, leveraging Jetty's capabilities under the hood. \ No newline at end of file diff --git a/bundles/es.core.jetty.homebundle/build.properties b/bundles/es.core.jetty.homebundle/build.properties deleted file mode 100644 index 1dbfb946..00000000 --- a/bundles/es.core.jetty.homebundle/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -bin.includes = META-INF/,\ - jettyhome/ diff --git a/bundles/es.core.jetty.homebundle/jettyhome/etc/jetty-deploy.xml b/bundles/es.core.jetty.homebundle/jettyhome/etc/jetty-deploy.xml deleted file mode 100644 index ba8c4da7..00000000 --- a/bundles/es.core.jetty.homebundle/jettyhome/etc/jetty-deploy.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/es.core.jetty.homebundle/jettyhome/etc/jetty-http.xml b/bundles/es.core.jetty.homebundle/jettyhome/etc/jetty-http.xml deleted file mode 100644 index a6290de1..00000000 --- a/bundles/es.core.jetty.homebundle/jettyhome/etc/jetty-http.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/es.core.jetty.homebundle/jettyhome/etc/jetty.xml b/bundles/es.core.jetty.homebundle/jettyhome/etc/jetty.xml deleted file mode 100644 index c74cda3e..00000000 --- a/bundles/es.core.jetty.homebundle/jettyhome/etc/jetty.xml +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.eclipse.jetty.webapp.FragmentConfiguration - org.eclipse.jetty.webapp.JettyWebXmlConfiguration - org.eclipse.jetty.webapp.WebXmlConfiguration - org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration - org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration - - - - - - - - - - - - - - - - - - - java.naming.factory.initial - - - - java.naming.factory.url.pkgs - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/es.core.logging/.classpath b/bundles/es.core.logging/.classpath index 8d861214..c0015778 100644 --- a/bundles/es.core.logging/.classpath +++ b/bundles/es.core.logging/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/es.core.logging/.settings/org.eclipse.jdt.core.prefs b/bundles/es.core.logging/.settings/org.eclipse.jdt.core.prefs index d4540a53..3a79233b 100644 --- a/bundles/es.core.logging/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/es.core.logging/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ 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.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.logging/META-INF/MANIFEST.MF b/bundles/es.core.logging/META-INF/MANIFEST.MF index 85a1d37b..9788182b 100644 --- a/bundles/es.core.logging/META-INF/MANIFEST.MF +++ b/bundles/es.core.logging/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Elexis-Server logging configuration Bundle-SymbolicName: info.elexis.server.core.logging -Bundle-Version: 3.12.0.qualifier +Bundle-Version: 3.13.0.qualifier Bundle-Vendor: elexis.info Fragment-Host: ch.qos.logback.classic;bundle-version="1.0.7" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: javax.activation diff --git a/bundles/es.core.p2/.classpath b/bundles/es.core.p2/.classpath index 8d861214..c0015778 100644 --- a/bundles/es.core.p2/.classpath +++ b/bundles/es.core.p2/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/es.core.p2/.settings/org.eclipse.jdt.core.prefs b/bundles/es.core.p2/.settings/org.eclipse.jdt.core.prefs index d4540a53..3a79233b 100644 --- a/bundles/es.core.p2/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/es.core.p2/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ 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.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.p2/META-INF/MANIFEST.MF b/bundles/es.core.p2/META-INF/MANIFEST.MF index 7f4d91a7..986ba450 100644 --- a/bundles/es.core.p2/META-INF/MANIFEST.MF +++ b/bundles/es.core.p2/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Core Elexis-Server p2 management -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: info.elexis.server.core.p2;singleton:=true -Bundle-Version: 3.12.0.qualifier +Bundle-Version: 3.13.0.qualifier Bundle-Vendor: elexis.info Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/*.xml diff --git a/bundles/es.core.redmine/.classpath b/bundles/es.core.redmine/.classpath index a51c37f0..d65bf10d 100644 --- a/bundles/es.core.redmine/.classpath +++ b/bundles/es.core.redmine/.classpath @@ -2,7 +2,7 @@ - + diff --git a/bundles/es.core.redmine/.settings/org.eclipse.jdt.core.prefs b/bundles/es.core.redmine/.settings/org.eclipse.jdt.core.prefs index ecb498c8..43939db6 100644 --- a/bundles/es.core.redmine/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/es.core.redmine/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -13,4 +13,4 @@ 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.redmine/META-INF/MANIFEST.MF b/bundles/es.core.redmine/META-INF/MANIFEST.MF index 111048d2..d2ed4cc8 100644 --- a/bundles/es.core.redmine/META-INF/MANIFEST.MF +++ b/bundles/es.core.redmine/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Elexis-Server General Purpose Redmine Connector -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: info.elexis.server.core.redmine -Bundle-Version: 3.12.0.qualifier +Bundle-Version: 3.13.0.qualifier Bundle-Vendor: elexis.info Automatic-Module-Name: es.core.redmine Bundle-ClassPath: lib/redmine-java-api-3.1.3.jar, diff --git a/bundles/es.core/.classpath b/bundles/es.core/.classpath index 8d861214..c0015778 100644 --- a/bundles/es.core/.classpath +++ b/bundles/es.core/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/es.core/.settings/org.eclipse.jdt.core.prefs b/bundles/es.core/.settings/org.eclipse.jdt.core.prefs index d4540a53..3a79233b 100644 --- a/bundles/es.core/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/es.core/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ 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.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/META-INF/MANIFEST.MF b/bundles/es.core/META-INF/MANIFEST.MF index 37bf511a..0a837dc2 100644 --- a/bundles/es.core/META-INF/MANIFEST.MF +++ b/bundles/es.core/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Elexis Server Core Bundle-SymbolicName: info.elexis.server.core;singleton:=true -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: ch.qos.logback.classic;version="1.2.3", ch.qos.logback.classic.joran;version="1.2.3", ch.qos.logback.classic.spi;version="1.2.3", @@ -56,7 +56,7 @@ Export-Package: info.elexis.server.core, info.elexis.server.core.rest, info.elexis.server.core.servlet.filter Bundle-ClassPath: . -Require-Bundle: info.elexis.server.core.common;bundle-version="3.12.0", - ch.elexis.core;bundle-version="3.12.0", - info.elexis.jaxrs.service;bundle-version="3.12.0" +Require-Bundle: info.elexis.server.core.common;bundle-version="3.13.0", + ch.elexis.core;bundle-version="3.13.0", + info.elexis.jaxrs.service;bundle-version="3.13.0" diff --git a/bundles/es.fhir.rest.core/.classpath b/bundles/es.fhir.rest.core/.classpath index 2dd5f1e9..cc56a722 100644 --- a/bundles/es.fhir.rest.core/.classpath +++ b/bundles/es.fhir.rest.core/.classpath @@ -9,7 +9,7 @@ - + diff --git a/bundles/es.fhir.rest.core/.settings/org.eclipse.jdt.core.prefs b/bundles/es.fhir.rest.core/.settings/org.eclipse.jdt.core.prefs index 529020c7..6e34ac8b 100644 --- a/bundles/es.fhir.rest.core/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/es.fhir.rest.core/.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.fhir.rest.core/META-INF/MANIFEST.MF b/bundles/es.fhir.rest.core/META-INF/MANIFEST.MF index 0cb8db8a..6c5acf36 100644 --- a/bundles/es.fhir.rest.core/META-INF/MANIFEST.MF +++ b/bundles/es.fhir.rest.core/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: FHIR REST Core Bundle-SymbolicName: info.elexis.server.fhir.rest.core -Bundle-Version: 3.12.0.qualifier +Bundle-Version: 3.13.0.qualifier Bundle-Vendor: medevit.at -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ClassPath: ., lib/javax.websocket-api-1.1.jar, lib/websocket-core-client-10.0.18.jar, diff --git a/bundles/es.findings.fhir.jpa.service/.classpath b/bundles/es.findings.fhir.jpa.service/.classpath index 6d52d5f1..f62087d7 100644 --- a/bundles/es.findings.fhir.jpa.service/.classpath +++ b/bundles/es.findings.fhir.jpa.service/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/es.findings.fhir.jpa.service/.settings/org.eclipse.jdt.core.prefs b/bundles/es.findings.fhir.jpa.service/.settings/org.eclipse.jdt.core.prefs index 529020c7..6e34ac8b 100644 --- a/bundles/es.findings.fhir.jpa.service/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/es.findings.fhir.jpa.service/.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.findings.fhir.jpa.service/META-INF/MANIFEST.MF b/bundles/es.findings.fhir.jpa.service/META-INF/MANIFEST.MF index ecbec0a9..5f9fda53 100644 --- a/bundles/es.findings.fhir.jpa.service/META-INF/MANIFEST.MF +++ b/bundles/es.findings.fhir.jpa.service/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Findings JPA Service -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: info.elexis.server.findings.fhir.jpa.service -Bundle-Version: 3.12.0.qualifier +Bundle-Version: 3.13.0.qualifier Bundle-Vendor: medevit.at Bundle-ActivationPolicy: lazy Export-Package: info.elexis.server.findings.fhir.jpa.service diff --git a/bundles/info.elexis.jaxrs.service/.classpath b/bundles/info.elexis.jaxrs.service/.classpath index 81fe078c..375961e4 100644 --- a/bundles/info.elexis.jaxrs.service/.classpath +++ b/bundles/info.elexis.jaxrs.service/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/info.elexis.jaxrs.service/.settings/org.eclipse.jdt.core.prefs b/bundles/info.elexis.jaxrs.service/.settings/org.eclipse.jdt.core.prefs index 62ef3488..23fa13b1 100644 --- a/bundles/info.elexis.jaxrs.service/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/info.elexis.jaxrs.service/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -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.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/info.elexis.jaxrs.service/META-INF/MANIFEST.MF b/bundles/info.elexis.jaxrs.service/META-INF/MANIFEST.MF index 1708f881..4e333409 100644 --- a/bundles/info.elexis.jaxrs.service/META-INF/MANIFEST.MF +++ b/bundles/info.elexis.jaxrs.service/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Service Bundle-SymbolicName: info.elexis.jaxrs.service -Bundle-Version: 3.12.0.qualifier +Bundle-Version: 3.13.0.qualifier Export-Package: info.elexis.jaxrs.service Import-Package: com.google.gson;version="2.10.1", javax.servlet;version="4.0.0", @@ -25,4 +25,4 @@ Require-Bundle: org.glassfish.jersey.core.jersey-common;bundle-version="2.41.0", Service-Component: OSGI-INF/*.xml Automatic-Module-Name: info.elexis.jaxrs.service Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/bundles/pom.xml b/bundles/pom.xml index 9a2e270b..71754359 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -11,7 +11,7 @@ info.elexis.server info.elexis.server.parent - 3.12.0-SNAPSHOT + 3.13.0-SNAPSHOT ../releng/es.parent diff --git a/features/es.core.connector.elexis.feature/feature.xml b/features/es.core.connector.elexis.feature/feature.xml index 58527a08..ac075084 100644 --- a/features/es.core.connector.elexis.feature/feature.xml +++ b/features/es.core.connector.elexis.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,442 +23,254 @@ + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> diff --git a/features/es.core.feature/feature.xml b/features/es.core.feature/feature.xml index 6cee8adc..4938ce05 100644 --- a/features/es.core.feature/feature.xml +++ b/features/es.core.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,36 +23,22 @@ + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> diff --git a/features/es.core.p2.feature/feature.xml b/features/es.core.p2.feature/feature.xml index 1aad5950..48fd8b38 100644 --- a/features/es.core.p2.feature/feature.xml +++ b/features/es.core.p2.feature/feature.xml @@ -2,7 +2,7 @@ @@ -19,165 +19,95 @@ + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> diff --git a/features/es.core.platform.feature/feature.xml b/features/es.core.platform.feature/feature.xml index b6ecc49f..94aa691c 100644 --- a/features/es.core.platform.feature/feature.xml +++ b/features/es.core.platform.feature/feature.xml @@ -2,7 +2,7 @@ @@ -19,813 +19,463 @@ + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> diff --git a/features/es.findings.feature/feature.xml b/features/es.findings.feature/feature.xml index 1a8fd4a3..7a4f7762 100644 --- a/features/es.findings.feature/feature.xml +++ b/features/es.findings.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,16 +23,10 @@ + version="0.0.0"/> + version="0.0.0"/> diff --git a/features/pom.xml b/features/pom.xml index 38579418..a8b98326 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ info.elexis.server info.elexis.server.parent - 3.12.0-SNAPSHOT + 3.13.0-SNAPSHOT ../releng/es.parent diff --git a/products/es.core.product.runtime/info.elexis.server.runtime.product.product b/products/es.core.product.runtime/info.elexis.server.runtime.product.product index 9ed56075..1a098a9f 100644 --- a/products/es.core.product.runtime/info.elexis.server.runtime.product.product +++ b/products/es.core.product.runtime/info.elexis.server.runtime.product.product @@ -1,7 +1,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/products/es.core.product.runtime/info.elexis.server.runtime.product.product (OS X) (Java17).launch b/products/es.core.product.runtime/info.elexis.server.runtime.product.product (OS X) (Java17).launch deleted file mode 100644 index 19aa5551..00000000 --- a/products/es.core.product.runtime/info.elexis.server.runtime.product.product (OS X) (Java17).launch +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/products/es.core.product.runtime/info.elexis.server.runtime.product.product (OS X).launch b/products/es.core.product.runtime/info.elexis.server.runtime.product.product (OS X).launch deleted file mode 100644 index 063ef176..00000000 --- a/products/es.core.product.runtime/info.elexis.server.runtime.product.product (OS X).launch +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/products/es.core.product.runtime/info.elexis.server.runtime.product.product (Win32).launch b/products/es.core.product.runtime/info.elexis.server.runtime.product.product (Win32).launch deleted file mode 100644 index e79ab962..00000000 --- a/products/es.core.product.runtime/info.elexis.server.runtime.product.product (Win32).launch +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/products/es.core.product.runtime/pom.xml b/products/es.core.product.runtime/pom.xml index e6b562b3..37e6e8ed 100644 --- a/products/es.core.product.runtime/pom.xml +++ b/products/es.core.product.runtime/pom.xml @@ -3,7 +3,7 @@ 4.0.0 info.elexis.server.products - 3.12.0-SNAPSHOT + 3.13.0-SNAPSHOT pom diff --git a/products/es.updatesite/pom.xml b/products/es.updatesite/pom.xml index 2e4cdba1..246c75d2 100644 --- a/products/es.updatesite/pom.xml +++ b/products/es.updatesite/pom.xml @@ -5,7 +5,7 @@ info.elexis.server.products pom - 3.12.0-SNAPSHOT + 3.13.0-SNAPSHOT info.elexis.server.updatesite diff --git a/products/pom.xml b/products/pom.xml index 11e9c169..2fda5a99 100644 --- a/products/pom.xml +++ b/products/pom.xml @@ -5,7 +5,7 @@ info.elexis.server info.elexis.server.parent - 3.12.0-SNAPSHOT + 3.13.0-SNAPSHOT ../releng/es.parent diff --git a/releng/es.parent/pom.xml b/releng/es.parent/pom.xml index 21e5fbfe..5277b762 100755 --- a/releng/es.parent/pom.xml +++ b/releng/es.parent/pom.xml @@ -5,7 +5,7 @@ info.elexis.server info.elexis.server.parent - 3.12.0-SNAPSHOT + 3.13.0-SNAPSHOT pom Elexis-Server Elexis-Server for headless operation @@ -31,8 +31,8 @@ - 2023-09-java17 - 3.0.5 + 2023-09-java21 + 4.0.8 UTF-8 @@ -74,7 +74,7 @@ target-platform-configuration ${tycho.version} - JavaSE-17 + JavaSE-21 consider diff --git a/tests/es.core.connector.elexis.test/.classpath b/tests/es.core.connector.elexis.test/.classpath index 38f401ad..2167a547 100644 --- a/tests/es.core.connector.elexis.test/.classpath +++ b/tests/es.core.connector.elexis.test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/es.core.connector.elexis.test/.settings/org.eclipse.jdt.core.prefs b/tests/es.core.connector.elexis.test/.settings/org.eclipse.jdt.core.prefs index d089a9b7..7cbe36f2 100644 --- a/tests/es.core.connector.elexis.test/.settings/org.eclipse.jdt.core.prefs +++ b/tests/es.core.connector.elexis.test/.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/tests/es.core.connector.elexis.test/META-INF/MANIFEST.MF b/tests/es.core.connector.elexis.test/META-INF/MANIFEST.MF index c022acd0..f9df13bb 100644 --- a/tests/es.core.connector.elexis.test/META-INF/MANIFEST.MF +++ b/tests/es.core.connector.elexis.test/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Test Bundle-SymbolicName: info.elexis.server.core.connector.elexis.test -Bundle-Version: 3.12.0.qualifier +Bundle-Version: 3.13.0.qualifier Bundle-Vendor: elexis.info Fragment-Host: info.elexis.server.core.connector.elexis;bundle-version="3.12.0" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.junit, org.eclipse.gemini.jpa;bundle-version="1.2.0", org.hamcrest.core;bundle-version="1.3.0", diff --git a/tests/es.core.connector.elexis.test/pom.xml b/tests/es.core.connector.elexis.test/pom.xml index 88db14b3..2d17d9ee 100644 --- a/tests/es.core.connector.elexis.test/pom.xml +++ b/tests/es.core.connector.elexis.test/pom.xml @@ -5,7 +5,7 @@ info.elexis.server info.elexis.server.tests - 3.12.0-SNAPSHOT + 3.13.0-SNAPSHOT info.elexis.server.core.connector.elexis.test eclipse-test-plugin diff --git a/tests/es.core.rest.test/.classpath b/tests/es.core.rest.test/.classpath deleted file mode 100644 index a42a828e..00000000 --- a/tests/es.core.rest.test/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/tests/es.core.rest.test/.project b/tests/es.core.rest.test/.project deleted file mode 100644 index 71d601e5..00000000 --- a/tests/es.core.rest.test/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - es.core.rest.test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/tests/es.core.rest.test/.settings/org.eclipse.jdt.core.prefs b/tests/es.core.rest.test/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 7adc0fb9..00000000 --- a/tests/es.core.rest.test/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,10 +0,0 @@ -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.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.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 diff --git a/tests/es.core.rest.test/CoreRestTests.launch b/tests/es.core.rest.test/CoreRestTests.launch deleted file mode 100644 index 1abeefc0..00000000 --- a/tests/es.core.rest.test/CoreRestTests.launch +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/es.core.rest.test/META-INF/MANIFEST.MF b/tests/es.core.rest.test/META-INF/MANIFEST.MF deleted file mode 100644 index c76444a9..00000000 --- a/tests/es.core.rest.test/META-INF/MANIFEST.MF +++ /dev/null @@ -1,21 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Elexis-Server Setup Test -Bundle-SymbolicName: info.elexis.server.setup.test;singleton:=true -Bundle-Version: 3.9.0.qualifier -Bundle-Vendor: elexis.info -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Bundle-ClassPath: . -Bundle-ActivationPolicy: lazy -Bundle-Activator: info.elexis.server.core.rest.test.internal.Activator -Import-Package: com.google.gson;version="2.8.6", - javax.ws.rs;version="2.1.6", - javax.ws.rs.client;version="2.1.6", - javax.ws.rs.core;version="2.1.6", - org.glassfish.jersey;version="2.34.0", - org.glassfish.jersey.client;version="2.34.0", - org.glassfish.jersey.client.proxy;version="2.41.0" -Require-Bundle: ch.elexis.core;bundle-version="3.9.0", - org.junit;bundle-version="4.13.0", - com.h2database;bundle-version="1.4.200", - info.elexis.server.core.connector.elexis;bundle-version="3.9.0" diff --git a/tests/es.core.rest.test/build.properties b/tests/es.core.rest.test/build.properties deleted file mode 100644 index 34d2e4d2..00000000 --- a/tests/es.core.rest.test/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/tests/es.core.rest.test/pom.xml b/tests/es.core.rest.test/pom.xml deleted file mode 100644 index 29ab0df1..00000000 --- a/tests/es.core.rest.test/pom.xml +++ /dev/null @@ -1,137 +0,0 @@ - - 4.0.0 - - - info.elexis.server.tests - 3.9.0-SNAPSHOT - info.elexis.server - - - info.elexis.server.setup.test - eclipse-test-plugin - - - src - - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho.version} - - false - true - info.elexis.server.core.rest.test.AllTests - -consoleLog -console 7234 - - -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog -Djetty.home.bundle=info.elexis.server.core.jetty.homebundle -DREFRESH_BUNDLES=false -Dopenid.unit-test=true -DforceExecuteSqlScript=true - - - info.elexis.server.setup.test - 1 - true - - - org.eclipse.equinox.ds - 1 - true - - - org.eclipse.equinox.event - 1 - true - - - javax.persistence - 1 - true - - - org.json - 1 - true - - - org.eclipse.equinox.cm - 2 - true - - - org.eclipse.gemini.jpa - 2 - true - - - ch.elexis.core.jpa.datasource - 2 - true - - - org.eclipse.jetty.osgi.boot - 3 - true - - - ch.elexis.core.jpa.entities - 3 - true - - - info.elexis.server.findings.fhir.jpa - 3 - true - - - com.eclipsesource.jaxrs.provider.gson - 3 - true - - - com.eclipsesource.jaxrs.provider.swagger - 3 - true - - - com.eclipsesource.jaxrs.publisher - 3 - true - - - info.elexis.server.findings.fhir.jpa - 3 - true - - - org.eclipse.jetty.osgi.httpservice - true - - - - - eclipse-feature - info.elexis.server.core.platform.feature - 1.0.0 - - - eclipse-feature - info.elexis.server.core.jsp.feature - 1.0.0 - - - eclipse-feature - info.elexis.server.fhir.rest.core.feature - 2.0.0 - - - eclipse-feature - info.elexis.server.core.connector.elexis.feature - 1.0.0 - - - - - - - diff --git a/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/AllTests.java b/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/AllTests.java deleted file mode 100644 index fb2e42e6..00000000 --- a/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/AllTests.java +++ /dev/null @@ -1,53 +0,0 @@ -package info.elexis.server.core.rest.test; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -import info.elexis.server.core.rest.test.elexisinstances.AllElexisInstancesTests; - -@RunWith(Suite.class) -@SuiteClasses({ - AllElexisInstancesTests.class -}) -public class AllTests { - - /** - * Eclipse Monitor - * http://www.avajava.com/tutorials/lessons/how-do-i-monitor-http-communication-in-eclipse.html - */ - // public static final String BASE_URL = "http://localhost:8381"; // Via TCP/IP - - public static final String BASE_URL = "http://localhost:8380"; - public static final String REST_URL = BASE_URL + "/services"; - -// private static OkHttpClient defaultOkHttpClient = -// new OkHttpClient.Builder().connectTimeout(10, TimeUnit.SECONDS) -// .writeTimeout(10, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).build(); -// -// public static boolean isReachable(String targetUrl) throws MalformedURLException, IOException{ -// HttpURLConnection httpUrlConnection = -// (HttpURLConnection) new URL(targetUrl).openConnection(); -// httpUrlConnection.setRequestMethod("GET"); -// try { -// int responseCode = httpUrlConnection.getResponseCode(); -// -// return responseCode > 0; -// } catch (Exception exception) { -// return false; -// } -// } -// -// public static OkHttpClient getDefaultOkHttpClient(){ -// return defaultOkHttpClient; -// } -// -// private static TestDatabaseConnection tbc; -// -// public static synchronized DBConnection getTestDatabaseConnection() throws SQLException{ -// if (tbc == null) { -// tbc = new TestDatabaseConnection(true); -// } -// return tbc; -// } -} diff --git a/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/elexisinstances/AllElexisInstancesTests.java b/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/elexisinstances/AllElexisInstancesTests.java deleted file mode 100644 index d97178a0..00000000 --- a/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/elexisinstances/AllElexisInstancesTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package info.elexis.server.core.rest.test.elexisinstances; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -import info.elexis.server.core.rest.test.elexisinstances.legacy.LegacyRestTests; - -@RunWith(Suite.class) -@SuiteClasses({ LegacyRestTests.class}) -public class AllElexisInstancesTests { - -} diff --git a/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/elexisinstances/legacy/EventServiceTest.java b/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/elexisinstances/legacy/EventServiceTest.java deleted file mode 100644 index 142020fa..00000000 --- a/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/elexisinstances/legacy/EventServiceTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package info.elexis.server.core.rest.test.elexisinstances.legacy; - -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; - -import org.glassfish.jersey.client.proxy.WebResourceFactory; -import org.junit.BeforeClass; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; - -import ch.elexis.core.common.ElexisEvent; -import ch.elexis.core.common.ElexisEventTopics; -import ch.elexis.core.server.IEventService; -import info.elexis.server.core.rest.test.AllTests; - -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class EventServiceTest { - - private static IEventService eventService; - - @BeforeClass - public static void beforeClass() { - Client client = ClientBuilder.newClient(); - WebTarget target = client.target(AllTests.REST_URL); - - eventService = WebResourceFactory.newResource(IEventService.class, target); - } - - @Test - public void _01_testPostEvent() { - ElexisEvent ee = new ElexisEvent(); - ee.setTopic(ElexisEventTopics.PERSISTENCE_EVENT_CREATE); - ee.getProperties().put(ElexisEventTopics.PROPKEY_ID, "testObjectId"); - ee.getProperties().put(ElexisEventTopics.PROPKEY_CLASS, String.class.getName()); - eventService.postEvent(ee); - } - -} diff --git a/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/elexisinstances/legacy/InstanceServiceTest.java b/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/elexisinstances/legacy/InstanceServiceTest.java deleted file mode 100644 index c4a6b114..00000000 --- a/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/elexisinstances/legacy/InstanceServiceTest.java +++ /dev/null @@ -1,44 +0,0 @@ -package info.elexis.server.core.rest.test.elexisinstances.legacy; - -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; - -import org.glassfish.jersey.client.proxy.WebResourceFactory; -import org.junit.BeforeClass; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; - -import ch.elexis.core.common.InstanceStatus; -import ch.elexis.core.server.IInstanceService; -import info.elexis.server.core.rest.test.AllTests; - -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class InstanceServiceTest { - - private static IInstanceService instanceService; - - @BeforeClass - public static void beforeClass() { - Client client = ClientBuilder.newClient(); - WebTarget target = client.target(AllTests.REST_URL); - instanceService = WebResourceFactory.newResource(IInstanceService.class, target); - } - - @Test - public void _01_testUpdateStatus() { - InstanceStatus instanceStatus = new InstanceStatus(); - instanceStatus.setState(InstanceStatus.STATE.ACTIVE); - instanceStatus.setUuid("testUuid"); - instanceStatus.setVersion("testVersion"); - instanceStatus.setOperatingSystem(System.getProperty("os.name") + "/" + System.getProperty("os.version") + "/" - + System.getProperty("os.arch") + "/J" + System.getProperty("java.version")); - instanceStatus.setIdentifier("testIdentifier"); - instanceStatus.setActiveUser("testActiveUser"); - - instanceService.updateStatus(instanceStatus); - } - - // getStatus does not correctly work -} diff --git a/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/elexisinstances/legacy/LegacyRestTests.java b/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/elexisinstances/legacy/LegacyRestTests.java deleted file mode 100644 index a62c6015..00000000 --- a/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/elexisinstances/legacy/LegacyRestTests.java +++ /dev/null @@ -1,11 +0,0 @@ -package info.elexis.server.core.rest.test.elexisinstances.legacy; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -@RunWith(Suite.class) -@SuiteClasses({ EventServiceTest.class, InstanceServiceTest.class, LockServiceTest.class }) -public class LegacyRestTests { - -} diff --git a/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/elexisinstances/legacy/LockServiceTest.java b/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/elexisinstances/legacy/LockServiceTest.java deleted file mode 100644 index ed28a07a..00000000 --- a/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/elexisinstances/legacy/LockServiceTest.java +++ /dev/null @@ -1,69 +0,0 @@ -package info.elexis.server.core.rest.test.elexisinstances.legacy; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; - -import org.glassfish.jersey.client.proxy.WebResourceFactory; -import org.junit.BeforeClass; -import org.junit.FixMethodOrder; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runners.MethodSorters; - -import ch.elexis.core.lock.types.LockInfo; -import ch.elexis.core.lock.types.LockRequest; -import ch.elexis.core.lock.types.LockRequest.Type; -import ch.elexis.core.lock.types.LockResponse; -import ch.elexis.core.server.ILockService; -import info.elexis.server.core.rest.test.AllTests; - -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class LockServiceTest { - - private static ILockService lockService; - - @BeforeClass - public static void beforeClass() { - Client client = ClientBuilder.newClient(); - WebTarget target = client.target(AllTests.REST_URL); - lockService = WebResourceFactory.newResource(ILockService.class, target); - } - - private LockInfo lockInfo = new LockInfo("objStoreToString::1", "objUser", "testUuid"); - - @Test - public void _01_testAcquireLock() { - LockResponse response = lockService.acquireOrReleaseLocks(new LockRequest(Type.ACQUIRE, lockInfo)); - assertTrue(response.isOk()); - } - - @Test - public void _02_testGetLockInfo() { - LockInfo lockInfo = lockService.getLockInfo("objStoreToString::1"); - assertEquals("1", lockInfo.getElementId()); - assertEquals("objUser", lockInfo.getUser()); - assertEquals("testUuid", lockInfo.getSystemUuid()); - assertEquals("objStoreToString::1", lockInfo.getElementStoreToString()); - assertNotNull(lockInfo.getCreationDate()); - } - - @Test - @Ignore - public void _03_testIsLocked() { - // TODO change interface to lockService.isLocked(LockInfo) -// boolean locked = lockService.isLocked(request); -// assertTrue(locked); - } - - @Test - public void _04_testReleaseLock() { - LockResponse response = lockService.acquireOrReleaseLocks(new LockRequest(Type.RELEASE, lockInfo)); - assertTrue(response.isOk()); - } - -} diff --git a/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/internal/Activator.java b/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/internal/Activator.java deleted file mode 100644 index 3067824a..00000000 --- a/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/internal/Activator.java +++ /dev/null @@ -1,53 +0,0 @@ -package info.elexis.server.core.rest.test.internal; - -import java.io.File; - -import org.h2.tools.DeleteDbFiles; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -import ch.elexis.core.utils.CoreUtil; -import info.elexis.server.core.connector.elexis.Properties; - -public class Activator implements BundleActivator { - - private File esConnectionFile = CoreUtil.getElexisServerHomeDirectory().resolve("elexis-connection.xml").toFile(); - private File esConnectionFileTestBackup = CoreUtil.getElexisServerHomeDirectory().resolve("elexis-connection.xml.testBackup") - .toFile(); - - private static BundleContext bundleContext; - - @Override - public void start(BundleContext context) throws Exception { - Activator.bundleContext = context; - - System.setProperty(Properties.SYSTEM_PROPERTY_ACCEPT_MISSING_LOCKSERVICE_CONTRIBUTORS, Boolean.TRUE.toString()); - - if (esConnectionFileTestBackup.exists()) { - esConnectionFileTestBackup.delete(); - } - - if (esConnectionFile.exists()) { - boolean renameTo = esConnectionFile.renameTo(esConnectionFileTestBackup); - if (!renameTo) { - throw new IllegalStateException("Could not rename elexis-connection.xml"); - } - } - } - - @Override - public void stop(BundleContext context) throws Exception { - Activator.bundleContext = null; - - if (esConnectionFileTestBackup.exists()) { - esConnectionFileTestBackup.renameTo(esConnectionFile); - } - - DeleteDbFiles.execute("~/elexis-server", "elexisTest", true); - } - - public static BundleContext getBundleContext() { - return bundleContext; - } - -} diff --git a/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/swagger/SwaggerTest.java b/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/swagger/SwaggerTest.java deleted file mode 100644 index e5dd7253..00000000 --- a/tests/es.core.rest.test/src/info/elexis/server/core/rest/test/swagger/SwaggerTest.java +++ /dev/null @@ -1,42 +0,0 @@ -//package info.elexis.server.core.rest.test.swagger; -// -//import static info.elexis.server.core.rest.test.AllTests.REST_URL; -//import static org.junit.Assert.assertEquals; -// -//import java.io.IOException; -//import java.net.HttpURLConnection; -// -//import org.junit.Test; -// -//import com.google.gson.Gson; -//import com.google.gson.JsonElement; -//import com.google.gson.JsonObject; -// -//import info.elexis.server.core.rest.test.AllTests; -//import okhttp3.OkHttpClient; -//import okhttp3.Request; -//import okhttp3.Response; -// -//public class SwaggerTest { -// -// private OkHttpClient client = AllTests.getDefaultOkHttpClient(); -// private Response response; -// -// Gson gson = new Gson(); -// -// @Test -// public void testGetSwaggerConfiguration() throws IOException { -// Request request = new Request.Builder().url(REST_URL + "/swagger.json").get().build(); -// response = client.newCall(request).execute(); -// assertEquals(HttpURLConnection.HTTP_OK, response.code()); -// -// String swaggerJson = response.body().string(); -// JsonElement jelem = gson.fromJson(swaggerJson, JsonElement.class); -//// JsonObject swagger = jelem.getAsJsonObject(); -// -//// JsonObject securityDefinitions = swagger.getAsJsonObject("securityDefinitions"); -//// JsonObject esoAuth = securityDefinitions.get("esoauth").getAsJsonObject(); -//// assertEquals("oauth2", esoAuth.get("type").getAsString()); -// } -// -//} diff --git a/tests/es.fhir.rest.core.test/.settings/org.eclipse.jdt.core.prefs b/tests/es.fhir.rest.core.test/.settings/org.eclipse.jdt.core.prefs index f78f7f77..96641ff8 100644 --- a/tests/es.fhir.rest.core.test/.settings/org.eclipse.jdt.core.prefs +++ b/tests/es.fhir.rest.core.test/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ 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.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/tests/es.fhir.rest.core.test/AllFhirRestTests.launch b/tests/es.fhir.rest.core.test/AllFhirRestTests.launch index 358ecccd..aca117bc 100644 --- a/tests/es.fhir.rest.core.test/AllFhirRestTests.launch +++ b/tests/es.fhir.rest.core.test/AllFhirRestTests.launch @@ -40,7 +40,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/tests/es.fhir.rest.core.test/META-INF/MANIFEST.MF b/tests/es.fhir.rest.core.test/META-INF/MANIFEST.MF index 0c0821a7..5171684a 100644 --- a/tests/es.fhir.rest.core.test/META-INF/MANIFEST.MF +++ b/tests/es.fhir.rest.core.test/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Test Bundle-SymbolicName: info.elexis.server.fhir.rest.core.test -Bundle-Version: 3.12.0.qualifier +Bundle-Version: 3.13.0.qualifier Fragment-Host: info.elexis.server.fhir.rest.core;bundle-version="3.12.0" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.junit, ch.elexis.core.findings;bundle-version="3.12.0", ch.elexis.core.test;bundle-version="3.12.0", diff --git a/tests/es.fhir.rest.core.test/pom.xml b/tests/es.fhir.rest.core.test/pom.xml index a7d4e905..b4b13b1a 100644 --- a/tests/es.fhir.rest.core.test/pom.xml +++ b/tests/es.fhir.rest.core.test/pom.xml @@ -5,7 +5,7 @@ info.elexis.server info.elexis.server.tests - 3.12.0-SNAPSHOT + 3.13.0-SNAPSHOT info.elexis.server.fhir.rest.core.test eclipse-test-plugin diff --git a/tests/info.elexis.jaxrs.service.test/.classpath b/tests/info.elexis.jaxrs.service.test/.classpath index 675a5e29..1aa9eca9 100644 --- a/tests/info.elexis.jaxrs.service.test/.classpath +++ b/tests/info.elexis.jaxrs.service.test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/info.elexis.jaxrs.service.test/.settings/org.eclipse.jdt.core.prefs b/tests/info.elexis.jaxrs.service.test/.settings/org.eclipse.jdt.core.prefs index 62ef3488..23fa13b1 100644 --- a/tests/info.elexis.jaxrs.service.test/.settings/org.eclipse.jdt.core.prefs +++ b/tests/info.elexis.jaxrs.service.test/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -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.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/tests/info.elexis.jaxrs.service.test/META-INF/MANIFEST.MF b/tests/info.elexis.jaxrs.service.test/META-INF/MANIFEST.MF index 17b23b52..eed6575a 100644 --- a/tests/info.elexis.jaxrs.service.test/META-INF/MANIFEST.MF +++ b/tests/info.elexis.jaxrs.service.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Test Bundle-SymbolicName: info.elexis.jaxrs.service.test -Bundle-Version: 3.12.0.qualifier +Bundle-Version: 3.13.0.qualifier Fragment-Host: info.elexis.jaxrs.service;bundle-version="3.12.0" Import-Package: javax.ws.rs.client;version="2.1.6", javax.xml.bind.annotation;version="2.3.0", @@ -12,5 +12,5 @@ Import-Package: javax.ws.rs.client;version="2.1.6", Require-Bundle: ch.elexis.core;bundle-version="3.12.0" Automatic-Module-Name: info.elexis.jaxrs.service.test Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Service-Component: OSGI-INF/info.elexis.jaxrs.service.internal.test.MockResourceImpl.xml diff --git a/tests/info.elexis.jaxrs.service.test/pom.xml b/tests/info.elexis.jaxrs.service.test/pom.xml index 66e5bf5b..e4c93b42 100644 --- a/tests/info.elexis.jaxrs.service.test/pom.xml +++ b/tests/info.elexis.jaxrs.service.test/pom.xml @@ -5,7 +5,7 @@ info.elexis.server info.elexis.server.tests - 3.12.0-SNAPSHOT + 3.13.0-SNAPSHOT info.elexis.jaxrs.service.test eclipse-test-plugin diff --git a/tests/pom.xml b/tests/pom.xml index 3ffa5401..00c304e9 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -11,16 +11,13 @@ info.elexis.server info.elexis.server.parent - 3.12.0-SNAPSHOT + 3.13.0-SNAPSHOT ../releng/es.parent info.elexis.jaxrs.service.test es.core.connector.elexis.test es.fhir.rest.core.test -