Merge branch 'master' into dependabot/maven/org.eclipse.transformer-t…

…ransformer-maven-plugin-1.0.0
eclipse-lyo · Oct 22, 2024 · 18d80c9 · 18d80c9
2 parents 79d1d83 + 514a854
commit 18d80c9
Show file tree

Hide file tree

Showing 44 changed files with 772 additions and 745 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,7 +7,7 @@ version: 2
 updates:
   - package-ecosystem: "maven" # See documentation for possible values
     directory: "/" # Location of package manifests
-    open-pull-requests-limit: 30
+    open-pull-requests-limit: 50
     schedule:
       interval: "daily"
   - package-ecosystem: "github-actions" # See documentation for possible values

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -27,12 +27,9 @@ jobs:
         experimental: [false]
         # jena 3.x has some locking problems under JDK 16/17
         include:
-          - jdk: '20'
-            distribution: zulu
-            experimental: true
           - jdk: '21'
             distribution: zulu
-            experimental: true
+            experimental: false
     continue-on-error: ${{ matrix.experimental }}
 
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,18 @@
 # Eclipse Lyo changelog
 
-## [6.0.0-SNAPSHOT]
+## [7.0.0-SNAPSHOT]
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+- Dependency to deprecated oslc4j-json4j-provider
+### Fixed
+
+## [6.0.0]
 
 ### Security
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -2,22 +2,29 @@ pipeline {
   agent any
   options {
     timeout(time: 40, unit: 'MINUTES')   // timeout on whole pipeline job
+    disableConcurrentBuilds(abortPrevious: false)
   }
   tools {
     maven 'apache-maven-latest'
     jdk 'temurin-jdk17-latest'
   }
+  triggers {
+    pollSCM('H/10 * * * *')
+  }
   stages {
     stage('SonarCloud') {
       when {
         allOf {
-          triggeredBy 'SCMTrigger'
+          // triggeredBy 'SCMTrigger'
           not {
             environment name: 'CHANGE_AUTHOR', value: 'dependabot[bot]'
           }
           not {
             environment name: 'CHANGE_AUTHOR', value: 'dependabot-preview[bot]'
           }
+          not {
+            branch pattern: 'dependabot/*', comparator: 'REGEXP'
+          }
         }
       }
       environment {
@@ -27,8 +34,8 @@ pipeline {
         withCredentials([string(credentialsId: 'sonarcloud-token', variable: 'SONARCLOUD_TOKEN')]) {
           withSonarQubeEnv('SonarCloud.io') {
             script {
-              def sonar_pr = ""
-              if(env.CHANGE_ID) {
+              def sonar_pr = ''
+              if (env.CHANGE_ID) {
                 sonar_pr += " -Dsonar.pullrequest.provider=GitHub -Dsonar.pullrequest.github.repository=eclipse/${env.PROJECT_NAME} -Dsonar.pullrequest.key=${env.CHANGE_ID} -Dsonar.pullrequest.branch=${env.CHANGE_BRANCH}"
               }
               sh '''
@@ -41,7 +48,6 @@ pipeline {
     }
     stage('Publish (OSSRH)') {
       when {
-        triggeredBy 'SCMTrigger'
         anyOf {
           branch 'master'
           branch 'main'
@@ -89,7 +95,6 @@ pipeline {
     }
     stage('Publish (Eclipse)') {
       when {
-        triggeredBy 'SCMTrigger'
         anyOf {
           branch 'master'
           branch 'main'

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ![GitHub Actions Status (master)](https://img.shields.io/github/actions/workflow/status/eclipse/lyo/maven.yml?branch=master&label=GH%20Actions)
 [![](https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.eclipse.org%2Flyo%2Fjob%2FLyo%2520multibranch%2Fjob%2Fmaster%2F&label=Eclipse%20Jenkins)](https://ci.eclipse.org/lyo/job/Lyo%20multibranch/job/master/)
-[![](https://img.shields.io/badge/javadoc-5.1.1.Final-blue.svg)](https://download.eclipse.org/lyo/docs/all/5.1.1.Final/apidocs/)
+[![](https://img.shields.io/badge/javadoc-6.0.0.Final-blue.svg)](https://download.eclipse.org/lyo/docs/all/6.0.0.Final/apidocs/)
 [![](https://img.shields.io/badge/javadoc-latest-blue.svg)](https://download.eclipse.org/lyo/docs/all/latest/apidocs/)
 [![Discourse users](https://img.shields.io/discourse/users?color=28bd84&server=https%3A%2F%2Fforum.open-services.net%2F)](https://forum.open-services.net/)
 
@@ -66,12 +66,15 @@ See under [validation/README](validation/README.md).
 <!-- BEGIN YAML TABLE -->
 | Repo | Version | Status | PRs | Activity |
 | ---- | ------- | ------ | --- | -------- |
-| [oslc-op/refimpl](https://github.com/oslc-op/refimpl) | ![](https://img.shields.io/badge/Lyo-6.0.0--S-BCED09) | ![](https://github.com/oslc-op/refimpl/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/oslc-op/refimpl?label=PR)](https://github.com/oslc-op/refimpl/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/oslc-op/refimpl) |
-| [danlz/lyo-in-spring-boot](https://github.com/danlz/lyo-in-spring-boot) | ![](https://img.shields.io/badge/Lyo-6.0.0--S-BCED09) | N/A | [![](https://img.shields.io/github/issues-pr/danlz/lyo-in-spring-boot?label=PR)](https://github.com/danlz/lyo-in-spring-boot/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/danlz/lyo-in-spring-boot) |
-| [oslc-op/sysml-oslc-server](https://github.com/oslc-op/sysml-oslc-server) | ![](https://img.shields.io/badge/Lyo-5.1.1-brightgreen) | ![](https://github.com/oslc-op/sysml-oslc-server/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/oslc-op/sysml-oslc-server?label=PR)](https://github.com/oslc-op/sysml-oslc-server/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/oslc-op/sysml-oslc-server) |
+| [oslc-op/refimpl](https://github.com/oslc-op/refimpl) | ![](https://img.shields.io/badge/Lyo-6.0.0-brightgreen) | ![](https://github.com/oslc-op/refimpl/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/oslc-op/refimpl?label=PR)](https://github.com/oslc-op/refimpl/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/oslc-op/refimpl) |
+| [lyo-samples/lyo-client-samples](https://github.com/OSLC/lyo-samples) | ![](https://img.shields.io/badge/Lyo-6.0.0-brightgreen) | ![](https://github.com/OSLC/lyo-samples/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/OSLC/lyo-samples?label=PR)](https://github.com/OSLC/lyo-samples/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/lyo-samples) |
+| [danlz/lyo-in-spring-boot](https://github.com/danlz/lyo-in-spring-boot) | ![](https://img.shields.io/badge/Lyo-6.0.0-brightgreen) | ![](https://github.com/danlz/lyo-in-spring-boot/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/danlz/lyo-in-spring-boot?label=PR)](https://github.com/danlz/lyo-in-spring-boot/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/danlz/lyo-in-spring-boot) |
+| [oslc-op/sysml-oslc-server](https://github.com/oslc-op/sysml-oslc-server) | ![](https://img.shields.io/badge/Lyo-5.1.1-17C3B2) | ![](https://github.com/oslc-op/sysml-oslc-server/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/oslc-op/sysml-oslc-server?label=PR)](https://github.com/oslc-op/sysml-oslc-server/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/oslc-op/sysml-oslc-server) |
 | [OSLC/lyo-adaptor-sample-modelling](https://github.com/OSLC/lyo-adaptor-sample-modelling) | ![](https://img.shields.io/badge/Lyo-5.0.1.CR-7B1E7A) | ![](https://github.com/OSLC/lyo-adaptor-sample-modelling/actions/workflows/maven.yml/badge.svg?branch=main-5.x) | [![](https://img.shields.io/github/issues-pr/OSLC/lyo-adaptor-sample-modelling?label=PR)](https://github.com/OSLC/lyo-adaptor-sample-modelling/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/lyo-adaptor-sample-modelling) |
-| [lyo-samples/lyo-client-samples](https://github.com/OSLC/lyo-samples) | ![](https://img.shields.io/badge/Lyo-5.2.0--S-E77728) | ![](https://github.com/OSLC/lyo-samples/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/OSLC/lyo-samples?label=PR)](https://github.com/OSLC/lyo-samples/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/lyo-samples) |
+| [vojtechspevak/CapellaOslcAdapter](https://github.com/vojtechspevak/CapellaOslcAdapter) | ![](https://img.shields.io/badge/Lyo-4.0.0-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/vojtechspevak/CapellaOslcAdapter?label=PR)](https://github.com/vojtechspevak/CapellaOslcAdapter/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/vojtechspevak/CapellaOslcAdapter) |
+| [VeriFIT/unite](https://github.com/VeriFIT/unite) | ![](https://img.shields.io/badge/Lyo-4.0.0-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/VeriFIT/unite?label=PR)](https://github.com/VeriFIT/unite/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/VeriFIT/unite) |
 | [lyo-samples/client-oauth-discovery-dui](https://github.com/OSLC/lyo-samples) | ![](https://img.shields.io/badge/Lyo-4.0.0-f42020) | ![](https://github.com/OSLC/lyo-samples/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/OSLC/lyo-samples?label=PR)](https://github.com/OSLC/lyo-samples/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/lyo-samples) |
+| [tkratochvila/VerifyServer](https://github.com/tkratochvila/VerifyServer) | ![](https://img.shields.io/badge/Lyo-2.4.0.M1-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/tkratochvila/VerifyServer?label=PR)](https://github.com/tkratochvila/VerifyServer/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/tkratochvila/VerifyServer) |
 | [OSLC/lyo-adaptor-bugzilla](https://github.com/OSLC/lyo-adaptor-bugzilla) | ![](https://img.shields.io/badge/Lyo-2.4.0-f42020) | ![](https://github.com/OSLC/lyo-adaptor-bugzilla/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/OSLC/lyo-adaptor-bugzilla?label=PR)](https://github.com/OSLC/lyo-adaptor-bugzilla/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/lyo-adaptor-bugzilla) |
 | [OSLC/iotp-adaptor](https://github.com/OSLC/iotp-adaptor) | ![](https://img.shields.io/badge/Lyo-2.4.0-f42020) | ![](https://github.com/OSLC/iotp-adaptor/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/OSLC/iotp-adaptor?label=PR)](https://github.com/OSLC/iotp-adaptor/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/iotp-adaptor) |
 | [OSLC/oslc-adapter-jama](https://github.com/OSLC/oslc-adapter-jama) | ![](https://img.shields.io/badge/Lyo-2.4.0-f42020) | ![](https://github.com/OSLC/oslc-adapter-jama/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/OSLC/oslc-adapter-jama?label=PR)](https://github.com/OSLC/oslc-adapter-jama/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/oslc-adapter-jama) |

diff --git a/client/oslc-client-base/pom.xml b/client/oslc-client-base/pom.xml
@@ -6,11 +6,11 @@
   <parent>
     <groupId>org.eclipse.lyo.clients</groupId>
     <artifactId>clients-parent</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>7.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>oslc-client-base</artifactId>
-  <version>6.0.0-SNAPSHOT</version>
+  <version>7.0.0-SNAPSHOT</version>
   <name>Lyo :: Client :: Base</name>
 
   <properties>

diff --git a/client/oslc-client/pom.xml b/client/oslc-client/pom.xml
@@ -6,12 +6,12 @@
   <parent>
     <groupId>org.eclipse.lyo.clients</groupId>
     <artifactId>clients-parent</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>7.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>oslc-client</artifactId>
-  <version>6.0.0-SNAPSHOT</version>
+  <version>7.0.0-SNAPSHOT</version>
   <name>Lyo :: Client :: OSLC JAX-RS 2.0 (new)</name>
   <description>Eclipse Lyo OSLC Java client based on OSLC4J and JAX-RS 2.0</description>
 
@@ -101,11 +101,6 @@
       <artifactId>oslc4j-jena-provider</artifactId>
       <version>${v.lyo}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.lyo.oslc4j.core</groupId>
-      <artifactId>oslc4j-json4j-provider</artifactId>
-      <version>${v.lyo}</version>
-    </dependency>
 
     <dependency>
       <groupId>jakarta.servlet</groupId>