From 73a78a0cd95b1b461284aedd334cef148b96c3c8 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Thu, 16 Nov 2023 08:18:56 +0100 Subject: [PATCH 001/126] chore: log a warn when Lyo OGM fails to invoke a setter (#433) --- .../oslc4j/provider/json4j/JsonHelper.java | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/core/oslc4j-core-wink/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/JsonHelper.java b/core/oslc4j-core-wink/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/JsonHelper.java index 8c93718c9..cdee7a04b 100644 --- a/core/oslc4j-core-wink/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/JsonHelper.java +++ b/core/oslc4j-core-wink/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/JsonHelper.java @@ -44,7 +44,6 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import java.util.logging.Logger; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; @@ -82,6 +81,8 @@ import org.eclipse.lyo.oslc4j.core.model.ResponseInfo; import org.eclipse.lyo.oslc4j.core.model.TypeFactory; import org.eclipse.lyo.oslc4j.core.model.XMLLiteral; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Use JSON-LD support in Jena provider. @@ -141,7 +142,7 @@ public final class JsonHelper */ public static final String OSLC4J_READ_SPECIAL_NUMS = "org.eclipse.lyo.oslc4j.readSpecialNumberValues"; - private static final Logger logger = Logger.getLogger(JsonHelper.class.getName()); + private static final Logger logger = LoggerFactory.getLogger(JsonHelper.class.getName()); private JsonHelper() { @@ -936,7 +937,7 @@ else if (properties instanceof NestedWildcardProperties) if (value == null && ! onlyNested) { - logger.warning("Could not add extended property " + extendedProperty.getKey() + " for resource " + extendedResource.getAbout()); + logger.warn("Could not add extended property " + extendedProperty.getKey() + " for resource " + extendedResource.getAbout()); } else { @@ -1615,7 +1616,7 @@ else if (bean instanceof IReifiedResource) { if (!JSON_PROPERTY_PREFIXES.equals(prefixedName)) { - logger.warning("Ignored JSON property '" + + logger.warn("Ignored JSON property '" + prefixedName + "'."); } @@ -1656,7 +1657,7 @@ else if (RDF_TYPE_URI.equals(propertyDefinition)) { if (extendedProperties == null) { - logger.fine("Set method not found for object type: " + + logger.debug("Set method not found for object type: " + beanClass.getName() + ", propertyDefinition: " + propertyDefinition); @@ -1717,9 +1718,15 @@ else if (Collection.class.isAssignableFrom(setMethodComponentParameterClass)) if (parameter != null) { - setMethod.invoke(bean, - new Object[] {parameter}); - } + try { + setMethod.invoke(bean, + new Object[] {parameter}); + } catch (IllegalAccessException | IllegalArgumentException | + InvocationTargetException e) { + logger.warn("Failed to set property {}='{}' via '{}'", prefixedName, parameter, setMethod.getName()); + throw e; + } + } } } } @@ -2146,7 +2153,7 @@ else if (jsonValue == null) { if (readSpecialNumberValues()) { - logger.warning("Null double value treated as NaN."); + logger.warn("Null double value treated as NaN."); return Double.NaN; } else @@ -2160,7 +2167,7 @@ else if (jsonValue == null) { if (readSpecialNumberValues()) { - logger.warning("Null float value treated as NaN."); + logger.warn("Null float value treated as NaN."); return Float.NaN; } else From cb48bf97629e5af267d35d3f9fd6cdb75c0b1351 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 23:32:22 +0100 Subject: [PATCH 002/126] chore: Bump org.apache.maven.plugins:maven-surefire-plugin from 3.0.0 to 3.2.2 (#452) Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0 to 3.2.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0...surefire-3.2.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f53c35d9e..92f1704e3 100644 --- a/pom.xml +++ b/pom.xml @@ -484,7 +484,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.2.2 false From ee65ff0589ecc165275c69995f69fb4e1e358307 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 23:38:43 +0100 Subject: [PATCH 003/126] chore: Bump commons-codec:commons-codec from 1.15 to 1.16.0 (#448) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 92f1704e3..aa788d0e5 100644 --- a/pom.xml +++ b/pom.xml @@ -376,7 +376,7 @@ commons-codec commons-codec - 1.15 + 1.16.0 com.google.guava From 2d07f633fdff711408fcaa50cae8e67dbcc15796 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 23:44:15 +0100 Subject: [PATCH 004/126] chore: Bump org.apache.maven.plugins:maven-source-plugin from 3.2.1 to 3.3.0 (#451) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa788d0e5..9da3996c5 100644 --- a/pom.xml +++ b/pom.xml @@ -431,7 +431,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources From f1f6e0cd362a558602ce1843b0ca4dcb82b8aa2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 23:52:13 +0100 Subject: [PATCH 005/126] chore: Bump org.apache.maven.plugins:maven-resources-plugin from 3.2.0 to 3.3.1 (#449) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9da3996c5..9dae90d48 100644 --- a/pom.xml +++ b/pom.xml @@ -493,7 +493,7 @@ org.apache.maven.plugins maven-resources-plugin - 3.2.0 + 3.3.1 org.apache.maven.plugins From 4cc5a55268b3f524ba16f8f2934252f9f4c57a1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 23:52:25 +0100 Subject: [PATCH 006/126] chore: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.5.0 to 3.6.3 (#443) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9dae90d48..9e44b7569 100644 --- a/pom.xml +++ b/pom.xml @@ -444,7 +444,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.3 From 5ddf5eda78cf013b06808d32fcb0149a50be24bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 23:52:33 +0100 Subject: [PATCH 007/126] chore: Bump org.mockito:mockito-core from 5.7.0 to 5.8.0 (#441) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e44b7569..487ce6373 100644 --- a/pom.xml +++ b/pom.xml @@ -349,7 +349,7 @@ org.mockito mockito-core - 5.7.0 + 5.8.0 test From a98534895e95ee12da1fe9735d1562aa2ec31e4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 23:52:40 +0100 Subject: [PATCH 008/126] chore: Bump commons-io:commons-io from 2.11.0 to 2.15.1 (#450) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 487ce6373..19408c210 100644 --- a/pom.xml +++ b/pom.xml @@ -412,7 +412,7 @@ commons-io commons-io - 2.11.0 + 2.15.1 From dfcc8675d67b9b370b54364243f9f617a101ab0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 23:52:54 +0100 Subject: [PATCH 009/126] chore: Bump org.codehaus.mojo:versions-maven-plugin from 2.16.1 to 2.16.2 (#435) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 19408c210..4ef15b189 100644 --- a/pom.xml +++ b/pom.xml @@ -609,7 +609,7 @@ org.codehaus.mojo versions-maven-plugin - 2.16.1 + 2.16.2 false From 2949d323cde8d8bbaf89b1a108a3c25721e6f954 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 23:53:02 +0100 Subject: [PATCH 010/126] chore: Bump v.kotlin from 1.9.20 to 1.9.21 (#436) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ef15b189..a032bdec1 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ ${project.version} - 1.9.20 + 1.9.21 1.9.10 2.35 From 31eebe91fda9eae73b2990d97047b65535099124 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 23:53:13 +0100 Subject: [PATCH 011/126] chore: Bump actions/setup-java from 3 to 4 (#440) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/maven.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5ada4a696..fb60dc1a9 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -54,7 +54,7 @@ jobs: # ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven- # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'temurin' # See 'Supported distributions' for available options java-version: '17' diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6a102d32c..c1d7800af 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -41,7 +41,7 @@ jobs: with: show-progress: false - name: Set up JDK ${{ matrix.jdk }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.jdk }} From 765621f2384428094dff9d6c472474296320e4da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 22:49:59 +0100 Subject: [PATCH 012/126] chore: Bump org.apache.maven.plugins:maven-enforcer-plugin (#455) Bumps [org.apache.maven.plugins:maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.3.0 to 3.4.1. - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.3.0...enforcer-3.4.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a032bdec1..dcd15bdf8 100644 --- a/pom.xml +++ b/pom.xml @@ -508,7 +508,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.4.1 enforce-maven From 09271f116f0cf9d1e894883c08e76a0b6cc483b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 22:52:32 +0100 Subject: [PATCH 013/126] chore: Bump org.apache.maven.plugins:maven-clean-plugin (#444) Bumps [org.apache.maven.plugins:maven-clean-plugin](https://github.com/apache/maven-clean-plugin) from 3.2.0 to 3.3.2. - [Release notes](https://github.com/apache/maven-clean-plugin/releases) - [Commits](https://github.com/apache/maven-clean-plugin/compare/maven-clean-plugin-3.2.0...maven-clean-plugin-3.3.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-clean-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dcd15bdf8..d3486bd11 100644 --- a/pom.xml +++ b/pom.xml @@ -585,7 +585,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.2.0 + 3.3.2 org.apache.maven.plugins From 6219a59ae56cffedd326a20f5c2a17fe0d0b0de2 Mon Sep 17 00:00:00 2001 From: Jad El-khoury <121724599+Jad-el-khoury@users.noreply.github.com> Date: Fri, 8 Dec 2023 12:25:11 +0100 Subject: [PATCH 014/126] changed scope of dependencies in oauth-webapp to avoid inclusion multiple times during runtime (#439) changed scope of dependencies in oauth-webapp to avoid inclusion multiple times during runtime --- CHANGELOG.md | 1 + server/oauth-webapp/pom.xml | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b5d0db6e..ee11e413e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Kotlin 1.9.0 is used; `kotlin-stdlib-jdk8` dependency was replaced with `kotlin-stdlib` due to [Kotlin updates](https://kotlinlang.org/docs/whatsnew18.html#updated-jvm-compilation-target). - Allow application to reset the oauth token cached within the server, when it deems that it is no longer valid - 🧨Corrected cardinality and range of the oslc_config:acceptedBy property (from String[0..1] to Resource[0..*]) +- changed scope of dependencies in oauth-webapp to avoid inclusion multiple times during runtime. ### Deprecated diff --git a/server/oauth-webapp/pom.xml b/server/oauth-webapp/pom.xml index 8781c0316..747710a88 100644 --- a/server/oauth-webapp/pom.xml +++ b/server/oauth-webapp/pom.xml @@ -21,10 +21,12 @@ net.oauth.core oauth + provided net.oauth.core oauth-provider + provided @@ -32,6 +34,7 @@ org.eclipse.lyo.server oauth-core ${v.lyo} + provided @@ -55,10 +58,12 @@ org.slf4j slf4j-api + provided org.apache.wink wink-json4j + provided From a8d32d41c608247337cb36946c506c8f75c51cab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 22:53:00 +0100 Subject: [PATCH 015/126] chore: Bump org.apache.maven.plugins:maven-compiler-plugin (#465) Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.12.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d3486bd11..309dd3e80 100644 --- a/pom.xml +++ b/pom.xml @@ -423,7 +423,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.1 -Xlint:fallthrough,unchecked,removal,deprecation,dep-ann,varargs,overloads,serial,try,finally From 85f175d416245597ec35e79e5763cd8f51183581 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 22:54:33 +0100 Subject: [PATCH 016/126] chore: Bump github/codeql-action from 2 to 3 (#461) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fb60dc1a9..f66d23d3e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -39,7 +39,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -59,7 +59,7 @@ jobs: distribution: 'temurin' # See 'Supported distributions' for available options java-version: '17' - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹ️ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -73,4 +73,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 From 553c32692c2778c8ba36b94a974069b135eff3f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 23:58:55 +0100 Subject: [PATCH 017/126] chore: Bump org.apache.tomcat.embed:tomcat-embed-core (#473) Bumps org.apache.tomcat.embed:tomcat-embed-core from 8.5.78 to 8.5.96. --- updated-dependencies: - dependency-name: org.apache.tomcat.embed:tomcat-embed-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 309dd3e80..5a5dfd54c 100644 --- a/pom.xml +++ b/pom.xml @@ -407,7 +407,7 @@ org.apache.tomcat.embed tomcat-embed-core - 8.5.78 + 8.5.96 commons-io From 528278fb8f819838634007d7d9dcc1fff642440a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 21:36:54 +0100 Subject: [PATCH 018/126] chore: Bump org.apache.maven.plugins:maven-failsafe-plugin (#476) Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.0.0 to 3.2.5. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0...surefire-3.2.5) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- store/store-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml index 69dca5e32..2590f8d55 100644 --- a/store/store-core/pom.xml +++ b/store/store-core/pom.xml @@ -139,7 +139,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.2.5 From ac1df733ef3a7256567783ca5b374cc276cd5e35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 21:38:42 +0100 Subject: [PATCH 019/126] chore: Bump org.apache.maven.plugins:maven-surefire-plugin (#475) Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.2 to 3.2.5. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.2...surefire-3.2.5) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5a5dfd54c..c734a8021 100644 --- a/pom.xml +++ b/pom.xml @@ -484,7 +484,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.2 + 3.2.5 false From 3a56730c4d37335b920dd083ed95826097049093 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 20:56:00 +0100 Subject: [PATCH 020/126] chore: Bump org.apache.tomcat.embed:tomcat-embed-core (#477) Bumps org.apache.tomcat.embed:tomcat-embed-core from 8.5.96 to 8.5.98. --- updated-dependencies: - dependency-name: org.apache.tomcat.embed:tomcat-embed-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c734a8021..74cb72757 100644 --- a/pom.xml +++ b/pom.xml @@ -407,7 +407,7 @@ org.apache.tomcat.embed tomcat-embed-core - 8.5.96 + 8.5.98 commons-io From 6a0ef9ecd97ae1e13b70397c0d656d92de7b8d06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 21:03:12 +0100 Subject: [PATCH 021/126] chore: Bump org.apache.tomcat.embed:tomcat-embed-core from 8.5.98 to 8.5.99 (#488) Bumps org.apache.tomcat.embed:tomcat-embed-core from 8.5.98 to 8.5.99. --- updated-dependencies: - dependency-name: org.apache.tomcat.embed:tomcat-embed-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 74cb72757..199a4b38b 100644 --- a/pom.xml +++ b/pom.xml @@ -407,7 +407,7 @@ org.apache.tomcat.embed tomcat-embed-core - 8.5.98 + 8.5.99 commons-io From 75ed2682b10152c4521b4bfa413f950186e08d2a Mon Sep 17 00:00:00 2001 From: Jad El-khoury Date: Wed, 27 Mar 2024 11:27:58 +0100 Subject: [PATCH 022/126] release 6.0.0.Alpha --- client/oslc-client-base/pom.xml | 4 ++-- client/oslc-client/pom.xml | 4 ++-- client/oslc-java-client-resources/pom.xml | 4 ++-- client/pom.xml | 4 ++-- core/lyo-core-model/pom.xml | 2 +- core/lyo-core-settings/pom.xml | 2 +- core/oslc-query/pom.xml | 2 +- core/oslc-trs/pom.xml | 2 +- core/oslc4j-core-build/pom.xml | 2 +- core/oslc4j-core-wink/pom.xml | 2 +- core/oslc4j-core/pom.xml | 2 +- core/oslc4j-jena-provider/pom.xml | 2 +- core/oslc4j-json4j-provider/pom.xml | 2 +- core/oslc4j-utils/pom.xml | 2 +- core/shacl/pom.xml | 2 +- domains/oslc-domains/pom.xml | 4 ++-- pom.xml | 2 +- server/oauth-consumer-store/pom.xml | 2 +- server/oauth-core/pom.xml | 2 +- server/oauth-webapp/pom.xml | 2 +- server/oslc-ui-model/pom.xml | 2 +- server/pom.xml | 2 +- store/pom.xml | 4 ++-- store/store-core/pom.xml | 2 +- trs/client/client-source-mqtt/pom.xml | 2 +- trs/client/pom.xml | 2 +- trs/client/trs-client/pom.xml | 2 +- trs/server/pom.xml | 4 ++-- validation/pom.xml | 4 ++-- 29 files changed, 37 insertions(+), 37 deletions(-) diff --git a/client/oslc-client-base/pom.xml b/client/oslc-client-base/pom.xml index 8b3e20a3e..1777ae316 100644 --- a/client/oslc-client-base/pom.xml +++ b/client/oslc-client-base/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha oslc-client-base - 6.0.0-SNAPSHOT + 6.0.0.Alpha Lyo :: Client :: Base diff --git a/client/oslc-client/pom.xml b/client/oslc-client/pom.xml index 880bceb30..a5d1907e5 100644 --- a/client/oslc-client/pom.xml +++ b/client/oslc-client/pom.xml @@ -5,12 +5,12 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../pom.xml oslc-client - 6.0.0-SNAPSHOT + 6.0.0.Alpha Lyo :: Client :: OSLC JAX-RS 2.0 (new) Eclipse Lyo OSLC Java client based on OSLC4J and JAX-RS 2.0 diff --git a/client/oslc-java-client-resources/pom.xml b/client/oslc-java-client-resources/pom.xml index 104065f1e..5add7ab1d 100644 --- a/client/oslc-java-client-resources/pom.xml +++ b/client/oslc-java-client-resources/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha oslc-java-client-resources - 6.0.0-SNAPSHOT + 6.0.0.Alpha Lyo :: Client :: Resources (legacy) diff --git a/client/pom.xml b/client/pom.xml index c9e8fa16e..d04c56c06 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,13 +6,13 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha pom Lyo :: Client :: _Parent org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../pom.xml diff --git a/core/lyo-core-model/pom.xml b/core/lyo-core-model/pom.xml index 6f95f3530..262754acd 100644 --- a/core/lyo-core-model/pom.xml +++ b/core/lyo-core-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../oslc4j-core-build/pom.xml Lyo :: Core :: OSLC Core model diff --git a/core/lyo-core-settings/pom.xml b/core/lyo-core-settings/pom.xml index 0c149d965..227969fbd 100644 --- a/core/lyo-core-settings/pom.xml +++ b/core/lyo-core-settings/pom.xml @@ -5,7 +5,7 @@ oslc4j-core-build org.eclipse.lyo.oslc4j.core - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../oslc4j-core-build 4.0.0 diff --git a/core/oslc-query/pom.xml b/core/oslc-query/pom.xml index 26d551cdf..e0ec778ec 100644 --- a/core/oslc-query/pom.xml +++ b/core/oslc-query/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../oslc4j-core-build/pom.xml diff --git a/core/oslc-trs/pom.xml b/core/oslc-trs/pom.xml index e40ec4c13..a80e3867d 100644 --- a/core/oslc-trs/pom.xml +++ b/core/oslc-trs/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../oslc4j-core-build/pom.xml diff --git a/core/oslc4j-core-build/pom.xml b/core/oslc4j-core-build/pom.xml index 8741150dd..16dbb9f0e 100644 --- a/core/oslc4j-core-build/pom.xml +++ b/core/oslc4j-core-build/pom.xml @@ -8,7 +8,7 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../../pom.xml diff --git a/core/oslc4j-core-wink/pom.xml b/core/oslc4j-core-wink/pom.xml index 089f25bcb..1f140c299 100644 --- a/core/oslc4j-core-wink/pom.xml +++ b/core/oslc4j-core-wink/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../oslc4j-core-build/pom.xml oslc4j-core-wink diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml index 035bf39bd..65c93ecbd 100644 --- a/core/oslc4j-core/pom.xml +++ b/core/oslc4j-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../oslc4j-core-build/pom.xml oslc4j-core diff --git a/core/oslc4j-jena-provider/pom.xml b/core/oslc4j-jena-provider/pom.xml index 2be514698..762011a66 100644 --- a/core/oslc4j-jena-provider/pom.xml +++ b/core/oslc4j-jena-provider/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../oslc4j-core-build/pom.xml oslc4j-jena-provider diff --git a/core/oslc4j-json4j-provider/pom.xml b/core/oslc4j-json4j-provider/pom.xml index 9dcccd045..d248e7bc3 100644 --- a/core/oslc4j-json4j-provider/pom.xml +++ b/core/oslc4j-json4j-provider/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../oslc4j-core-build/pom.xml oslc4j-json4j-provider diff --git a/core/oslc4j-utils/pom.xml b/core/oslc4j-utils/pom.xml index 2b5b02019..4f70e1a8e 100644 --- a/core/oslc4j-utils/pom.xml +++ b/core/oslc4j-utils/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../oslc4j-core-build/pom.xml Lyo :: Core :: Utilities diff --git a/core/shacl/pom.xml b/core/shacl/pom.xml index 5f95257f7..16a0fea7e 100644 --- a/core/shacl/pom.xml +++ b/core/shacl/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../oslc4j-core-build/pom.xml diff --git a/domains/oslc-domains/pom.xml b/domains/oslc-domains/pom.xml index 70da282c2..f82a62cbc 100644 --- a/domains/oslc-domains/pom.xml +++ b/domains/oslc-domains/pom.xml @@ -9,14 +9,14 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../../pom.xml org.eclipse.lyo oslc-domains - 6.0.0-SNAPSHOT + 6.0.0.Alpha jar Lyo :: Domains diff --git a/pom.xml b/pom.xml index 199a4b38b..1bafd906a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha pom Lyo :: _Parent diff --git a/server/oauth-consumer-store/pom.xml b/server/oauth-consumer-store/pom.xml index 338175dbc..abea9323f 100644 --- a/server/oauth-consumer-store/pom.xml +++ b/server/oauth-consumer-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-core/pom.xml b/server/oauth-core/pom.xml index 0e407377b..1f3c96e2a 100644 --- a/server/oauth-core/pom.xml +++ b/server/oauth-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-webapp/pom.xml b/server/oauth-webapp/pom.xml index 747710a88..1adc28e90 100644 --- a/server/oauth-webapp/pom.xml +++ b/server/oauth-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../pom.xml org.eclipse.lyo.server diff --git a/server/oslc-ui-model/pom.xml b/server/oslc-ui-model/pom.xml index 005f0a519..ff75f9ea4 100644 --- a/server/oslc-ui-model/pom.xml +++ b/server/oslc-ui-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../pom.xml org.eclipse.lyo.server diff --git a/server/pom.xml b/server/pom.xml index ca3e40686..f18bfdf91 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../pom.xml diff --git a/store/pom.xml b/store/pom.xml index 712de061e..0872d648a 100644 --- a/store/pom.xml +++ b/store/pom.xml @@ -6,14 +6,14 @@ org.eclipse.lyo.store store-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha pom Lyo :: Store :: _Parent org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml index 2590f8d55..39b03dce0 100644 --- a/store/store-core/pom.xml +++ b/store/store-core/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lyo.store store-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../pom.xml diff --git a/trs/client/client-source-mqtt/pom.xml b/trs/client/client-source-mqtt/pom.xml index 7bc1951f2..39d2ca0fc 100644 --- a/trs/client/client-source-mqtt/pom.xml +++ b/trs/client/client-source-mqtt/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../pom.xml diff --git a/trs/client/pom.xml b/trs/client/pom.xml index 7ece1f8c2..c45b539af 100644 --- a/trs/client/pom.xml +++ b/trs/client/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../../pom.xml diff --git a/trs/client/trs-client/pom.xml b/trs/client/trs-client/pom.xml index 45259883b..93c623d39 100644 --- a/trs/client/trs-client/pom.xml +++ b/trs/client/trs-client/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../pom.xml diff --git a/trs/server/pom.xml b/trs/server/pom.xml index 467ce2f7f..e8490c25a 100644 --- a/trs/server/pom.xml +++ b/trs/server/pom.xml @@ -20,13 +20,13 @@ 4.0.0 org.eclipse.lyo.trs trs-server - 6.0.0-SNAPSHOT + 6.0.0.Alpha Lyo :: TRS :: Server org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../../pom.xml diff --git a/validation/pom.xml b/validation/pom.xml index a0ddb9500..af6035cf8 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -3,13 +3,13 @@ 4.0.0 lyo-validation - 6.0.0-SNAPSHOT + 6.0.0.Alpha Lyo :: Validation org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha ../pom.xml From 3299c9f9662785e2978b2482038c5787f9a0029f Mon Sep 17 00:00:00 2001 From: Jad El-khoury Date: Wed, 27 Mar 2024 11:57:03 +0100 Subject: [PATCH 023/126] Revert "release 6.0.0.Alpha" This reverts commit 75ed2682b10152c4521b4bfa413f950186e08d2a. --- client/oslc-client-base/pom.xml | 4 ++-- client/oslc-client/pom.xml | 4 ++-- client/oslc-java-client-resources/pom.xml | 4 ++-- client/pom.xml | 4 ++-- core/lyo-core-model/pom.xml | 2 +- core/lyo-core-settings/pom.xml | 2 +- core/oslc-query/pom.xml | 2 +- core/oslc-trs/pom.xml | 2 +- core/oslc4j-core-build/pom.xml | 2 +- core/oslc4j-core-wink/pom.xml | 2 +- core/oslc4j-core/pom.xml | 2 +- core/oslc4j-jena-provider/pom.xml | 2 +- core/oslc4j-json4j-provider/pom.xml | 2 +- core/oslc4j-utils/pom.xml | 2 +- core/shacl/pom.xml | 2 +- domains/oslc-domains/pom.xml | 4 ++-- pom.xml | 2 +- server/oauth-consumer-store/pom.xml | 2 +- server/oauth-core/pom.xml | 2 +- server/oauth-webapp/pom.xml | 2 +- server/oslc-ui-model/pom.xml | 2 +- server/pom.xml | 2 +- store/pom.xml | 4 ++-- store/store-core/pom.xml | 2 +- trs/client/client-source-mqtt/pom.xml | 2 +- trs/client/pom.xml | 2 +- trs/client/trs-client/pom.xml | 2 +- trs/server/pom.xml | 4 ++-- validation/pom.xml | 4 ++-- 29 files changed, 37 insertions(+), 37 deletions(-) diff --git a/client/oslc-client-base/pom.xml b/client/oslc-client-base/pom.xml index 1777ae316..8b3e20a3e 100644 --- a/client/oslc-client-base/pom.xml +++ b/client/oslc-client-base/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT oslc-client-base - 6.0.0.Alpha + 6.0.0-SNAPSHOT Lyo :: Client :: Base diff --git a/client/oslc-client/pom.xml b/client/oslc-client/pom.xml index a5d1907e5..880bceb30 100644 --- a/client/oslc-client/pom.xml +++ b/client/oslc-client/pom.xml @@ -5,12 +5,12 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../pom.xml oslc-client - 6.0.0.Alpha + 6.0.0-SNAPSHOT Lyo :: Client :: OSLC JAX-RS 2.0 (new) Eclipse Lyo OSLC Java client based on OSLC4J and JAX-RS 2.0 diff --git a/client/oslc-java-client-resources/pom.xml b/client/oslc-java-client-resources/pom.xml index 5add7ab1d..104065f1e 100644 --- a/client/oslc-java-client-resources/pom.xml +++ b/client/oslc-java-client-resources/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT oslc-java-client-resources - 6.0.0.Alpha + 6.0.0-SNAPSHOT Lyo :: Client :: Resources (legacy) diff --git a/client/pom.xml b/client/pom.xml index d04c56c06..c9e8fa16e 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,13 +6,13 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT pom Lyo :: Client :: _Parent org.eclipse.lyo lyo-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../pom.xml diff --git a/core/lyo-core-model/pom.xml b/core/lyo-core-model/pom.xml index 262754acd..6f95f3530 100644 --- a/core/lyo-core-model/pom.xml +++ b/core/lyo-core-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml Lyo :: Core :: OSLC Core model diff --git a/core/lyo-core-settings/pom.xml b/core/lyo-core-settings/pom.xml index 227969fbd..0c149d965 100644 --- a/core/lyo-core-settings/pom.xml +++ b/core/lyo-core-settings/pom.xml @@ -5,7 +5,7 @@ oslc4j-core-build org.eclipse.lyo.oslc4j.core - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../oslc4j-core-build 4.0.0 diff --git a/core/oslc-query/pom.xml b/core/oslc-query/pom.xml index e0ec778ec..26d551cdf 100644 --- a/core/oslc-query/pom.xml +++ b/core/oslc-query/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml diff --git a/core/oslc-trs/pom.xml b/core/oslc-trs/pom.xml index a80e3867d..e40ec4c13 100644 --- a/core/oslc-trs/pom.xml +++ b/core/oslc-trs/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml diff --git a/core/oslc4j-core-build/pom.xml b/core/oslc4j-core-build/pom.xml index 16dbb9f0e..8741150dd 100644 --- a/core/oslc4j-core-build/pom.xml +++ b/core/oslc4j-core-build/pom.xml @@ -8,7 +8,7 @@ org.eclipse.lyo lyo-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../../pom.xml diff --git a/core/oslc4j-core-wink/pom.xml b/core/oslc4j-core-wink/pom.xml index 1f140c299..089f25bcb 100644 --- a/core/oslc4j-core-wink/pom.xml +++ b/core/oslc4j-core-wink/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-core-wink diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml index 65c93ecbd..035bf39bd 100644 --- a/core/oslc4j-core/pom.xml +++ b/core/oslc4j-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-core diff --git a/core/oslc4j-jena-provider/pom.xml b/core/oslc4j-jena-provider/pom.xml index 762011a66..2be514698 100644 --- a/core/oslc4j-jena-provider/pom.xml +++ b/core/oslc4j-jena-provider/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-jena-provider diff --git a/core/oslc4j-json4j-provider/pom.xml b/core/oslc4j-json4j-provider/pom.xml index d248e7bc3..9dcccd045 100644 --- a/core/oslc4j-json4j-provider/pom.xml +++ b/core/oslc4j-json4j-provider/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-json4j-provider diff --git a/core/oslc4j-utils/pom.xml b/core/oslc4j-utils/pom.xml index 4f70e1a8e..2b5b02019 100644 --- a/core/oslc4j-utils/pom.xml +++ b/core/oslc4j-utils/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml Lyo :: Core :: Utilities diff --git a/core/shacl/pom.xml b/core/shacl/pom.xml index 16a0fea7e..5f95257f7 100644 --- a/core/shacl/pom.xml +++ b/core/shacl/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml diff --git a/domains/oslc-domains/pom.xml b/domains/oslc-domains/pom.xml index f82a62cbc..70da282c2 100644 --- a/domains/oslc-domains/pom.xml +++ b/domains/oslc-domains/pom.xml @@ -9,14 +9,14 @@ org.eclipse.lyo lyo-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../../pom.xml org.eclipse.lyo oslc-domains - 6.0.0.Alpha + 6.0.0-SNAPSHOT jar Lyo :: Domains diff --git a/pom.xml b/pom.xml index 1bafd906a..199a4b38b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.lyo lyo-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT pom Lyo :: _Parent diff --git a/server/oauth-consumer-store/pom.xml b/server/oauth-consumer-store/pom.xml index abea9323f..338175dbc 100644 --- a/server/oauth-consumer-store/pom.xml +++ b/server/oauth-consumer-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-core/pom.xml b/server/oauth-core/pom.xml index 1f3c96e2a..0e407377b 100644 --- a/server/oauth-core/pom.xml +++ b/server/oauth-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-webapp/pom.xml b/server/oauth-webapp/pom.xml index 1adc28e90..747710a88 100644 --- a/server/oauth-webapp/pom.xml +++ b/server/oauth-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oslc-ui-model/pom.xml b/server/oslc-ui-model/pom.xml index ff75f9ea4..005f0a519 100644 --- a/server/oslc-ui-model/pom.xml +++ b/server/oslc-ui-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/pom.xml b/server/pom.xml index f18bfdf91..ca3e40686 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../pom.xml diff --git a/store/pom.xml b/store/pom.xml index 0872d648a..712de061e 100644 --- a/store/pom.xml +++ b/store/pom.xml @@ -6,14 +6,14 @@ org.eclipse.lyo.store store-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT pom Lyo :: Store :: _Parent org.eclipse.lyo lyo-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml index 39b03dce0..2590f8d55 100644 --- a/store/store-core/pom.xml +++ b/store/store-core/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lyo.store store-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../pom.xml diff --git a/trs/client/client-source-mqtt/pom.xml b/trs/client/client-source-mqtt/pom.xml index 39d2ca0fc..7bc1951f2 100644 --- a/trs/client/client-source-mqtt/pom.xml +++ b/trs/client/client-source-mqtt/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../pom.xml diff --git a/trs/client/pom.xml b/trs/client/pom.xml index c45b539af..7ece1f8c2 100644 --- a/trs/client/pom.xml +++ b/trs/client/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../../pom.xml diff --git a/trs/client/trs-client/pom.xml b/trs/client/trs-client/pom.xml index 93c623d39..45259883b 100644 --- a/trs/client/trs-client/pom.xml +++ b/trs/client/trs-client/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../pom.xml diff --git a/trs/server/pom.xml b/trs/server/pom.xml index e8490c25a..467ce2f7f 100644 --- a/trs/server/pom.xml +++ b/trs/server/pom.xml @@ -20,13 +20,13 @@ 4.0.0 org.eclipse.lyo.trs trs-server - 6.0.0.Alpha + 6.0.0-SNAPSHOT Lyo :: TRS :: Server org.eclipse.lyo lyo-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../../pom.xml diff --git a/validation/pom.xml b/validation/pom.xml index af6035cf8..a0ddb9500 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -3,13 +3,13 @@ 4.0.0 lyo-validation - 6.0.0.Alpha + 6.0.0-SNAPSHOT Lyo :: Validation org.eclipse.lyo lyo-parent - 6.0.0.Alpha + 6.0.0-SNAPSHOT ../pom.xml From 00fb1365d53dfa61de3ca335876a4ed6ccde784f Mon Sep 17 00:00:00 2001 From: Jad El-khoury <121724599+Jad-el-khoury@users.noreply.github.com> Date: Wed, 27 Mar 2024 14:57:22 +0100 Subject: [PATCH 024/126] 6.0.0.Alpha (#511) 6.0.0.Alpha1 --- client/oslc-client-base/pom.xml | 4 ++-- client/oslc-client/pom.xml | 4 ++-- client/oslc-java-client-resources/pom.xml | 4 ++-- client/pom.xml | 4 ++-- core/lyo-core-model/pom.xml | 2 +- core/lyo-core-settings/pom.xml | 2 +- core/oslc-query/pom.xml | 2 +- core/oslc-trs/pom.xml | 2 +- core/oslc4j-core-build/pom.xml | 2 +- core/oslc4j-core-wink/pom.xml | 2 +- core/oslc4j-core/pom.xml | 2 +- core/oslc4j-jena-provider/pom.xml | 2 +- core/oslc4j-json4j-provider/pom.xml | 2 +- core/oslc4j-utils/pom.xml | 2 +- core/shacl/pom.xml | 2 +- domains/oslc-domains/pom.xml | 4 ++-- pom.xml | 2 +- server/oauth-consumer-store/pom.xml | 2 +- server/oauth-core/pom.xml | 2 +- server/oauth-webapp/pom.xml | 2 +- server/oslc-ui-model/pom.xml | 2 +- server/pom.xml | 2 +- store/pom.xml | 4 ++-- store/store-core/pom.xml | 2 +- trs/client/client-source-mqtt/pom.xml | 2 +- trs/client/pom.xml | 2 +- trs/client/trs-client/pom.xml | 2 +- trs/server/pom.xml | 4 ++-- validation/pom.xml | 4 ++-- 29 files changed, 37 insertions(+), 37 deletions(-) diff --git a/client/oslc-client-base/pom.xml b/client/oslc-client-base/pom.xml index 8b3e20a3e..271ad2686 100644 --- a/client/oslc-client-base/pom.xml +++ b/client/oslc-client-base/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 oslc-client-base - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 Lyo :: Client :: Base diff --git a/client/oslc-client/pom.xml b/client/oslc-client/pom.xml index 880bceb30..f8bdeb999 100644 --- a/client/oslc-client/pom.xml +++ b/client/oslc-client/pom.xml @@ -5,12 +5,12 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../pom.xml oslc-client - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 Lyo :: Client :: OSLC JAX-RS 2.0 (new) Eclipse Lyo OSLC Java client based on OSLC4J and JAX-RS 2.0 diff --git a/client/oslc-java-client-resources/pom.xml b/client/oslc-java-client-resources/pom.xml index 104065f1e..a1f0984fd 100644 --- a/client/oslc-java-client-resources/pom.xml +++ b/client/oslc-java-client-resources/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 oslc-java-client-resources - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 Lyo :: Client :: Resources (legacy) diff --git a/client/pom.xml b/client/pom.xml index c9e8fa16e..da832ef16 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,13 +6,13 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 pom Lyo :: Client :: _Parent org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../pom.xml diff --git a/core/lyo-core-model/pom.xml b/core/lyo-core-model/pom.xml index 6f95f3530..a99806729 100644 --- a/core/lyo-core-model/pom.xml +++ b/core/lyo-core-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../oslc4j-core-build/pom.xml Lyo :: Core :: OSLC Core model diff --git a/core/lyo-core-settings/pom.xml b/core/lyo-core-settings/pom.xml index 0c149d965..2c814d94a 100644 --- a/core/lyo-core-settings/pom.xml +++ b/core/lyo-core-settings/pom.xml @@ -5,7 +5,7 @@ oslc4j-core-build org.eclipse.lyo.oslc4j.core - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../oslc4j-core-build 4.0.0 diff --git a/core/oslc-query/pom.xml b/core/oslc-query/pom.xml index 26d551cdf..cd3862a18 100644 --- a/core/oslc-query/pom.xml +++ b/core/oslc-query/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../oslc4j-core-build/pom.xml diff --git a/core/oslc-trs/pom.xml b/core/oslc-trs/pom.xml index e40ec4c13..b2e5aa11b 100644 --- a/core/oslc-trs/pom.xml +++ b/core/oslc-trs/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../oslc4j-core-build/pom.xml diff --git a/core/oslc4j-core-build/pom.xml b/core/oslc4j-core-build/pom.xml index 8741150dd..5a790b12d 100644 --- a/core/oslc4j-core-build/pom.xml +++ b/core/oslc4j-core-build/pom.xml @@ -8,7 +8,7 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../../pom.xml diff --git a/core/oslc4j-core-wink/pom.xml b/core/oslc4j-core-wink/pom.xml index 089f25bcb..9e83f0b56 100644 --- a/core/oslc4j-core-wink/pom.xml +++ b/core/oslc4j-core-wink/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../oslc4j-core-build/pom.xml oslc4j-core-wink diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml index 035bf39bd..3c7f585e6 100644 --- a/core/oslc4j-core/pom.xml +++ b/core/oslc4j-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../oslc4j-core-build/pom.xml oslc4j-core diff --git a/core/oslc4j-jena-provider/pom.xml b/core/oslc4j-jena-provider/pom.xml index 2be514698..38219fc7d 100644 --- a/core/oslc4j-jena-provider/pom.xml +++ b/core/oslc4j-jena-provider/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../oslc4j-core-build/pom.xml oslc4j-jena-provider diff --git a/core/oslc4j-json4j-provider/pom.xml b/core/oslc4j-json4j-provider/pom.xml index 9dcccd045..83200fafd 100644 --- a/core/oslc4j-json4j-provider/pom.xml +++ b/core/oslc4j-json4j-provider/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../oslc4j-core-build/pom.xml oslc4j-json4j-provider diff --git a/core/oslc4j-utils/pom.xml b/core/oslc4j-utils/pom.xml index 2b5b02019..a68ee4b0d 100644 --- a/core/oslc4j-utils/pom.xml +++ b/core/oslc4j-utils/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../oslc4j-core-build/pom.xml Lyo :: Core :: Utilities diff --git a/core/shacl/pom.xml b/core/shacl/pom.xml index 5f95257f7..c0a64f314 100644 --- a/core/shacl/pom.xml +++ b/core/shacl/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../oslc4j-core-build/pom.xml diff --git a/domains/oslc-domains/pom.xml b/domains/oslc-domains/pom.xml index 70da282c2..279c9cf36 100644 --- a/domains/oslc-domains/pom.xml +++ b/domains/oslc-domains/pom.xml @@ -9,14 +9,14 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../../pom.xml org.eclipse.lyo oslc-domains - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 jar Lyo :: Domains diff --git a/pom.xml b/pom.xml index 199a4b38b..af1fb31a3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 pom Lyo :: _Parent diff --git a/server/oauth-consumer-store/pom.xml b/server/oauth-consumer-store/pom.xml index 338175dbc..3ff661681 100644 --- a/server/oauth-consumer-store/pom.xml +++ b/server/oauth-consumer-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-core/pom.xml b/server/oauth-core/pom.xml index 0e407377b..f31177054 100644 --- a/server/oauth-core/pom.xml +++ b/server/oauth-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-webapp/pom.xml b/server/oauth-webapp/pom.xml index 747710a88..6cb7635cc 100644 --- a/server/oauth-webapp/pom.xml +++ b/server/oauth-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../pom.xml org.eclipse.lyo.server diff --git a/server/oslc-ui-model/pom.xml b/server/oslc-ui-model/pom.xml index 005f0a519..fedf372fa 100644 --- a/server/oslc-ui-model/pom.xml +++ b/server/oslc-ui-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../pom.xml org.eclipse.lyo.server diff --git a/server/pom.xml b/server/pom.xml index ca3e40686..91f25f7bc 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../pom.xml diff --git a/store/pom.xml b/store/pom.xml index 712de061e..549223806 100644 --- a/store/pom.xml +++ b/store/pom.xml @@ -6,14 +6,14 @@ org.eclipse.lyo.store store-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 pom Lyo :: Store :: _Parent org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml index 2590f8d55..e83a9faa7 100644 --- a/store/store-core/pom.xml +++ b/store/store-core/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lyo.store store-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../pom.xml diff --git a/trs/client/client-source-mqtt/pom.xml b/trs/client/client-source-mqtt/pom.xml index 7bc1951f2..8944c0b06 100644 --- a/trs/client/client-source-mqtt/pom.xml +++ b/trs/client/client-source-mqtt/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../pom.xml diff --git a/trs/client/pom.xml b/trs/client/pom.xml index 7ece1f8c2..54ed80072 100644 --- a/trs/client/pom.xml +++ b/trs/client/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../../pom.xml diff --git a/trs/client/trs-client/pom.xml b/trs/client/trs-client/pom.xml index 45259883b..85cca7541 100644 --- a/trs/client/trs-client/pom.xml +++ b/trs/client/trs-client/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../pom.xml diff --git a/trs/server/pom.xml b/trs/server/pom.xml index 467ce2f7f..91efaec48 100644 --- a/trs/server/pom.xml +++ b/trs/server/pom.xml @@ -20,13 +20,13 @@ 4.0.0 org.eclipse.lyo.trs trs-server - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 Lyo :: TRS :: Server org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../../pom.xml diff --git a/validation/pom.xml b/validation/pom.xml index a0ddb9500..1659b0e34 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -3,13 +3,13 @@ 4.0.0 lyo-validation - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 Lyo :: Validation org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Alpha1 ../pom.xml From f5c2f626048b8cd39f6bf8b37e1e9466c8560614 Mon Sep 17 00:00:00 2001 From: Jad El-khoury Date: Wed, 27 Mar 2024 16:28:56 +0100 Subject: [PATCH 025/126] Continue the SNAPSHOT development --- client/oslc-client-base/pom.xml | 4 ++-- client/oslc-client/pom.xml | 4 ++-- client/oslc-java-client-resources/pom.xml | 4 ++-- client/pom.xml | 4 ++-- core/lyo-core-model/pom.xml | 2 +- core/lyo-core-settings/pom.xml | 2 +- core/oslc-query/pom.xml | 2 +- core/oslc-trs/pom.xml | 2 +- core/oslc4j-core-build/pom.xml | 2 +- core/oslc4j-core-wink/pom.xml | 2 +- core/oslc4j-core/pom.xml | 2 +- core/oslc4j-jena-provider/pom.xml | 2 +- core/oslc4j-json4j-provider/pom.xml | 2 +- core/oslc4j-utils/pom.xml | 2 +- core/shacl/pom.xml | 2 +- domains/oslc-domains/pom.xml | 4 ++-- pom.xml | 2 +- server/oauth-consumer-store/pom.xml | 2 +- server/oauth-core/pom.xml | 2 +- server/oauth-webapp/pom.xml | 2 +- server/oslc-ui-model/pom.xml | 2 +- server/pom.xml | 2 +- store/pom.xml | 4 ++-- store/store-core/pom.xml | 2 +- trs/client/client-source-mqtt/pom.xml | 2 +- trs/client/pom.xml | 2 +- trs/client/trs-client/pom.xml | 2 +- trs/server/pom.xml | 4 ++-- validation/pom.xml | 4 ++-- 29 files changed, 37 insertions(+), 37 deletions(-) diff --git a/client/oslc-client-base/pom.xml b/client/oslc-client-base/pom.xml index 271ad2686..8b3e20a3e 100644 --- a/client/oslc-client-base/pom.xml +++ b/client/oslc-client-base/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT oslc-client-base - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT Lyo :: Client :: Base diff --git a/client/oslc-client/pom.xml b/client/oslc-client/pom.xml index f8bdeb999..880bceb30 100644 --- a/client/oslc-client/pom.xml +++ b/client/oslc-client/pom.xml @@ -5,12 +5,12 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../pom.xml oslc-client - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT Lyo :: Client :: OSLC JAX-RS 2.0 (new) Eclipse Lyo OSLC Java client based on OSLC4J and JAX-RS 2.0 diff --git a/client/oslc-java-client-resources/pom.xml b/client/oslc-java-client-resources/pom.xml index a1f0984fd..104065f1e 100644 --- a/client/oslc-java-client-resources/pom.xml +++ b/client/oslc-java-client-resources/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT oslc-java-client-resources - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT Lyo :: Client :: Resources (legacy) diff --git a/client/pom.xml b/client/pom.xml index da832ef16..c9e8fa16e 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,13 +6,13 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT pom Lyo :: Client :: _Parent org.eclipse.lyo lyo-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../pom.xml diff --git a/core/lyo-core-model/pom.xml b/core/lyo-core-model/pom.xml index a99806729..6f95f3530 100644 --- a/core/lyo-core-model/pom.xml +++ b/core/lyo-core-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml Lyo :: Core :: OSLC Core model diff --git a/core/lyo-core-settings/pom.xml b/core/lyo-core-settings/pom.xml index 2c814d94a..0c149d965 100644 --- a/core/lyo-core-settings/pom.xml +++ b/core/lyo-core-settings/pom.xml @@ -5,7 +5,7 @@ oslc4j-core-build org.eclipse.lyo.oslc4j.core - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../oslc4j-core-build 4.0.0 diff --git a/core/oslc-query/pom.xml b/core/oslc-query/pom.xml index cd3862a18..26d551cdf 100644 --- a/core/oslc-query/pom.xml +++ b/core/oslc-query/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml diff --git a/core/oslc-trs/pom.xml b/core/oslc-trs/pom.xml index b2e5aa11b..e40ec4c13 100644 --- a/core/oslc-trs/pom.xml +++ b/core/oslc-trs/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml diff --git a/core/oslc4j-core-build/pom.xml b/core/oslc4j-core-build/pom.xml index 5a790b12d..8741150dd 100644 --- a/core/oslc4j-core-build/pom.xml +++ b/core/oslc4j-core-build/pom.xml @@ -8,7 +8,7 @@ org.eclipse.lyo lyo-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../../pom.xml diff --git a/core/oslc4j-core-wink/pom.xml b/core/oslc4j-core-wink/pom.xml index 9e83f0b56..089f25bcb 100644 --- a/core/oslc4j-core-wink/pom.xml +++ b/core/oslc4j-core-wink/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-core-wink diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml index 3c7f585e6..035bf39bd 100644 --- a/core/oslc4j-core/pom.xml +++ b/core/oslc4j-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-core diff --git a/core/oslc4j-jena-provider/pom.xml b/core/oslc4j-jena-provider/pom.xml index 38219fc7d..2be514698 100644 --- a/core/oslc4j-jena-provider/pom.xml +++ b/core/oslc4j-jena-provider/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-jena-provider diff --git a/core/oslc4j-json4j-provider/pom.xml b/core/oslc4j-json4j-provider/pom.xml index 83200fafd..9dcccd045 100644 --- a/core/oslc4j-json4j-provider/pom.xml +++ b/core/oslc4j-json4j-provider/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-json4j-provider diff --git a/core/oslc4j-utils/pom.xml b/core/oslc4j-utils/pom.xml index a68ee4b0d..2b5b02019 100644 --- a/core/oslc4j-utils/pom.xml +++ b/core/oslc4j-utils/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml Lyo :: Core :: Utilities diff --git a/core/shacl/pom.xml b/core/shacl/pom.xml index c0a64f314..5f95257f7 100644 --- a/core/shacl/pom.xml +++ b/core/shacl/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml diff --git a/domains/oslc-domains/pom.xml b/domains/oslc-domains/pom.xml index 279c9cf36..70da282c2 100644 --- a/domains/oslc-domains/pom.xml +++ b/domains/oslc-domains/pom.xml @@ -9,14 +9,14 @@ org.eclipse.lyo lyo-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../../pom.xml org.eclipse.lyo oslc-domains - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT jar Lyo :: Domains diff --git a/pom.xml b/pom.xml index af1fb31a3..199a4b38b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.lyo lyo-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT pom Lyo :: _Parent diff --git a/server/oauth-consumer-store/pom.xml b/server/oauth-consumer-store/pom.xml index 3ff661681..338175dbc 100644 --- a/server/oauth-consumer-store/pom.xml +++ b/server/oauth-consumer-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-core/pom.xml b/server/oauth-core/pom.xml index f31177054..0e407377b 100644 --- a/server/oauth-core/pom.xml +++ b/server/oauth-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-webapp/pom.xml b/server/oauth-webapp/pom.xml index 6cb7635cc..747710a88 100644 --- a/server/oauth-webapp/pom.xml +++ b/server/oauth-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oslc-ui-model/pom.xml b/server/oslc-ui-model/pom.xml index fedf372fa..005f0a519 100644 --- a/server/oslc-ui-model/pom.xml +++ b/server/oslc-ui-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/pom.xml b/server/pom.xml index 91f25f7bc..ca3e40686 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../pom.xml diff --git a/store/pom.xml b/store/pom.xml index 549223806..712de061e 100644 --- a/store/pom.xml +++ b/store/pom.xml @@ -6,14 +6,14 @@ org.eclipse.lyo.store store-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT pom Lyo :: Store :: _Parent org.eclipse.lyo lyo-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml index e83a9faa7..2590f8d55 100644 --- a/store/store-core/pom.xml +++ b/store/store-core/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lyo.store store-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../pom.xml diff --git a/trs/client/client-source-mqtt/pom.xml b/trs/client/client-source-mqtt/pom.xml index 8944c0b06..7bc1951f2 100644 --- a/trs/client/client-source-mqtt/pom.xml +++ b/trs/client/client-source-mqtt/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../pom.xml diff --git a/trs/client/pom.xml b/trs/client/pom.xml index 54ed80072..7ece1f8c2 100644 --- a/trs/client/pom.xml +++ b/trs/client/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../../pom.xml diff --git a/trs/client/trs-client/pom.xml b/trs/client/trs-client/pom.xml index 85cca7541..45259883b 100644 --- a/trs/client/trs-client/pom.xml +++ b/trs/client/trs-client/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../pom.xml diff --git a/trs/server/pom.xml b/trs/server/pom.xml index 91efaec48..467ce2f7f 100644 --- a/trs/server/pom.xml +++ b/trs/server/pom.xml @@ -20,13 +20,13 @@ 4.0.0 org.eclipse.lyo.trs trs-server - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT Lyo :: TRS :: Server org.eclipse.lyo lyo-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../../pom.xml diff --git a/validation/pom.xml b/validation/pom.xml index 1659b0e34..a0ddb9500 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -3,13 +3,13 @@ 4.0.0 lyo-validation - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT Lyo :: Validation org.eclipse.lyo lyo-parent - 6.0.0.Alpha1 + 6.0.0-SNAPSHOT ../pom.xml From 17ca3638008c115f3e986e9ff900278fe3490bf5 Mon Sep 17 00:00:00 2001 From: jhemm2 <96134203+jhemm2@users.noreply.github.com> Date: Fri, 5 Apr 2024 23:39:28 +0200 Subject: [PATCH 026/126] b153-Switch JAX-RS API dependencies to jakarta.ws.rs-api (#500) Updated dependencies and imports to switch to jakarta EE9 (javax vs jakarta) --------- Co-authored-by: Jad El-khoury Co-authored-by: Andrew Berezovskyi --- CHANGELOG.md | 5 +- client/oslc-client/pom.xml | 335 +++++++++--------- .../org/eclipse/lyo/client/IOslcClient.java | 5 +- .../lyo/client/JEEFormAuthenticator.java | 35 +- .../org/eclipse/lyo/client/OslcClient.java | 33 +- .../eclipse/lyo/client/OslcClientBuilder.java | 4 +- .../eclipse/lyo/client/OslcOAuthClient.java | 16 +- .../lyo/client/OslcOAuthClientBuilder.java | 3 +- .../lyo/client/RootServicesHelper.java | 18 +- .../lyo/client/UnderlyingHttpClient.java | 3 +- .../eclipse/lyo/client/query/OslcQuery.java | 7 +- .../lyo/client/query/OslcQueryResult.java | 15 +- .../eclipse/lyo/client/resources/RmUtil.java | 13 +- .../lyo/client/test/OslcClientTest.java | 5 +- .../lyo/client/test/OslcQueryResultTest.java | 5 +- core/lyo-core-settings/pom.xml | 15 +- .../eclipse/lyo/oslc4j/core/OSLC4JUtils.java | 6 +- .../lyo/oslc4j/core/OSLC4JUtilsTest.java | 9 +- core/oslc-trs/pom.xml | 4 +- core/oslc4j-core/pom.xml | 4 +- .../lyo/oslc4j/core/model/OslcMediaType.java | 2 +- .../core/model/ResourceShapeFactory.java | 21 +- .../core/model/ServiceProviderFactory.java | 10 +- .../model/ServiceProviderFactoryTest.java | 7 +- core/oslc4j-jena-provider/pom.xml | 289 ++++++++------- .../jena/AbstractOslcRdfXmlProvider.java | 20 +- .../provider/jena/OslcCompactRdfProvider.java | 18 +- .../jena/OslcJsonLdArrayProvider.java | 7 +- .../jena/OslcJsonLdCollectionProvider.java | 7 +- .../provider/jena/OslcJsonLdProvider.java | 7 +- .../jena/OslcRdfXmlArrayProvider.java | 18 +- .../jena/OslcRdfXmlCollectionProvider.java | 18 +- .../provider/jena/OslcRdfXmlProvider.java | 18 +- .../jena/OslcSimpleRdfXmlArrayProvider.java | 14 +- .../OslcSimpleRdfXmlCollectionProvider.java | 14 +- .../jena/OslcSimpleXmlArrayProvider.java | 8 +- .../jena/OslcSimpleXmlCollectionProvider.java | 8 +- .../jena/OslcTurtleArrayProvider.java | 8 +- .../jena/OslcTurtleCollectionProvider.java | 8 +- .../provider/jena/OslcTurtleProvider.java | 8 +- .../provider/jena/OslcXmlArrayProvider.java | 8 +- .../jena/OslcXmlCollectionProvider.java | 8 +- .../oslc4j/provider/jena/OslcXmlProvider.java | 8 +- .../jena/ProviderCollectionResource.java | 41 +-- .../jena/RdfJenaProviderCollectionTest.java | 23 +- .../shapefactory/resources/ILocalShape.java | 26 -- .../oslc4j/provider/jena/test/JsonLdTest.java | 8 +- .../test/RdfXmlAbbreviatedWriterTest.java | 11 +- .../provider/jena/test/ReifiedLinksTest.java | 7 +- .../jena/test/ServiceProviderTest.java | 9 +- .../oslc4j/provider/jena/test/ShapeTest.java | 4 +- .../oslc4j/provider/jena/test/TurtleTest.java | 4 +- core/oslc4j-json4j-provider/pom.xml | 208 ++++++----- .../json4j/AbstractOslcRdfJsonProvider.java | 21 +- .../json4j/OslcCompactJsonProvider.java | 18 +- .../json4j/OslcRdfJsonArrayProvider.java | 18 +- .../json4j/OslcRdfJsonCollectionProvider.java | 18 +- .../provider/json4j/OslcRdfJsonProvider.java | 18 +- .../OslcSimpleRdfJsonArrayProvider.java | 14 +- .../OslcSimpleRdfJsonCollectionProvider.java | 14 +- .../OslcJsonProviderCollectionTest.java | 26 +- .../json4j/ProviderCollectionResource.java | 46 ++- .../json4j/test/JsonOslcNameTest.java | 23 +- .../json4j/test/TestInvalidTypesJson.java | 46 ++- .../marshallers/MarshallerConstants.java | 2 +- .../utils/marshallers/OSLC4JMarshaller.java | 19 +- .../utils/marshallers/OSLC4JUnmarshaller.java | 8 +- domains/oslc-domains/pom.xml | 126 +++---- pom.xml | 77 ++-- .../pom.xml | 49 +++ .../pom.xml | 55 +++ server/net.oauth.core-oauth-jakarta/pom.xml | 49 +++ .../pom.xml | 49 +++ server/oauth-consumer-store/pom.xml | 4 +- server/oauth-core/pom.xml | 47 ++- .../lyo/server/oauth/core/Application.java | 2 +- .../oauth/core/AuthenticationException.java | 2 +- .../server/oauth/core/OAuthConfiguration.java | 12 +- .../lyo/server/oauth/core/OAuthRequest.java | 16 +- .../oauth/core/token/SimpleTokenStrategy.java | 2 +- .../oauth/core/token/TokenStrategy.java | 7 +- .../AbstractAdapterCredentialsFilter.java | 40 +-- .../oauth/core/utils/RestException.java | 2 +- .../core/utils/UnauthorizedException.java | 2 +- server/oauth-webapp/pom.xml | 22 +- .../oauth/webapp/services/CSRFPrevent.java | 11 +- .../webapp/services/ConsumersService.java | 32 +- .../oauth/webapp/services/OAuthService.java | 49 ++- .../webapp/services/OAuthServletListener.java | 6 +- .../src/main/webapp/WEB-INF/web.xml | 8 +- server/pom.xml | 18 +- store/store-core/pom.xml | 4 +- .../java/org/eclipse/lyo/store/Store.java | 17 +- .../java/org/eclipse/lyo/store/StorePool.java | 8 +- .../lyo/store/internals/DatasetBuilder.java | 7 +- .../lyo/store/internals/SparqlStoreImpl.java | 38 +- .../SparqlQueryExecutorBasicAuthImpl.java | 4 +- .../eclipse/lyo/store/DatasetBuilderTest.java | 10 +- .../eclipse/lyo/store/SparqlStoreImplIT.java | 1 + .../lyo/store/SparqlStoreImplTest.java | 37 +- .../org/eclipse/lyo/store/StorePoolTest.java | 12 +- .../org/eclipse/lyo/store/StoreTestBase.java | 47 +-- .../lyo/store/resources/BlankResource.java | 30 +- .../lyo/store/resources/IBlankResource.java | 31 -- .../store/resources/IWithBlankResource.java | 31 -- .../resources/IWithTwoDepthBlankResource.java | 31 -- .../store/resources/Nsp1DomainConstants.java | 3 - .../lyo/store/resources/Requirement.java | 1 - .../store/resources/WithBlankResource.java | 30 +- .../resources/WithTwoDepthBlankResource.java | 30 +- trs/client/client-source-mqtt/pom.xml | 4 +- trs/client/trs-client/pom.xml | 11 +- .../config/TrsConsumerConfiguration.java | 7 +- .../lyo/trs/client/util/ClientUtil.java | 4 +- .../client/util/TrackedResourceClient.java | 4 +- trs/server/pom.xml | 22 +- .../lyo/oslc4j/trs/server/HistoryData.java | 1 + .../lyo/oslc4j/trs/server/InmemPagedTrs.java | 4 +- .../oslc4j/trs/server/PagedTrsFactory.java | 4 +- .../lyo/oslc4j/trs/server/TRSUtil.java | 1 + .../oslc4j/trs/server/TrsEventHandler.java | 1 + .../service/TrackedResourceSetService.java | 21 +- .../server/service/DummyServiceResource.java | 8 +- .../trs/server/service/DummyServiceTest.java | 9 +- .../trs/server/service/TRSServiceDITest.java | 14 +- .../server/service/TRSServiceResource.java | 11 +- .../trs/server/service/TRSServiceTest.java | 7 +- 127 files changed, 1494 insertions(+), 1404 deletions(-) create mode 100644 server/net.oauth.core-oauth-consumer-jakarta/pom.xml create mode 100644 server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml create mode 100644 server/net.oauth.core-oauth-jakarta/pom.xml create mode 100644 server/net.oauth.core-oauth-provider-jakarta/pom.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index ee11e413e..6f05e0561 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,17 +7,20 @@ - Introducing capability to set the servletUri to be used by the OAuthConfiguration ### Changed - +- 🧨Migrated from Javax to Jakarta packages +- upgrade to Jersey 3.1.5 - Kotlin 1.9.0 is used; `kotlin-stdlib-jdk8` dependency was replaced with `kotlin-stdlib` due to [Kotlin updates](https://kotlinlang.org/docs/whatsnew18.html#updated-jvm-compilation-target). - Allow application to reset the oauth token cached within the server, when it deems that it is no longer valid - 🧨Corrected cardinality and range of the oslc_config:acceptedBy property (from String[0..1] to Resource[0..*]) - changed scope of dependencies in oauth-webapp to avoid inclusion multiple times during runtime. +- Migrated from Javax to Jakarta packages, including upgrade to Jersey 3.1.5 ### Deprecated ### Removed - 🧨 Support for JDK 11 (and all versions below 17) is removed. **JDK 17 is the new baseline for Eclipse Lyo.** The SDK and sample code has been tested using JDK 17, 20, and 21-ea. +- 🧨 Support for Java EE and Jakarta EE 8 is removed. ### Fixed diff --git a/client/oslc-client/pom.xml b/client/oslc-client/pom.xml index 880bceb30..306f50419 100644 --- a/client/oslc-client/pom.xml +++ b/client/oslc-client/pom.xml @@ -1,167 +1,186 @@ - - 4.0.0 + + 4.0.0 - - org.eclipse.lyo.clients - clients-parent - 6.0.0-SNAPSHOT - ../pom.xml - - - oslc-client + + org.eclipse.lyo.clients + clients-parent 6.0.0-SNAPSHOT - Lyo :: Client :: OSLC JAX-RS 2.0 (new) - Eclipse Lyo OSLC Java client based on OSLC4J and JAX-RS 2.0 + ../pom.xml + - - - org.eclipse.lyo.clients - oslc-client-base - ${v.lyo} - + oslc-client + 6.0.0-SNAPSHOT + Lyo :: Client :: OSLC JAX-RS 2.0 (new) + Eclipse Lyo OSLC Java client based on OSLC4J and JAX-RS 2.0 + + + + org.eclipse.lyo.clients + oslc-client-base + ${v.lyo} + - - org.slf4j - slf4j-api - ${v.slf4j} - - - org.apache.jena - apache-jena-libs - pom - ${v.jena} - - - org.apache.httpcomponents - httpclient - ${v.httpclient} - - - commons-logging - commons-logging - - - - - org.slf4j - jcl-over-slf4j - ${v.slf4j} - - - net.oauth.core - oauth - 20100527 - - - net.oauth.core - oauth-consumer - 20100527 - - - net.oauth.core - oauth-httpclient4 - 20090913 - - - org.apache.httpcomponents - httpclient - - - - - org.eclipse.lyo.oslc4j.core - oslc4j-core - ${v.lyo} - - - org.eclipse.lyo.oslc4j.core - oslc4j-jena-provider - ${v.lyo} - - - org.eclipse.lyo.oslc4j.core - oslc4j-json4j-provider - ${v.lyo} - + + org.slf4j + slf4j-api + ${v.slf4j} + + + org.apache.jena + apache-jena-libs + pom + ${v.jena} + + + org.apache.httpcomponents + httpclient + ${v.httpclient} + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j + ${v.slf4j} + + + org.eclipse.lyo.server + net.oauth.core-oauth-jakarta + ${v.lyo} + + + + net.oauth.core + oauth + + + + + org.eclipse.lyo.server + net.oauth.core-oauth-consumer-jakarta + ${v.lyo} + + + + net.oauth.core + oauth-consumer + + + + + org.eclipse.lyo.server + net.oauth.core-oauth-httpclient4-jakarta + ${v.lyo} + + + + net.oauth.core + oauth-httpclient4 + + + + + org.eclipse.lyo.oslc4j.core + oslc4j-core + ${v.lyo} + + + org.eclipse.lyo.oslc4j.core + oslc4j-jena-provider + ${v.lyo} + + + org.eclipse.lyo.oslc4j.core + oslc4j-json4j-provider + ${v.lyo} + - - javax.servlet - javax.servlet-api - - - - - jakarta.ws.rs - jakarta.ws.rs-api - provided - + + jakarta.servlet + jakarta.servlet-api + + + jakarta.ws.rs + jakarta.ws.rs-api + - - - org.slf4j - slf4j-simple - ${v.slf4j} - test - - - org.mockito - mockito-core - test - - - org.junit.jupiter - junit-jupiter-api - test - - - junit - junit - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.vintage - junit-vintage-engine - test - - - - org.assertj - assertj-core - test - + + + org.slf4j + slf4j-simple + ${v.slf4j} + test + + + org.mockito + mockito-core + test + + + org.junit.jupiter + junit-jupiter-api + test + + + junit + junit + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.vintage + junit-vintage-engine + test + + + + org.assertj + assertj-core + test + - - org.glassfish.jersey.core - jersey-client - test - - - org.glassfish.jersey.inject - jersey-hk2 - test - + + org.glassfish.jersey.core + jersey-client + test + + + org.glassfish.jersey.inject + jersey-hk2 + test + - - - - - org.apache.maven.plugins - maven-source-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - + + + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/IOslcClient.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/IOslcClient.java index f94f98183..9de98e718 100644 --- a/client/oslc-client/src/main/java/org/eclipse/lyo/client/IOslcClient.java +++ b/client/oslc-client/src/main/java/org/eclipse/lyo/client/IOslcClient.java @@ -14,8 +14,9 @@ package org.eclipse.lyo.client; import java.util.Map; -import javax.ws.rs.client.Client; -import javax.ws.rs.core.Response; + +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.Response; /** * An OSLC Client that extends the JAX-RS 2.0 REST client with OSLC specific CRUD and diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/JEEFormAuthenticator.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/JEEFormAuthenticator.java index fee5f9b6f..1c29b6c94 100644 --- a/client/oslc-client/src/main/java/org/eclipse/lyo/client/JEEFormAuthenticator.java +++ b/client/oslc-client/src/main/java/org/eclipse/lyo/client/JEEFormAuthenticator.java @@ -13,26 +13,27 @@ */ package org.eclipse.lyo.client; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.ProcessingException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; import java.io.InputStream; import java.util.ArrayList; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + /** * A filter that can be registered in order to non-preemptively handle JEE Form * based authentication challenges. @@ -85,7 +86,7 @@ public JEEFormAuthenticator(final String baseUri, final String username, final S * authenticate the user, and then retries the request with the updated * session information. * - * @see javax.ws.rs.client.ClientResponseFilter#filter(javax.ws.rs.client.ClientRequestContext, javax.ws.rs.client.ClientResponseContext) + * @see jakarta.ws.rs.client.ClientResponseFilter#filter(jakarta.ws.rs.client.ClientRequestContext, jakarta.ws.rs.client.ClientResponseContext) */ @Override public void filter(ClientRequestContext request, ClientResponseContext response) { diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcClient.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcClient.java index 53b39c116..53f93c922 100644 --- a/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcClient.java +++ b/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcClient.java @@ -13,6 +13,16 @@ */ package org.eclipse.lyo.client; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; + import org.apache.http.HttpHeaders; import org.apache.http.HttpStatus; import org.eclipse.lyo.client.exception.ResourceNotFoundException; @@ -27,22 +37,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation.Builder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; /** * An OSLC Client that extends the JAX-RS 2.0 REST client with OSLC specific CRUD and diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcClientBuilder.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcClientBuilder.java index 0a223af06..9c126730c 100644 --- a/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcClientBuilder.java +++ b/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcClientBuilder.java @@ -13,11 +13,11 @@ */ package org.eclipse.lyo.client; -import javax.ws.rs.client.ClientBuilder; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.ws.rs.client.ClientBuilder; + public class OslcClientBuilder { private String version; private ClientBuilder clientBuilder; diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcOAuthClient.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcOAuthClient.java index cca96897b..49ee64059 100644 --- a/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcOAuthClient.java +++ b/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcOAuthClient.java @@ -21,20 +21,20 @@ import java.util.Map; import java.util.Optional; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import org.apache.commons.lang3.StringUtils; +import org.apache.http.client.HttpClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import net.oauth.OAuthAccessor; import net.oauth.OAuthException; import net.oauth.OAuthMessage; import net.oauth.client.OAuthClient; import net.oauth.client.httpclient4.HttpClient4; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.client.HttpClient; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class OslcOAuthClient implements IOslcClient { diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcOAuthClientBuilder.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcOAuthClientBuilder.java index aeb03ea79..df9f041c4 100644 --- a/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcOAuthClientBuilder.java +++ b/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcOAuthClientBuilder.java @@ -13,11 +13,10 @@ */ package org.eclipse.lyo.client; -import javax.ws.rs.client.ClientBuilder; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.ws.rs.client.ClientBuilder; import net.oauth.OAuthAccessor; import net.oauth.OAuthConsumer; import net.oauth.OAuthServiceProvider; diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/RootServicesHelper.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/RootServicesHelper.java index 63877621a..cdbf8dbdf 100644 --- a/client/oslc-client/src/main/java/org/eclipse/lyo/client/RootServicesHelper.java +++ b/client/oslc-client/src/main/java/org/eclipse/lyo/client/RootServicesHelper.java @@ -13,7 +13,11 @@ */ package org.eclipse.lyo.client; -import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; + import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.StatusLine; @@ -33,13 +37,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import java.io.IOException; -import java.io.InputStream; -import java.util.HashMap; -import java.util.Map; +import com.fasterxml.jackson.databind.ObjectMapper; + +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; /** * Helper class to assist in retrieval of attributes from the IBM Rational diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/UnderlyingHttpClient.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/UnderlyingHttpClient.java index 3150e93af..015676205 100644 --- a/client/oslc-client/src/main/java/org/eclipse/lyo/client/UnderlyingHttpClient.java +++ b/client/oslc-client/src/main/java/org/eclipse/lyo/client/UnderlyingHttpClient.java @@ -13,9 +13,10 @@ */ package org.eclipse.lyo.client; -import javax.ws.rs.client.Client; import org.apache.http.client.HttpClient; +import jakarta.ws.rs.client.Client; + public interface UnderlyingHttpClient { /** diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/query/OslcQuery.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/query/OslcQuery.java index 4226d58d2..0c2befb23 100644 --- a/client/oslc-client/src/main/java/org/eclipse/lyo/client/query/OslcQuery.java +++ b/client/oslc-client/src/main/java/org/eclipse/lyo/client/query/OslcQuery.java @@ -14,12 +14,11 @@ package org.eclipse.lyo.client.query; -import javax.ws.rs.core.Response; - -import org.eclipse.lyo.client.OslcClient; import org.eclipse.lyo.client.OSLCConstants; +import org.eclipse.lyo.client.OslcClient; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; /** * Represents an OSLC query (HTTP GET) request to be made of a remote system. diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/query/OslcQueryResult.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/query/OslcQueryResult.java index 70a6f2eb9..5654c10c7 100644 --- a/client/oslc-client/src/main/java/org/eclipse/lyo/client/query/OslcQueryResult.java +++ b/client/oslc-client/src/main/java/org/eclipse/lyo/client/query/OslcQueryResult.java @@ -21,14 +21,6 @@ import javax.xml.datatype.DatatypeConfigurationException; -import javax.ws.rs.core.Response; - -import org.eclipse.lyo.client.OSLCConstants; -import org.eclipse.lyo.oslc4j.core.exception.LyoModelException; -import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; -import org.eclipse.lyo.oslc4j.core.model.OslcConstants; -import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; - import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.Property; @@ -40,6 +32,13 @@ import org.apache.jena.rdf.model.Statement; import org.apache.jena.rdf.model.StmtIterator; import org.apache.jena.vocabulary.RDFS; +import org.eclipse.lyo.client.OSLCConstants; +import org.eclipse.lyo.oslc4j.core.exception.LyoModelException; +import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; +import org.eclipse.lyo.oslc4j.core.model.OslcConstants; +import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; + +import jakarta.ws.rs.core.Response; /** diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/resources/RmUtil.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/resources/RmUtil.java index e731ef8b0..44682a82c 100644 --- a/client/oslc-client/src/main/java/org/eclipse/lyo/client/resources/RmUtil.java +++ b/client/oslc-client/src/main/java/org/eclipse/lyo/client/resources/RmUtil.java @@ -13,19 +13,20 @@ */ package org.eclipse.lyo.client.resources; -import net.oauth.OAuthException; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + +import org.eclipse.lyo.client.OSLCConstants; import org.eclipse.lyo.client.OslcClient; import org.eclipse.lyo.client.exception.ResourceNotFoundException; -import org.eclipse.lyo.client.OSLCConstants; import org.eclipse.lyo.oslc4j.core.model.CreationFactory; import org.eclipse.lyo.oslc4j.core.model.ResourceShape; import org.eclipse.lyo.oslc4j.core.model.Service; import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; -import javax.ws.rs.core.Response; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; +import jakarta.ws.rs.core.Response; +import net.oauth.OAuthException; @Deprecated public final class RmUtil { diff --git a/client/oslc-client/src/test/java/org/eclipse/lyo/client/test/OslcClientTest.java b/client/oslc-client/src/test/java/org/eclipse/lyo/client/test/OslcClientTest.java index cc000c867..25729d7a4 100644 --- a/client/oslc-client/src/test/java/org/eclipse/lyo/client/test/OslcClientTest.java +++ b/client/oslc-client/src/test/java/org/eclipse/lyo/client/test/OslcClientTest.java @@ -20,8 +20,6 @@ import java.io.IOException; import java.net.URISyntaxException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status.Family; import javax.xml.namespace.QName; import org.eclipse.lyo.client.OSLCConstants; @@ -29,6 +27,9 @@ import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; import org.junit.jupiter.api.Test; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status.Family; + public class OslcClientTest { /* * Tests that the RDF/XML MessageBodyWriter doesn't go into an infinite loop when diff --git a/client/oslc-client/src/test/java/org/eclipse/lyo/client/test/OslcQueryResultTest.java b/client/oslc-client/src/test/java/org/eclipse/lyo/client/test/OslcQueryResultTest.java index 717a8b12f..3add622b6 100644 --- a/client/oslc-client/src/test/java/org/eclipse/lyo/client/test/OslcQueryResultTest.java +++ b/client/oslc-client/src/test/java/org/eclipse/lyo/client/test/OslcQueryResultTest.java @@ -18,9 +18,6 @@ import java.io.InputStream; - -import javax.ws.rs.core.Response; - import org.eclipse.lyo.client.OslcClient; import org.eclipse.lyo.client.query.OslcQuery; import org.eclipse.lyo.client.query.OslcQueryParameters; @@ -29,6 +26,8 @@ import org.junit.Test; import org.mockito.Mockito; +import jakarta.ws.rs.core.Response; + /** * @author Samuel Padgett */ diff --git a/core/lyo-core-settings/pom.xml b/core/lyo-core-settings/pom.xml index 0c149d965..034f79bd4 100644 --- a/core/lyo-core-settings/pom.xml +++ b/core/lyo-core-settings/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> oslc4j-core-build org.eclipse.lyo.oslc4j.core @@ -17,15 +17,12 @@ - - javax.servlet - javax.servlet-api - provided + jakarta.servlet + jakarta.servlet-api jakarta.ws.rs jakarta.ws.rs-api - provided org.apache.jena @@ -33,8 +30,8 @@ pom - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api org.apache.httpcomponents diff --git a/core/lyo-core-settings/src/main/java/org/eclipse/lyo/oslc4j/core/OSLC4JUtils.java b/core/lyo-core-settings/src/main/java/org/eclipse/lyo/oslc4j/core/OSLC4JUtils.java index 307030f00..197dea7f6 100644 --- a/core/lyo-core-settings/src/main/java/org/eclipse/lyo/oslc4j/core/OSLC4JUtils.java +++ b/core/lyo-core-settings/src/main/java/org/eclipse/lyo/oslc4j/core/OSLC4JUtils.java @@ -27,8 +27,7 @@ import java.util.Calendar; import java.util.HashSet; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.UriBuilder; + import javax.xml.XMLConstants; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; @@ -51,6 +50,9 @@ import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.UriBuilder; + // TODO: Lyo6 extract to LyoServletUriUtils public class OSLC4JUtils { diff --git a/core/lyo-core-settings/src/test/java/org/eclipse/lyo/oslc4j/core/OSLC4JUtilsTest.java b/core/lyo-core-settings/src/test/java/org/eclipse/lyo/oslc4j/core/OSLC4JUtilsTest.java index 27027a469..19d0f8811 100644 --- a/core/lyo-core-settings/src/test/java/org/eclipse/lyo/oslc4j/core/OSLC4JUtilsTest.java +++ b/core/lyo-core-settings/src/test/java/org/eclipse/lyo/oslc4j/core/OSLC4JUtilsTest.java @@ -13,16 +13,19 @@ */ package org.eclipse.lyo.oslc4j.core; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.net.MalformedURLException; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import static org.junit.Assert.*; import org.apache.commons.lang3.tuple.Pair; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import static org.mockito.Mockito.when; + +import jakarta.servlet.http.HttpServletRequest; public class OSLC4JUtilsTest { diff --git a/core/oslc-trs/pom.xml b/core/oslc-trs/pom.xml index e40ec4c13..efc9d0638 100644 --- a/core/oslc-trs/pom.xml +++ b/core/oslc-trs/pom.xml @@ -29,8 +29,8 @@ pom - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api org.apache.httpcomponents diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml index 035bf39bd..eb853df39 100644 --- a/core/oslc4j-core/pom.xml +++ b/core/oslc4j-core/pom.xml @@ -40,8 +40,8 @@ pom - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api org.apache.httpcomponents diff --git a/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/OslcMediaType.java b/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/OslcMediaType.java index 23d4a19fc..1faa62ecd 100644 --- a/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/OslcMediaType.java +++ b/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/OslcMediaType.java @@ -13,7 +13,7 @@ */ package org.eclipse.lyo.oslc4j.core.model; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; public interface OslcMediaType { diff --git a/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/ResourceShapeFactory.java b/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/ResourceShapeFactory.java index 26ef6ce61..6b2cc2689 100644 --- a/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/ResourceShapeFactory.java +++ b/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/ResourceShapeFactory.java @@ -30,10 +30,25 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.core.UriBuilder; import org.eclipse.lyo.oslc4j.core.CoreHelper; -import org.eclipse.lyo.oslc4j.core.annotation.*; +import org.eclipse.lyo.oslc4j.core.annotation.OslcAllowedValue; +import org.eclipse.lyo.oslc4j.core.annotation.OslcAllowedValues; +import org.eclipse.lyo.oslc4j.core.annotation.OslcDefaultValue; +import org.eclipse.lyo.oslc4j.core.annotation.OslcDescription; +import org.eclipse.lyo.oslc4j.core.annotation.OslcHidden; +import org.eclipse.lyo.oslc4j.core.annotation.OslcMaxSize; +import org.eclipse.lyo.oslc4j.core.annotation.OslcMemberProperty; +import org.eclipse.lyo.oslc4j.core.annotation.OslcName; +import org.eclipse.lyo.oslc4j.core.annotation.OslcOccurs; +import org.eclipse.lyo.oslc4j.core.annotation.OslcPropertyDefinition; +import org.eclipse.lyo.oslc4j.core.annotation.OslcRange; +import org.eclipse.lyo.oslc4j.core.annotation.OslcReadOnly; +import org.eclipse.lyo.oslc4j.core.annotation.OslcRepresentation; +import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; +import org.eclipse.lyo.oslc4j.core.annotation.OslcTitle; +import org.eclipse.lyo.oslc4j.core.annotation.OslcValueShape; +import org.eclipse.lyo.oslc4j.core.annotation.OslcValueType; import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; import org.eclipse.lyo.oslc4j.core.exception.OslcCoreDuplicatePropertyDefinitionException; import org.eclipse.lyo.oslc4j.core.exception.OslcCoreInvalidOccursException; @@ -46,6 +61,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.ws.rs.core.UriBuilder; + public class ResourceShapeFactory { private final static Logger log = LoggerFactory.getLogger(ResourceShapeFactory.class); diff --git a/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/ServiceProviderFactory.java b/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/ServiceProviderFactory.java index 6c22c57b5..86735020b 100644 --- a/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/ServiceProviderFactory.java +++ b/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/ServiceProviderFactory.java @@ -20,10 +20,7 @@ import java.net.URLEncoder; import java.util.HashMap; import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.UriBuilder; + import org.eclipse.lyo.oslc4j.core.annotation.OslcCreationFactory; import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog; import org.eclipse.lyo.oslc4j.core.annotation.OslcDialogs; @@ -34,6 +31,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.UriBuilder; + public final class ServiceProviderFactory { private final static Logger log = LoggerFactory.getLogger(ServiceProviderFactory.class); diff --git a/core/oslc4j-core/src/test/java/org/eclipse/lyo/oslc4j/core/model/ServiceProviderFactoryTest.java b/core/oslc4j-core/src/test/java/org/eclipse/lyo/oslc4j/core/model/ServiceProviderFactoryTest.java index b5f3976ee..1448fea83 100644 --- a/core/oslc4j-core/src/test/java/org/eclipse/lyo/oslc4j/core/model/ServiceProviderFactoryTest.java +++ b/core/oslc4j-core/src/test/java/org/eclipse/lyo/oslc4j/core/model/ServiceProviderFactoryTest.java @@ -1,12 +1,15 @@ package org.eclipse.lyo.oslc4j.core.model; +import static org.junit.Assert.assertEquals; + import java.util.HashMap; -import javax.ws.rs.Path; + import org.eclipse.lyo.oslc4j.core.annotation.OslcCreationFactory; -import static org.junit.Assert.*; import org.junit.Test; import org.mockito.Mockito; +import jakarta.ws.rs.Path; + /** * Unit test for verifying {@link ServiceProviderFactory} URI-related code. * @author Andrew Berezovskyi (andriib@kth.se) diff --git a/core/oslc4j-jena-provider/pom.xml b/core/oslc4j-jena-provider/pom.xml index 2be514698..3451b0b53 100644 --- a/core/oslc4j-jena-provider/pom.xml +++ b/core/oslc4j-jena-provider/pom.xml @@ -1,158 +1,151 @@ - - 4.0.0 - - org.eclipse.lyo.oslc4j.core - oslc4j-core-build - 6.0.0-SNAPSHOT - ../oslc4j-core-build/pom.xml - - oslc4j-jena-provider - Lyo :: Core :: Jena Provider - JAX-RS provider for reading and writing RDF content using the Eclipse Lyo OSLC4J SDK. + + 4.0.0 + + org.eclipse.lyo.oslc4j.core + oslc4j-core-build + 6.0.0-SNAPSHOT + ../oslc4j-core-build/pom.xml + + oslc4j-jena-provider + Lyo :: Core :: Jena Provider + JAX-RS provider for reading and writing RDF content using the + Eclipse Lyo OSLC4J SDK. - - + + - - - org.eclipse.lyo.oslc4j.core - oslc4j-core - + + + org.eclipse.lyo.oslc4j.core + oslc4j-core + - - javax.servlet - javax.servlet-api - provided - - - jakarta.ws.rs - jakarta.ws.rs-api - provided - + + jakarta.servlet + jakarta.servlet-api + + + jakarta.ws.rs + jakarta.ws.rs-api + - - org.slf4j - slf4j-api - - - org.apache.jena - apache-jena-libs - pom - - - javax.annotation - javax.annotation-api - - - org.apache.httpcomponents - httpclient - - - - - org.apache.httpcomponents - httpclient - - - commons-logging - commons-logging - - - - - org.slf4j - jcl-over-slf4j - - - jakarta.annotation - jakarta.annotation-api - + + org.slf4j + slf4j-api + + + org.apache.jena + apache-jena-libs + pom + + + jakarta.annotation + jakarta.annotation-api + + + org.apache.httpcomponents + httpclient + + + + + org.apache.httpcomponents + httpclient + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j + + + jakarta.annotation + jakarta.annotation-api + - + - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - - org.junit.vintage - junit-vintage-engine - test - - - - org.junit.jupiter - junit-jupiter-params - test - - - org.assertj - assertj-core - test - - - org.slf4j - slf4j-simple - test - - - org.glassfish.jersey.containers - jersey-container-servlet - test - - - org.glassfish.jersey.inject - jersey-hk2 - test - - - org.glassfish.jersey.core - jersey-server - test - - - org.glassfish.jersey.core - jersey-common - test - + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + + org.junit.vintage + junit-vintage-engine + test + + + + org.junit.jupiter + junit-jupiter-params + test + + + org.assertj + assertj-core + test + + + org.slf4j + slf4j-simple + test + + + org.glassfish.jersey.containers + jersey-container-servlet + test + + + org.glassfish.jersey.inject + jersey-hk2 + test + + + org.glassfish.jersey.core + jersey-server + test + + + org.glassfish.jersey.core + jersey-common + test + - - - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-grizzly2 - ${v.jersey} - test - - - - - javax.servlet - javax.servlet-api - - - + + + org.glassfish.jersey.test-framework.providers + jersey-test-framework-provider-grizzly2 + ${v.jersey} + test - - - - - org.apache.maven.plugins - maven-source-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/AbstractOslcRdfXmlProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/AbstractOslcRdfXmlProvider.java index 41828901a..2b3418227 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/AbstractOslcRdfXmlProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/AbstractOslcRdfXmlProvider.java @@ -22,15 +22,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.ext.Providers; + import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFReaderI; @@ -49,6 +41,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.ext.Providers; + /** * @author Russell Boykin, Alberto Giammaria, Chris Peters, Gianluca Bernardini, Andrew Berezovskyi */ diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcCompactRdfProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcCompactRdfProvider.java index e4bc29fce..d62767f8b 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcCompactRdfProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcCompactRdfProvider.java @@ -19,18 +19,18 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; - import org.eclipse.lyo.oslc4j.core.model.Compact; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; + /** * @author Russell Boykin, Alberto Giammaria, Chris Peters, Gianluca Bernardini */ diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcJsonLdArrayProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcJsonLdArrayProvider.java index 3918f4a5a..0deaf9488 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcJsonLdArrayProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcJsonLdArrayProvider.java @@ -13,11 +13,12 @@ */ package org.eclipse.lyo.oslc4j.provider.jena; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.ext.Provider; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.ext.Provider; + /** * @author Andrew Berezovskyi * @since 2.4.0 diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcJsonLdCollectionProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcJsonLdCollectionProvider.java index e59a5465d..0f86e04d6 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcJsonLdCollectionProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcJsonLdCollectionProvider.java @@ -13,11 +13,12 @@ */ package org.eclipse.lyo.oslc4j.provider.jena; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.ext.Provider; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.ext.Provider; + /** * @author Andrew Berezovskyi * @since 2.4.0 diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcJsonLdProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcJsonLdProvider.java index 7b511a74c..909007137 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcJsonLdProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcJsonLdProvider.java @@ -13,11 +13,12 @@ */ package org.eclipse.lyo.oslc4j.provider.jena; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.ext.Provider; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.ext.Provider; + /** * @author Andrew Berezovskyi * @since 2.4.0 diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcRdfXmlArrayProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcRdfXmlArrayProvider.java index ab36e9525..711d6848b 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcRdfXmlArrayProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcRdfXmlArrayProvider.java @@ -19,17 +19,17 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; - import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; + /** * @author Russell Boykin, Alberto Giammaria, Chris Peters, Gianluca Bernardini, Andrew Berezovskyi */ diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcRdfXmlCollectionProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcRdfXmlCollectionProvider.java index f1d63ff54..25a677b97 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcRdfXmlCollectionProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcRdfXmlCollectionProvider.java @@ -37,20 +37,20 @@ import java.util.SortedSet; import java.util.TreeSet; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; - import org.eclipse.lyo.oslc4j.core.CoreHelper; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; + /** * * @author Russell Boykin, Alberto Giammaria, Chris Peters, Gianluca Bernardini, Andrew Berezovskyi diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcRdfXmlProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcRdfXmlProvider.java index 768a27c83..a62973a12 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcRdfXmlProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcRdfXmlProvider.java @@ -25,15 +25,6 @@ import java.util.Collection; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; - import org.eclipse.lyo.oslc4j.core.CoreHelper; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; import org.eclipse.lyo.oslc4j.core.model.FilteredResource; @@ -44,6 +35,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; + /** * @author Russell Boykin, Alberto Giammaria, Chris Peters, Gianluca Bernardini, Steve Pitschke */ diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcSimpleRdfXmlArrayProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcSimpleRdfXmlArrayProvider.java index 48911f20f..163386b80 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcSimpleRdfXmlArrayProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcSimpleRdfXmlArrayProvider.java @@ -18,15 +18,15 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; - import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; + @Provider @Produces({OslcMediaType.APPLICATION_RDF_XML}) @Consumes({OslcMediaType.APPLICATION_RDF_XML}) diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcSimpleRdfXmlCollectionProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcSimpleRdfXmlCollectionProvider.java index 62896d84d..a9d791070 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcSimpleRdfXmlCollectionProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcSimpleRdfXmlCollectionProvider.java @@ -19,15 +19,15 @@ import java.lang.reflect.Type; import java.util.Collection; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; - import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; + /** * @author Russell Boykin, Alberto Giammaria, Chris Peters, Gianluca Bernardini, Andrew Berezovskyi */ diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcSimpleXmlArrayProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcSimpleXmlArrayProvider.java index c04ec95ab..594a95db3 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcSimpleXmlArrayProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcSimpleXmlArrayProvider.java @@ -14,12 +14,12 @@ package org.eclipse.lyo.oslc4j.provider.jena; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; - -import javax.ws.rs.ext.Provider; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.ext.Provider; + @Provider @Produces({OslcMediaType.APPLICATION_XML, OslcMediaType.TEXT_XML}) @Consumes({OslcMediaType.APPLICATION_XML, OslcMediaType.TEXT_XML}) diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcSimpleXmlCollectionProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcSimpleXmlCollectionProvider.java index 06d7e8df7..566f009a7 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcSimpleXmlCollectionProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcSimpleXmlCollectionProvider.java @@ -14,12 +14,12 @@ package org.eclipse.lyo.oslc4j.provider.jena; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; - -import javax.ws.rs.ext.Provider; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.ext.Provider; + @Provider @Produces({OslcMediaType.APPLICATION_XML, OslcMediaType.TEXT_XML}) @Consumes({OslcMediaType.APPLICATION_XML, OslcMediaType.TEXT_XML}) diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcTurtleArrayProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcTurtleArrayProvider.java index 474640c6c..5ee8257a2 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcTurtleArrayProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcTurtleArrayProvider.java @@ -14,12 +14,12 @@ package org.eclipse.lyo.oslc4j.provider.jena; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; - -import javax.ws.rs.ext.Provider; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.ext.Provider; + @Provider @Produces({OslcMediaType.TEXT_TURTLE}) @Consumes({OslcMediaType.TEXT_TURTLE}) diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcTurtleCollectionProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcTurtleCollectionProvider.java index 582d7e455..24bc54fd3 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcTurtleCollectionProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcTurtleCollectionProvider.java @@ -14,12 +14,12 @@ package org.eclipse.lyo.oslc4j.provider.jena; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; - -import javax.ws.rs.ext.Provider; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.ext.Provider; + @Provider @Produces({OslcMediaType.TEXT_TURTLE}) @Consumes({OslcMediaType.TEXT_TURTLE}) diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcTurtleProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcTurtleProvider.java index c46158040..79341da23 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcTurtleProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcTurtleProvider.java @@ -14,12 +14,12 @@ package org.eclipse.lyo.oslc4j.provider.jena; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; - -import javax.ws.rs.ext.Provider; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.ext.Provider; + @Provider @Produces({OslcMediaType.TEXT_TURTLE}) @Consumes({OslcMediaType.TEXT_TURTLE}) diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcXmlArrayProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcXmlArrayProvider.java index 4848a89ee..0cb023a3c 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcXmlArrayProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcXmlArrayProvider.java @@ -14,12 +14,12 @@ package org.eclipse.lyo.oslc4j.provider.jena; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; - -import javax.ws.rs.ext.Provider; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.ext.Provider; + @Provider @Produces({OslcMediaType.APPLICATION_XML, OslcMediaType.TEXT_XML}) @Consumes({OslcMediaType.APPLICATION_XML, OslcMediaType.TEXT_XML}) diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcXmlCollectionProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcXmlCollectionProvider.java index 48fbe2fd4..ba78f52c9 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcXmlCollectionProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcXmlCollectionProvider.java @@ -14,12 +14,12 @@ package org.eclipse.lyo.oslc4j.provider.jena; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; - -import javax.ws.rs.ext.Provider; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.ext.Provider; + @Provider @Produces({OslcMediaType.APPLICATION_XML, OslcMediaType.TEXT_XML}) @Consumes({OslcMediaType.APPLICATION_XML, OslcMediaType.TEXT_XML}) diff --git a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcXmlProvider.java b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcXmlProvider.java index fad0687b7..bde97af8c 100644 --- a/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcXmlProvider.java +++ b/core/oslc4j-jena-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/OslcXmlProvider.java @@ -14,12 +14,12 @@ package org.eclipse.lyo.oslc4j.provider.jena; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; - -import javax.ws.rs.ext.Provider; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.ext.Provider; + @Provider @Produces({OslcMediaType.APPLICATION_XML, OslcMediaType.TEXT_XML}) @Consumes({OslcMediaType.APPLICATION_XML, OslcMediaType.TEXT_XML}) diff --git a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/ProviderCollectionResource.java b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/ProviderCollectionResource.java index 184564bef..223422213 100644 --- a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/ProviderCollectionResource.java +++ b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/ProviderCollectionResource.java @@ -1,5 +1,11 @@ package org.eclipse.lyo.oslc4j.provider.jena; +import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.eclipse.lyo.oslc4j.core.OSLC4JConstants; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability; @@ -7,26 +13,21 @@ import org.eclipse.lyo.oslc4j.provider.jena.test.resources.TestResource; import org.eclipse.lyo.oslc4j.provider.jena.test.resources.TestResourceNonQ; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; -import java.io.IOException; -import java.net.URI; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; @Path("/test") public class ProviderCollectionResource { diff --git a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/RdfJenaProviderCollectionTest.java b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/RdfJenaProviderCollectionTest.java index 3e1ef5eef..7cda5778d 100644 --- a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/RdfJenaProviderCollectionTest.java +++ b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/RdfJenaProviderCollectionTest.java @@ -1,5 +1,15 @@ package org.eclipse.lyo.oslc4j.provider.jena; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assumptions.assumeFalse; +import static org.junit.jupiter.api.Assumptions.assumeTrue; + +import java.io.InputStream; +import java.lang.reflect.Array; +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; + import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.Resource; @@ -28,17 +38,8 @@ import org.junit.jupiter.params.provider.ArgumentsProvider; import org.junit.jupiter.params.provider.ArgumentsSource; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; -import java.io.InputStream; -import java.lang.reflect.Array; -import java.util.List; -import java.util.Set; -import java.util.stream.Stream; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assumptions.assumeFalse; -import static org.junit.jupiter.api.Assumptions.assumeTrue; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; public class RdfJenaProviderCollectionTest extends JerseyTest { diff --git a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/shapefactory/resources/ILocalShape.java b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/shapefactory/resources/ILocalShape.java index 0b19c8427..368f73c61 100644 --- a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/shapefactory/resources/ILocalShape.java +++ b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/shapefactory/resources/ILocalShape.java @@ -17,41 +17,15 @@ package org.eclipse.lyo.oslc4j.provider.jena.shapefactory.resources; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.text.SimpleDateFormat; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; -import java.util.Iterator; - -import org.eclipse.lyo.oslc4j.core.annotation.OslcAllowedValue; -import org.eclipse.lyo.oslc4j.core.annotation.OslcDescription; -import org.eclipse.lyo.oslc4j.core.annotation.OslcMemberProperty; import org.eclipse.lyo.oslc4j.core.annotation.OslcName; import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; import org.eclipse.lyo.oslc4j.core.annotation.OslcOccurs; import org.eclipse.lyo.oslc4j.core.annotation.OslcPropertyDefinition; -import org.eclipse.lyo.oslc4j.core.annotation.OslcRdfCollectionType; -import org.eclipse.lyo.oslc4j.core.annotation.OslcRange; import org.eclipse.lyo.oslc4j.core.annotation.OslcReadOnly; -import org.eclipse.lyo.oslc4j.core.annotation.OslcRepresentation; import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; -import org.eclipse.lyo.oslc4j.core.annotation.OslcTitle; import org.eclipse.lyo.oslc4j.core.annotation.OslcValueType; -import org.eclipse.lyo.oslc4j.core.model.AbstractResource; -import org.eclipse.lyo.oslc4j.core.model.Link; import org.eclipse.lyo.oslc4j.core.model.Occurs; -import org.eclipse.lyo.oslc4j.core.model.OslcConstants; -import org.eclipse.lyo.oslc4j.core.model.Representation; import org.eclipse.lyo.oslc4j.core.model.ValueType; -import org.eclipse.lyo.oslc4j.provider.jena.shapefactory.resources.Oslc_sdDomainConstants; // Start of user code imports diff --git a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/JsonLdTest.java b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/JsonLdTest.java index 3f643cec3..814ab0769 100644 --- a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/JsonLdTest.java +++ b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/JsonLdTest.java @@ -13,13 +13,15 @@ */ package org.eclipse.lyo.oslc4j.provider.jena.test; -import com.github.jsonldjava.utils.Obj; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.util.ArrayList; import java.util.Collection; + import org.apache.jena.ext.com.google.common.collect.ImmutableList; -import javax.ws.rs.core.MultivaluedHashMap; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; import org.eclipse.lyo.oslc4j.provider.jena.OslcJsonLdArrayProvider; @@ -28,7 +30,7 @@ import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.*; +import jakarta.ws.rs.core.MultivaluedHashMap; /** * Created on 2018-03-03 diff --git a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/RdfXmlAbbreviatedWriterTest.java b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/RdfXmlAbbreviatedWriterTest.java index f5ccf2166..fb472a891 100644 --- a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/RdfXmlAbbreviatedWriterTest.java +++ b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/RdfXmlAbbreviatedWriterTest.java @@ -13,6 +13,9 @@ */ package org.eclipse.lyo.oslc4j.provider.jena.test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -25,9 +28,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; + import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.eclipse.lyo.oslc4j.core.model.QueryCapability; @@ -41,7 +42,9 @@ import org.eclipse.lyo.oslc4j.provider.jena.RdfXmlAbbreviatedWriter; import org.junit.Test; -import static org.junit.Assert.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; public class RdfXmlAbbreviatedWriterTest { @Test diff --git a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/ReifiedLinksTest.java b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/ReifiedLinksTest.java index 2fb4e230b..adaaee4a2 100644 --- a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/ReifiedLinksTest.java +++ b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/ReifiedLinksTest.java @@ -1,18 +1,21 @@ package org.eclipse.lyo.oslc4j.provider.jena.test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + import java.lang.reflect.InvocationTargetException; import java.net.URI; import java.net.URISyntaxException; import java.util.List; + import javax.xml.datatype.DatatypeConfigurationException; + import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ReifiedStatement; -import static org.assertj.core.api.Assertions.assertThat; import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; import org.eclipse.lyo.oslc4j.core.model.Link; import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; import org.eclipse.lyo.oslc4j.provider.jena.test.resources.ResourceWithReifiedLinks; -import static org.junit.Assert.*; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/ServiceProviderTest.java b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/ServiceProviderTest.java index 4c7f83d48..83b48916c 100644 --- a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/ServiceProviderTest.java +++ b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/ServiceProviderTest.java @@ -13,21 +13,22 @@ */ package org.eclipse.lyo.oslc4j.provider.jena.test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.io.InputStream; import java.net.URI; import java.util.Arrays; import java.util.List; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; import org.eclipse.lyo.oslc4j.core.model.Service; import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; import org.junit.Test; -import org.apache.jena.rdf.model.Model; -import org.apache.jena.rdf.model.ModelFactory; - public class ServiceProviderTest { @Test public void testUsage() throws Exception { diff --git a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/ShapeTest.java b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/ShapeTest.java index 2c4896ad1..b28a42c4f 100644 --- a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/ShapeTest.java +++ b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/ShapeTest.java @@ -25,14 +25,14 @@ import java.util.Collection; import java.util.List; -import javax.ws.rs.core.MediaType; - import org.eclipse.lyo.oslc4j.core.model.AllowedValues; import org.eclipse.lyo.oslc4j.core.model.Property; import org.eclipse.lyo.oslc4j.core.model.ResourceShape; import org.eclipse.lyo.oslc4j.provider.jena.OslcTurtleProvider; import org.junit.Test; +import jakarta.ws.rs.core.MediaType; + public class ShapeTest { @Test public void allowedAndDefaultValuesTest() throws Exception { diff --git a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/TurtleTest.java b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/TurtleTest.java index c34ae7fe2..cb26da82b 100644 --- a/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/TurtleTest.java +++ b/core/oslc4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/TurtleTest.java @@ -17,12 +17,12 @@ import java.io.InputStream; -import javax.ws.rs.core.MediaType; - import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; import org.eclipse.lyo.oslc4j.provider.jena.OslcTurtleProvider; import org.junit.Test; +import jakarta.ws.rs.core.MediaType; + public class TurtleTest { @Test @SuppressWarnings({ diff --git a/core/oslc4j-json4j-provider/pom.xml b/core/oslc4j-json4j-provider/pom.xml index 9dcccd045..ea981e83e 100644 --- a/core/oslc4j-json4j-provider/pom.xml +++ b/core/oslc4j-json4j-provider/pom.xml @@ -1,133 +1,125 @@ - - 4.0.0 - - org.eclipse.lyo.oslc4j.core - oslc4j-core-build - 6.0.0-SNAPSHOT - ../oslc4j-core-build/pom.xml - - oslc4j-json4j-provider - Lyo :: Core :: JSON4J Provider (legacy) - JAX-RS provider for reading and writing OSLC 2.0 JSON content using the Eclipse Lyo OSLC4J SDK. + + 4.0.0 + + org.eclipse.lyo.oslc4j.core + oslc4j-core-build + 6.0.0-SNAPSHOT + ../oslc4j-core-build/pom.xml + + oslc4j-json4j-provider + Lyo :: Core :: JSON4J Provider (legacy) + JAX-RS provider for reading and writing OSLC 2.0 JSON content + using the Eclipse Lyo OSLC4J SDK. - - + + - - - org.eclipse.lyo.oslc4j.core - oslc4j-core-wink - ${v.lyo} - + + + org.eclipse.lyo.oslc4j.core + oslc4j-core-wink + ${v.lyo} + - - org.apache.wink - wink-json4j - 1.4 - - - javax.servlet - javax.servlet-api - provided - - - jakarta.ws.rs - jakarta.ws.rs-api - provided - + + org.apache.wink + wink-json4j + 1.4 + + + jakarta.servlet + jakarta.servlet-api + + + jakarta.ws.rs + jakarta.ws.rs-api + - - - org.junit.jupiter - junit-jupiter-api - test - - + + org.junit.jupiter + junit-jupiter-api + test + + - - org.junit.jupiter - junit-jupiter-engine - test - - - - org.junit.jupiter - junit-jupiter-params - test - - - org.assertj - assertj-core - test - - - org.glassfish.jersey.containers - jersey-container-servlet - test - - - org.glassfish.jersey.inject - jersey-hk2 - test - - - org.glassfish.jersey.core - jersey-server - test - - - org.glassfish.jersey.core - jersey-common - test - + + org.junit.jupiter + junit-jupiter-engine + test + + + + org.junit.jupiter + junit-jupiter-params + test + + + org.assertj + assertj-core + test + + + org.glassfish.jersey.containers + jersey-container-servlet + test + + + org.glassfish.jersey.inject + jersey-hk2 + test + + + org.glassfish.jersey.core + jersey-server + test + + + org.glassfish.jersey.core + jersey-common + test + - - - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-grizzly2 - ${v.jersey} - test - - - - - javax.servlet - javax.servlet-api - - - + + + org.glassfish.jersey.test-framework.providers + jersey-test-framework-provider-grizzly2 + ${v.jersey} + test + - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - + + + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + diff --git a/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/AbstractOslcRdfJsonProvider.java b/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/AbstractOslcRdfJsonProvider.java index f964ea2ef..6a86a530c 100644 --- a/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/AbstractOslcRdfJsonProvider.java +++ b/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/AbstractOslcRdfJsonProvider.java @@ -21,17 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.ext.Providers; - import org.apache.wink.json4j.JSONObject; import org.eclipse.lyo.oslc4j.core.OSLC4JConstants; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; @@ -42,6 +31,16 @@ import org.eclipse.lyo.oslc4j.core.model.ResponseInfo; import org.eclipse.lyo.oslc4j.core.model.ResponseInfoArray; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.ext.Providers; + /** * Use JSON-LD support in Jena provider. */ diff --git a/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcCompactJsonProvider.java b/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcCompactJsonProvider.java index 8a1c7e7e7..7401de774 100644 --- a/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcCompactJsonProvider.java +++ b/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcCompactJsonProvider.java @@ -19,18 +19,18 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; - import org.eclipse.lyo.oslc4j.core.model.Compact; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; + /** * Use JSON-LD support in Jena provider. */ diff --git a/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcRdfJsonArrayProvider.java b/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcRdfJsonArrayProvider.java index 560326b6f..bee0743d5 100644 --- a/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcRdfJsonArrayProvider.java +++ b/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcRdfJsonArrayProvider.java @@ -19,17 +19,17 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; - import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; + /** * Use JSON-LD support in Jena provider. */ diff --git a/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcRdfJsonCollectionProvider.java b/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcRdfJsonCollectionProvider.java index ea3773f43..19ec1d72a 100644 --- a/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcRdfJsonCollectionProvider.java +++ b/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcRdfJsonCollectionProvider.java @@ -37,20 +37,20 @@ import java.util.SortedSet; import java.util.TreeSet; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; - import org.eclipse.lyo.oslc4j.core.CoreHelper; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; + /** * Use JSON-LD support in Jena provider. */ diff --git a/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcRdfJsonProvider.java b/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcRdfJsonProvider.java index 2012a6609..7c6195dff 100644 --- a/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcRdfJsonProvider.java +++ b/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcRdfJsonProvider.java @@ -25,15 +25,6 @@ import java.util.Collection; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; - import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; import org.eclipse.lyo.oslc4j.core.model.FilteredResource; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; @@ -43,6 +34,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; + /** * Use JSON-LD support in Jena provider. */ diff --git a/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcSimpleRdfJsonArrayProvider.java b/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcSimpleRdfJsonArrayProvider.java index e2016ded0..9716957d8 100644 --- a/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcSimpleRdfJsonArrayProvider.java +++ b/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcSimpleRdfJsonArrayProvider.java @@ -18,15 +18,15 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; - import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; + /** * Use JSON-LD support in Jena provider. */ diff --git a/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcSimpleRdfJsonCollectionProvider.java b/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcSimpleRdfJsonCollectionProvider.java index 283a7df10..ca4c3e30c 100644 --- a/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcSimpleRdfJsonCollectionProvider.java +++ b/core/oslc4j-json4j-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcSimpleRdfJsonCollectionProvider.java @@ -19,15 +19,15 @@ import java.lang.reflect.Type; import java.util.Collection; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; - import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; + /** * Use JSON-LD support in Jena provider. */ diff --git a/core/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcJsonProviderCollectionTest.java b/core/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcJsonProviderCollectionTest.java index c17b5095b..6687233cf 100644 --- a/core/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcJsonProviderCollectionTest.java +++ b/core/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/OslcJsonProviderCollectionTest.java @@ -1,5 +1,16 @@ package org.eclipse.lyo.oslc4j.provider.json4j; +import static org.assertj.core.api.Assertions.assertThat; + +import java.lang.reflect.Array; +import java.lang.reflect.InvocationTargetException; +import java.net.URISyntaxException; +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; + +import javax.xml.datatype.DatatypeConfigurationException; + import org.apache.wink.json4j.JSONException; import org.apache.wink.json4j.JSONObject; import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; @@ -21,18 +32,9 @@ import org.junit.jupiter.params.provider.ArgumentsProvider; import org.junit.jupiter.params.provider.ArgumentsSource; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.xml.datatype.DatatypeConfigurationException; -import java.lang.reflect.Array; -import java.lang.reflect.InvocationTargetException; -import java.net.URISyntaxException; -import java.util.List; -import java.util.Set; -import java.util.stream.Stream; - -import static org.assertj.core.api.Assertions.*; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; public class OslcJsonProviderCollectionTest extends JerseyTest { diff --git a/core/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/ProviderCollectionResource.java b/core/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/ProviderCollectionResource.java index 03d117a2e..5abbe4ab1 100644 --- a/core/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/ProviderCollectionResource.java +++ b/core/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/ProviderCollectionResource.java @@ -1,37 +1,33 @@ package org.eclipse.lyo.oslc4j.provider.json4j; +import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.eclipse.lyo.oslc4j.core.OSLC4JConstants; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability; -import org.eclipse.lyo.oslc4j.core.model.OslcConstants; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; import org.eclipse.lyo.oslc4j.provider.json4j.test.resources.TestResource; import org.eclipse.lyo.oslc4j.provider.json4j.test.resources.TestResourceNonQ; -import org.junit.Test; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; -import java.io.IOException; -import java.net.URI; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.IntStream; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; @Path("/test") public class ProviderCollectionResource { diff --git a/core/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/test/JsonOslcNameTest.java b/core/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/test/JsonOslcNameTest.java index ea84179e9..8f8b4c93f 100644 --- a/core/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/test/JsonOslcNameTest.java +++ b/core/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/test/JsonOslcNameTest.java @@ -13,6 +13,10 @@ */ package org.eclipse.lyo.oslc4j.provider.json4j.test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -21,8 +25,6 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; import javax.xml.namespace.QName; import org.apache.wink.json4j.JSONArray; @@ -34,8 +36,10 @@ import org.eclipse.lyo.oslc4j.provider.json4j.test.resources.EmptyNameResource; import org.eclipse.lyo.oslc4j.provider.json4j.test.resources.TestResource; import org.eclipse.lyo.oslc4j.provider.json4j.test.resources.UnnamedResource; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; /** * Tests Json working with different combinations of OslcName annotation. @@ -63,7 +67,7 @@ public void testJenaOslcNameEmptyString() throws Exception { final OslcRdfJsonProvider oslcRdfJsonProvider = new OslcRdfJsonProvider(); JSONObject jsonObject = getJSONObject(resource, oslcRdfJsonProvider); JSONArray rdfTypes = jsonObject.getJSONArray("rdf:type"); - Assert.assertTrue("Model should not contain RDF type as OslcName is empty", rdfTypes.isEmpty()); + assertTrue(rdfTypes.isEmpty(), "Model should not contain RDF type as OslcName is empty"); } private JSONObject getJSONObject(Object resource, final OslcRdfJsonProvider oslcRdfJsonProvider) @@ -90,7 +94,7 @@ public void testJenaOslcNameEmptyStringAndOtherTypes() throws Exception { final OslcRdfJsonProvider oslcRdfJsonProvider = new OslcRdfJsonProvider(); JSONObject jsonObject = getJSONObject(resource, oslcRdfJsonProvider); JSONArray rdfTypes = jsonObject.getJSONArray("rdf:type"); - Assert.assertEquals("Model should contain only added RDF type", rdfTypes.size(), 1); + assertEquals(1, rdfTypes.size(),"Model should contain only added RDF type"); verifyRDFTypes(new String[] { typeToAdd }, rdfTypes); } @@ -105,7 +109,7 @@ public void testJenaRegularOslcName() throws Exception { final OslcRdfJsonProvider oslcRdfJsonProvider = new OslcRdfJsonProvider(); JSONObject jsonObject = getJSONObject(resource, oslcRdfJsonProvider); JSONArray rdfTypes = jsonObject.getJSONArray("rdf:type"); - Assert.assertEquals("Model should contain default RDF type", rdfTypes.size(), 1); + assertEquals(1, rdfTypes.size(),"Model should contain default RDF type"); verifyRDFTypes(new String[] { TestResource.TEST_NAMESPACE + "Test" }, rdfTypes); } @@ -123,7 +127,7 @@ public void testJenaDefaultOslcName() throws Exception { final OslcRdfJsonProvider oslcRdfJsonProvider = new OslcRdfJsonProvider(); JSONObject jsonObject = getJSONObject(resource, oslcRdfJsonProvider); JSONArray rdfTypes = jsonObject.getJSONArray("rdf:type"); - Assert.assertFalse("Model should contain RDF types", rdfTypes.isEmpty()); + assertFalse( rdfTypes.isEmpty(), "Model should contain RDF types"); verifyRDFTypes(new String[] { typeToAdd, TestResource.TEST_NAMESPACE + "UnnamedResource" }, rdfTypes); } @@ -135,8 +139,7 @@ private void verifyRDFTypes(String[] expectedRDFTypes, JSONArray rdfTypes) throw actualRdfTypesList.add(type); } for (String expectedRdfType : expectedRDFTypes) { - Assert.assertTrue("Resource should contain RDF type " + expectedRdfType, - actualRdfTypesList.contains(expectedRdfType)); + assertTrue(actualRdfTypesList.contains(expectedRdfType), "Resource should contain RDF type " + expectedRdfType); } } diff --git a/core/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/test/TestInvalidTypesJson.java b/core/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/test/TestInvalidTypesJson.java index ed2e3205e..dedd67c3f 100644 --- a/core/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/test/TestInvalidTypesJson.java +++ b/core/oslc4j-json4j-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/json4j/test/TestInvalidTypesJson.java @@ -11,39 +11,35 @@ * * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause */ + package org.eclipse.lyo.oslc4j.provider.json4j.test; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import javax.ws.rs.WebApplicationException; - import org.eclipse.lyo.oslc4j.provider.json4j.OslcRdfJsonProvider; import org.eclipse.lyo.oslc4j.provider.json4j.test.resources.TestResource; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import jakarta.ws.rs.WebApplicationException; @SuppressWarnings("deprecation") -public class TestInvalidTypesJson -{ - @Test(expected = WebApplicationException.class) - public void testInvalidJavaAboutRelativeURI() - throws IOException, - URISyntaxException - { - final TestResource relativeUri = new TestResource(); - - relativeUri.setAbout(new URI("relative")); - - final OslcRdfJsonProvider oslcRdfJsonProvider = new OslcRdfJsonProvider(); - - oslcRdfJsonProvider.writeTo(relativeUri, - null, - null, - null, - null, - null, - null); - - } +public class TestInvalidTypesJson { + @Test + public void testInvalidJavaAboutRelativeURI() throws IOException, URISyntaxException { + assertThrows(WebApplicationException.class, () -> { + + final TestResource relativeUri = new TestResource(); + + relativeUri.setAbout(new URI("relative")); + + final OslcRdfJsonProvider oslcRdfJsonProvider = new OslcRdfJsonProvider(); + + oslcRdfJsonProvider.writeTo(relativeUri, null, null, null, null, null, null); + }); + + } } diff --git a/core/oslc4j-utils/src/main/java/org/eclipse/lyo/core/utils/marshallers/MarshallerConstants.java b/core/oslc4j-utils/src/main/java/org/eclipse/lyo/core/utils/marshallers/MarshallerConstants.java index 9a5b73839..e2b5ab859 100644 --- a/core/oslc4j-utils/src/main/java/org/eclipse/lyo/core/utils/marshallers/MarshallerConstants.java +++ b/core/oslc4j-utils/src/main/java/org/eclipse/lyo/core/utils/marshallers/MarshallerConstants.java @@ -13,7 +13,7 @@ */ package org.eclipse.lyo.core.utils.marshallers; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; public class MarshallerConstants { //Media Types diff --git a/core/oslc4j-utils/src/main/java/org/eclipse/lyo/core/utils/marshallers/OSLC4JMarshaller.java b/core/oslc4j-utils/src/main/java/org/eclipse/lyo/core/utils/marshallers/OSLC4JMarshaller.java index 7874b77eb..24cbe574d 100644 --- a/core/oslc4j-utils/src/main/java/org/eclipse/lyo/core/utils/marshallers/OSLC4JMarshaller.java +++ b/core/oslc4j-utils/src/main/java/org/eclipse/lyo/core/utils/marshallers/OSLC4JMarshaller.java @@ -13,20 +13,23 @@ */ package org.eclipse.lyo.core.utils.marshallers; -import java.io.OutputStream; - -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import static org.eclipse.lyo.core.utils.marshallers.MarshallerConstants.MT_N3; +import static org.eclipse.lyo.core.utils.marshallers.MarshallerConstants.MT_N_TRIPLES; +import static org.eclipse.lyo.core.utils.marshallers.MarshallerConstants.MT_OSLC_COMPACT; +import static org.eclipse.lyo.core.utils.marshallers.MarshallerConstants.MT_RDF_XML; +import static org.eclipse.lyo.core.utils.marshallers.MarshallerConstants.MT_TURTLE; -import org.apache.wink.json4j.JSONObject; -import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; -import org.eclipse.lyo.oslc4j.provider.json4j.JsonHelper; +import java.io.OutputStream; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.RDFWriterI; import org.apache.jena.util.FileUtils; +import org.apache.wink.json4j.JSONObject; +import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; +import org.eclipse.lyo.oslc4j.provider.json4j.JsonHelper; -import static org.eclipse.lyo.core.utils.marshallers.MarshallerConstants.*; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; public class OSLC4JMarshaller { OSLC4JContext context = new OSLC4JContext(); diff --git a/core/oslc4j-utils/src/main/java/org/eclipse/lyo/core/utils/marshallers/OSLC4JUnmarshaller.java b/core/oslc4j-utils/src/main/java/org/eclipse/lyo/core/utils/marshallers/OSLC4JUnmarshaller.java index e1431c1ea..d95e442ce 100644 --- a/core/oslc4j-utils/src/main/java/org/eclipse/lyo/core/utils/marshallers/OSLC4JUnmarshaller.java +++ b/core/oslc4j-utils/src/main/java/org/eclipse/lyo/core/utils/marshallers/OSLC4JUnmarshaller.java @@ -22,16 +22,16 @@ import java.lang.reflect.InvocationTargetException; import java.net.URISyntaxException; -import javax.ws.rs.core.MediaType; import javax.xml.datatype.DatatypeConfigurationException; -import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; -import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; - import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFReaderI; import org.apache.jena.util.FileUtils; +import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; +import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; + +import jakarta.ws.rs.core.MediaType; public class OSLC4JUnmarshaller { diff --git a/domains/oslc-domains/pom.xml b/domains/oslc-domains/pom.xml index 70da282c2..7a2468eda 100644 --- a/domains/oslc-domains/pom.xml +++ b/domains/oslc-domains/pom.xml @@ -1,79 +1,81 @@ - 4.0.0 - - - - org.eclipse.lyo - lyo-parent - 6.0.0-SNAPSHOT - ../../pom.xml - - + + org.eclipse.lyo - oslc-domains + lyo-parent 6.0.0-SNAPSHOT - jar - Lyo :: Domains - - + org.eclipse.lyo + oslc-domains + 6.0.0-SNAPSHOT + jar + Lyo :: Domains + + - - + - - - - - - + - - + - - - javax.servlet - javax.servlet-api - provided - - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - provided - + + + jakarta.servlet + jakarta.servlet-api + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + - - - org.eclipse.lyo.oslc4j.core - oslc4j-core - - + + org.eclipse.lyo.oslc4j.core + oslc4j-core + + - - + - - - - - - org.apache.maven.plugins - maven-source-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - diff --git a/pom.xml b/pom.xml index 199a4b38b..dabfdff49 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 org.eclipse.lyo lyo-parent @@ -20,7 +21,7 @@ 1.9.21 1.9.10 - 2.35 + 3.1.5 3.1.0 4.8.0 @@ -35,9 +36,12 @@ https://eclipse.org/lyo - The Eclipse Lyo project is focused on providing an SDK to enable adoption of OSLC specifications. OSLC (Open - Services for Lifecycle Collaboration) is an open community dedicated to reducing barriers for lifecycle tool - integration. The community authors specifications for exposing lifecycle artifacts through uniform (REST) + The Eclipse Lyo project is focused on providing an SDK to enable adoption of + OSLC specifications. OSLC (Open + Services for Lifecycle Collaboration) is an open community dedicated to + reducing barriers for lifecycle tool + integration. The community authors specifications for exposing lifecycle + artifacts through uniform (REST) interfaces and relying on Internet and Linked Data standards. @@ -134,7 +138,8 @@ jena-staging Apache Jena staging - https://repository.apache.org/content/repositories/orgapachejena-1052 + + https://repository.apache.org/content/repositories/orgapachejena-1052 false @@ -190,7 +195,8 @@ dash-licenses-snapshots - https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/ + + https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/ true @@ -214,9 +220,9 @@ - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.2 + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + 3.0.0 org.eclipse.lyo.oslc4j.core @@ -236,12 +242,18 @@ jakarta.xml.bind jakarta.xml.bind-api - 2.3.3 + 4.0.2 + + + jakarta.annotation + jakarta.annotation-api + 2.1.1 + provided org.glassfish.jaxb jaxb-runtime - 2.3.6 + 4.0.5 @@ -297,12 +309,12 @@ jakarta.ws.rs jakarta.ws.rs-api - 2.1.6 + 3.1.0 - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + 6.0.0 org.glassfish.jersey.containers @@ -383,16 +395,10 @@ guava ${v.guava} - - jakarta.annotation - jakarta.annotation-api - 1.3.5 - provided - jakarta.activation jakarta.activation-api - 1.2.2 + 2.1.3 provided @@ -425,7 +431,8 @@ maven-compiler-plugin 3.12.1 - -Xlint:fallthrough,unchecked,removal,deprecation,dep-ann,varargs,overloads,serial,try,finally + + -Xlint:fallthrough,unchecked,removal,deprecation,dep-ann,varargs,overloads,serial,try,finally @@ -446,21 +453,6 @@ maven-javadoc-plugin 3.6.3 - - - - OslcSchema - X - - - OslcNamespaceDefinition - X - - - Deprecated - X - - all,-accessibility,-html,-missing @@ -486,7 +478,8 @@ maven-surefire-plugin 3.2.5 - + false @@ -535,7 +528,7 @@ org.apache.logging.log4j:log4j-core - + diff --git a/server/net.oauth.core-oauth-consumer-jakarta/pom.xml b/server/net.oauth.core-oauth-consumer-jakarta/pom.xml new file mode 100644 index 000000000..68dbd584a --- /dev/null +++ b/server/net.oauth.core-oauth-consumer-jakarta/pom.xml @@ -0,0 +1,49 @@ + + 4.0.0 + + org.eclipse.lyo.oslc4j.server + lyo-server-build + 6.0.0-SNAPSHOT + ../pom.xml + + org.eclipse.lyo.server + net.oauth.core-oauth-consumer-jakarta + jar + + + net.oauth.core + oauth-consumer + + + + + + org.eclipse.transformer + transformer-maven-plugin + 0.5.0 + true + + + true + + + + + default-jar + + jar + + + + net.oauth.core + oauth-consumer + + + + + + + + + diff --git a/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml b/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml new file mode 100644 index 000000000..3a30a1e58 --- /dev/null +++ b/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml @@ -0,0 +1,55 @@ + + 4.0.0 + + org.eclipse.lyo.oslc4j.server + lyo-server-build + 6.0.0-SNAPSHOT + ../pom.xml + + org.eclipse.lyo.server + net.oauth.core-oauth-httpclient4-jakarta + jar + + + net.oauth.core + oauth-httpclient4 + + + org.apache.httpcomponents + httpclient + + + + + + + + org.eclipse.transformer + transformer-maven-plugin + 0.5.0 + true + + + true + + + + + default-jar + + jar + + + + net.oauth.core + oauth-httpclient4 + + + + + + + + + diff --git a/server/net.oauth.core-oauth-jakarta/pom.xml b/server/net.oauth.core-oauth-jakarta/pom.xml new file mode 100644 index 000000000..e1620ae9a --- /dev/null +++ b/server/net.oauth.core-oauth-jakarta/pom.xml @@ -0,0 +1,49 @@ + + 4.0.0 + + org.eclipse.lyo.oslc4j.server + lyo-server-build + 6.0.0-SNAPSHOT + ../pom.xml + + org.eclipse.lyo.server + net.oauth.core-oauth-jakarta + jar + + + net.oauth.core + oauth + + + + + + org.eclipse.transformer + transformer-maven-plugin + 0.5.0 + true + + + true + + + + + default-jar + + jar + + + + net.oauth.core + oauth + + + + + + + + + diff --git a/server/net.oauth.core-oauth-provider-jakarta/pom.xml b/server/net.oauth.core-oauth-provider-jakarta/pom.xml new file mode 100644 index 000000000..5488d39d7 --- /dev/null +++ b/server/net.oauth.core-oauth-provider-jakarta/pom.xml @@ -0,0 +1,49 @@ + + 4.0.0 + + org.eclipse.lyo.oslc4j.server + lyo-server-build + 6.0.0-SNAPSHOT + ../pom.xml + + org.eclipse.lyo.server + net.oauth.core-oauth-provider-jakarta + jar + + + net.oauth.core + oauth-provider + + + + + + org.eclipse.transformer + transformer-maven-plugin + 0.5.0 + true + + + true + + + + + default-jar + + jar + + + + net.oauth.core + oauth-provider + + + + + + + + + diff --git a/server/oauth-consumer-store/pom.xml b/server/oauth-consumer-store/pom.xml index 338175dbc..2469934f8 100644 --- a/server/oauth-consumer-store/pom.xml +++ b/server/oauth-consumer-store/pom.xml @@ -29,8 +29,8 @@ pom - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api org.apache.httpcomponents diff --git a/server/oauth-core/pom.xml b/server/oauth-core/pom.xml index 0e407377b..0ef21dbeb 100644 --- a/server/oauth-core/pom.xml +++ b/server/oauth-core/pom.xml @@ -29,23 +29,52 @@ jakarta.ws.rs-api - net.oauth.core - oauth + org.eclipse.lyo.server + net.oauth.core-oauth-jakarta + ${v.lyo} + + + + net.oauth.core + oauth + + - net.oauth.core - oauth-consumer + org.eclipse.lyo.server + net.oauth.core-oauth-consumer-jakarta + ${v.lyo} + + + + net.oauth.core + oauth-consumer + + - net.oauth.core - oauth-provider + org.eclipse.lyo.server + net.oauth.core-oauth-provider-jakarta + ${v.lyo} + + + + net.oauth.core + oauth-provider + + - javax.servlet - javax.servlet-api - provided + jakarta.servlet + jakarta.servlet-api org.slf4j diff --git a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/Application.java b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/Application.java index 970141af4..a840aabb5 100644 --- a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/Application.java +++ b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/Application.java @@ -13,7 +13,7 @@ */ package org.eclipse.lyo.server.oauth.core; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Handles authentication with the backend system. diff --git a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/AuthenticationException.java b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/AuthenticationException.java index 6f32a869c..e60eb2798 100644 --- a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/AuthenticationException.java +++ b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/AuthenticationException.java @@ -13,7 +13,7 @@ */ package org.eclipse.lyo.server.oauth.core; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * An exception indicating that authentication failed. diff --git a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/OAuthConfiguration.java b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/OAuthConfiguration.java index 01f61e994..c35016fee 100644 --- a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/OAuthConfiguration.java +++ b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/OAuthConfiguration.java @@ -13,18 +13,18 @@ */ package org.eclipse.lyo.server.oauth.core; -import javax.servlet.http.HttpServletResponse; - -import net.oauth.OAuthProblemException; -import net.oauth.OAuthValidator; -import net.oauth.SimpleOAuthValidator; -import net.oauth.http.HttpMessage; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.lyo.server.oauth.core.consumer.ConsumerStore; import org.eclipse.lyo.server.oauth.core.consumer.ConsumerStoreException; import org.eclipse.lyo.server.oauth.core.token.SimpleTokenStrategy; import org.eclipse.lyo.server.oauth.core.token.TokenStrategy; +import net.oauth.OAuthProblemException; +import net.oauth.OAuthValidator; +import net.oauth.SimpleOAuthValidator; +import net.oauth.http.HttpMessage; + /** * Manages the OAuth provider configuration, including the validator, consumer store, and * token strategy. diff --git a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/OAuthRequest.java b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/OAuthRequest.java index b1d4d1e8e..18c40394c 100644 --- a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/OAuthRequest.java +++ b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/OAuthRequest.java @@ -16,10 +16,14 @@ import java.io.IOException; import java.net.URISyntaxException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.UriBuilder; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import org.eclipse.lyo.server.oauth.core.consumer.LyoOAuthConsumer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import jakarta.ws.rs.core.UriBuilder; import net.oauth.OAuth; import net.oauth.OAuthAccessor; import net.oauth.OAuthException; @@ -28,10 +32,6 @@ import net.oauth.OAuthValidator; import net.oauth.server.OAuthServlet; -import org.eclipse.lyo.server.oauth.core.consumer.LyoOAuthConsumer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Validates that a request is authorized. The request must contain a valid * access token and pass {@link OAuthValidator} tests. To change the validator @@ -120,7 +120,7 @@ public LyoOAuthConsumer getConsumer() { * using the validator set in the {@link OAuthConfiguration}. *

* If the request fails validation, you can use - * {@link OAuthServlet#handleException(javax.servlet.http.HttpServletResponse, Exception, String)} + * {@link OAuthServlet#handleException(jakarta.servlet.http.HttpServletResponse, Exception, String)} * to send an unauthorized response. * * @throws OAuthException if the request fails validation diff --git a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/token/SimpleTokenStrategy.java b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/token/SimpleTokenStrategy.java index c62865e15..82176e384 100644 --- a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/token/SimpleTokenStrategy.java +++ b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/token/SimpleTokenStrategy.java @@ -17,7 +17,7 @@ import java.util.Map; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.eclipse.lyo.server.oauth.core.OAuthRequest; diff --git a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/token/TokenStrategy.java b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/token/TokenStrategy.java index d321516f3..0f306a977 100644 --- a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/token/TokenStrategy.java +++ b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/token/TokenStrategy.java @@ -15,14 +15,13 @@ import java.io.IOException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; + +import org.eclipse.lyo.server.oauth.core.OAuthRequest; -import net.oauth.OAuthAccessor; import net.oauth.OAuthException; import net.oauth.OAuthMessage; -import org.eclipse.lyo.server.oauth.core.OAuthRequest; - /** * Manages and validates OAuth tokens and token secrets. * {@link SimpleTokenStrategy} is a basic implementation, but you can implement diff --git a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/utils/AbstractAdapterCredentialsFilter.java b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/utils/AbstractAdapterCredentialsFilter.java index 0f8b4d537..c73e490c4 100644 --- a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/utils/AbstractAdapterCredentialsFilter.java +++ b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/utils/AbstractAdapterCredentialsFilter.java @@ -16,26 +16,18 @@ import java.io.IOException; import java.net.URISyntaxException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; - -import net.oauth.OAuth; -import net.oauth.OAuthAccessor; -import net.oauth.OAuthException; -import net.oauth.OAuthMessage; -import net.oauth.OAuthProblemException; -import net.oauth.http.HttpMessage; -import net.oauth.server.OAuthServlet; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; import org.eclipse.lyo.server.oauth.core.Application; @@ -49,6 +41,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import net.oauth.OAuth; +import net.oauth.OAuthAccessor; +import net.oauth.OAuthException; +import net.oauth.OAuthMessage; +import net.oauth.OAuthProblemException; +import net.oauth.http.HttpMessage; +import net.oauth.server.OAuthServlet; + /** *

Overview

* Purpose: Provide a JEE Servlet filter base implementation for accepting diff --git a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/utils/RestException.java b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/utils/RestException.java index 22eb80db5..3fc9f0786 100644 --- a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/utils/RestException.java +++ b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/utils/RestException.java @@ -13,7 +13,7 @@ */ package org.eclipse.lyo.server.oauth.core.utils; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * Holds a status code and error message for an error response. diff --git a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/utils/UnauthorizedException.java b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/utils/UnauthorizedException.java index a723ea78b..4f33efe82 100644 --- a/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/utils/UnauthorizedException.java +++ b/server/oauth-core/src/main/java/org/eclipse/lyo/server/oauth/core/utils/UnauthorizedException.java @@ -13,7 +13,7 @@ */ package org.eclipse.lyo.server.oauth.core.utils; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * Corresponds to an HTTP 401 response. diff --git a/server/oauth-webapp/pom.xml b/server/oauth-webapp/pom.xml index 747710a88..548ede7c4 100644 --- a/server/oauth-webapp/pom.xml +++ b/server/oauth-webapp/pom.xml @@ -16,19 +16,9 @@ + - - - net.oauth.core - oauth - provided - - - net.oauth.core - oauth-provider - provided - - org.eclipse.lyo.server @@ -39,14 +29,14 @@ - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api provided - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/server/oauth-webapp/src/main/java/org/eclipse/lyo/server/oauth/webapp/services/CSRFPrevent.java b/server/oauth-webapp/src/main/java/org/eclipse/lyo/server/oauth/webapp/services/CSRFPrevent.java index 8b212e168..37b339504 100644 --- a/server/oauth-webapp/src/main/java/org/eclipse/lyo/server/oauth/webapp/services/CSRFPrevent.java +++ b/server/oauth-webapp/src/main/java/org/eclipse/lyo/server/oauth/webapp/services/CSRFPrevent.java @@ -13,15 +13,16 @@ */ package org.eclipse.lyo.server.oauth.webapp.services; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; + /** * Checks requests to see if they have the right X-CSRF-Prevent header values. * diff --git a/server/oauth-webapp/src/main/java/org/eclipse/lyo/server/oauth/webapp/services/ConsumersService.java b/server/oauth-webapp/src/main/java/org/eclipse/lyo/server/oauth/webapp/services/ConsumersService.java index f96c35040..8e2095a3c 100644 --- a/server/oauth-webapp/src/main/java/org/eclipse/lyo/server/oauth/webapp/services/ConsumersService.java +++ b/server/oauth-webapp/src/main/java/org/eclipse/lyo/server/oauth/webapp/services/ConsumersService.java @@ -16,22 +16,8 @@ import java.util.Collection; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - -import net.oauth.OAuthProblemException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.wink.json4j.JSONArray; import org.apache.wink.json4j.JSONException; @@ -43,6 +29,20 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import net.oauth.OAuthProblemException; + /** * Manages OAuth consumers for this provider. * diff --git a/server/oauth-webapp/src/main/java/org/eclipse/lyo/server/oauth/webapp/services/OAuthService.java b/server/oauth-webapp/src/main/java/org/eclipse/lyo/server/oauth/webapp/services/OAuthService.java index cde971f07..e2027aeeb 100644 --- a/server/oauth-webapp/src/main/java/org/eclipse/lyo/server/oauth/webapp/services/OAuthService.java +++ b/server/oauth-webapp/src/main/java/org/eclipse/lyo/server/oauth/webapp/services/OAuthService.java @@ -20,31 +20,9 @@ import java.util.List; import java.util.UUID; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriBuilder; - -import net.oauth.OAuth; -import net.oauth.OAuth.Parameter; -import net.oauth.OAuthAccessor; -import net.oauth.OAuthException; -import net.oauth.OAuthMessage; -import net.oauth.OAuthProblemException; -import net.oauth.OAuthValidator; -import net.oauth.server.OAuthServlet; -import net.oauth.signature.OAuthSignatureMethod; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.wink.json4j.JSON; import org.apache.wink.json4j.JSONException; @@ -59,6 +37,27 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilder; +import net.oauth.OAuth; +import net.oauth.OAuth.Parameter; +import net.oauth.OAuthAccessor; +import net.oauth.OAuthException; +import net.oauth.OAuthMessage; +import net.oauth.OAuthProblemException; +import net.oauth.OAuthValidator; +import net.oauth.server.OAuthServlet; + /** * Issues OAuth request tokens, handles authentication, and then exchanges * request tokens for access tokens based on the OAuth configuration set in the diff --git a/server/oauth-webapp/src/main/java/org/eclipse/lyo/server/oauth/webapp/services/OAuthServletListener.java b/server/oauth-webapp/src/main/java/org/eclipse/lyo/server/oauth/webapp/services/OAuthServletListener.java index 30262b969..75d0c9c14 100644 --- a/server/oauth-webapp/src/main/java/org/eclipse/lyo/server/oauth/webapp/services/OAuthServletListener.java +++ b/server/oauth-webapp/src/main/java/org/eclipse/lyo/server/oauth/webapp/services/OAuthServletListener.java @@ -14,13 +14,13 @@ package org.eclipse.lyo.server.oauth.webapp.services; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; + import org.eclipse.lyo.server.oauth.core.OAuthConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - public class OAuthServletListener implements ServletContextListener { private static final Logger log = LoggerFactory.getLogger(OAuthServletListener.class); diff --git a/server/oauth-webapp/src/main/webapp/WEB-INF/web.xml b/server/oauth-webapp/src/main/webapp/WEB-INF/web.xml index 593d8fcd2..ec1d01d2b 100644 --- a/server/oauth-webapp/src/main/webapp/WEB-INF/web.xml +++ b/server/oauth-webapp/src/main/webapp/WEB-INF/web.xml @@ -12,11 +12,11 @@ --> - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee/ + https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd" + version="5.0"> Eclipse Lyo Sample OAuth Provider An example demonstrating the Lyo OAuth provider framework. diff --git a/server/pom.xml b/server/pom.xml index ca3e40686..cfe2be6a4 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -19,6 +19,10 @@ oauth-consumer-store oauth-webapp oslc-ui-model + net.oauth.core-oauth-jakarta + net.oauth.core-oauth-consumer-jakarta + net.oauth.core-oauth-provider-jakarta + net.oauth.core-oauth-httpclient4-jakarta @@ -38,6 +42,11 @@ oauth-provider 20100527 + + net.oauth.core + oauth-httpclient4 + 20090913 + org.apache.wink wink-server @@ -54,12 +63,6 @@ stax-api 1.0.1 - - javax.servlet - javax.servlet-api - 3.1.0 - provided - @@ -83,6 +86,9 @@ org.apache.maven.plugins maven-javadoc-plugin + + net.oauth.core-oauth-jakarta, net.oauth.core-oauth-consumer-jakarta, net.oauth.core-oauth-provider-jakarta + diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml index 2590f8d55..35b9288aa 100644 --- a/store/store-core/pom.xml +++ b/store/store-core/pom.xml @@ -63,8 +63,8 @@ pom - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api org.apache.httpcomponents diff --git a/store/store-core/src/main/java/org/eclipse/lyo/store/Store.java b/store/store-core/src/main/java/org/eclipse/lyo/store/Store.java index 33b36f17e..b3b0d37a5 100644 --- a/store/store-core/src/main/java/org/eclipse/lyo/store/Store.java +++ b/store/store-core/src/main/java/org/eclipse/lyo/store/Store.java @@ -1,5 +1,14 @@ package org.eclipse.lyo.store; +import java.net.URI; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.Set; + +import org.apache.jena.arq.querybuilder.SelectBuilder; + /* * Copyright (c) 2020 Contributors to the Eclipse Foundation * @@ -15,14 +24,6 @@ */ import org.apache.jena.rdf.model.Model; -import org.apache.jena.arq.querybuilder.SelectBuilder; -import java.net.URISyntaxException; -import java.net.URI; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.NoSuchElementException; -import java.util.Set; import org.eclipse.lyo.oslc4j.core.model.IResource; /** diff --git a/store/store-core/src/main/java/org/eclipse/lyo/store/StorePool.java b/store/store-core/src/main/java/org/eclipse/lyo/store/StorePool.java index acb222230..f58f85085 100644 --- a/store/store-core/src/main/java/org/eclipse/lyo/store/StorePool.java +++ b/store/store-core/src/main/java/org/eclipse/lyo/store/StorePool.java @@ -1,5 +1,9 @@ package org.eclipse.lyo.store; +import java.net.URI; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; + /* * Copyright (c) 2020 Contributors to the Eclipse Foundation * @@ -21,10 +25,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.URI; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingQueue; - public class StorePool { public final static URI DEFAULT_GRAPH_JENA = URI.create("urn:x-arq:DefaultGraph"); diff --git a/store/store-core/src/main/java/org/eclipse/lyo/store/internals/DatasetBuilder.java b/store/store-core/src/main/java/org/eclipse/lyo/store/internals/DatasetBuilder.java index a597300aa..f62fbbd69 100644 --- a/store/store-core/src/main/java/org/eclipse/lyo/store/internals/DatasetBuilder.java +++ b/store/store-core/src/main/java/org/eclipse/lyo/store/internals/DatasetBuilder.java @@ -1,5 +1,9 @@ package org.eclipse.lyo.store.internals; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; + /* * Copyright (c) 2020 Contributors to the Eclipse Foundation * @@ -18,9 +22,6 @@ import org.apache.jena.query.Dataset; import org.apache.jena.tdb.TDB; import org.apache.jena.tdb.TDBFactory; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/store/store-core/src/main/java/org/eclipse/lyo/store/internals/SparqlStoreImpl.java b/store/store-core/src/main/java/org/eclipse/lyo/store/internals/SparqlStoreImpl.java index dbafb6418..3c3000360 100644 --- a/store/store-core/src/main/java/org/eclipse/lyo/store/internals/SparqlStoreImpl.java +++ b/store/store-core/src/main/java/org/eclipse/lyo/store/internals/SparqlStoreImpl.java @@ -1,5 +1,24 @@ package org.eclipse.lyo.store.internals; +import java.lang.reflect.Array; +import java.lang.reflect.InvocationTargetException; +import java.net.URI; +import java.net.URISyntaxException; +import java.time.Duration; +import java.time.Instant; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.stream.Collectors; + +import javax.xml.datatype.DatatypeConfigurationException; + /* * Copyright (c) 2020 Contributors to the Eclipse Foundation * @@ -63,25 +82,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.xml.datatype.DatatypeConfigurationException; -import java.lang.reflect.Array; -import java.lang.reflect.InvocationTargetException; -import java.net.URI; -import java.net.URISyntaxException; -import java.time.Duration; -import java.time.Instant; -import java.util.Arrays; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.NoSuchElementException; -import java.util.Set; -import java.util.stream.Collectors; - /** * {@link Store} interface implementation that interacts with any SPARQL-based triplestore * through a Query and Update endpoints. diff --git a/store/store-core/src/main/java/org/eclipse/lyo/store/internals/query/SparqlQueryExecutorBasicAuthImpl.java b/store/store-core/src/main/java/org/eclipse/lyo/store/internals/query/SparqlQueryExecutorBasicAuthImpl.java index 4681a8a62..65f3f668f 100644 --- a/store/store-core/src/main/java/org/eclipse/lyo/store/internals/query/SparqlQueryExecutorBasicAuthImpl.java +++ b/store/store-core/src/main/java/org/eclipse/lyo/store/internals/query/SparqlQueryExecutorBasicAuthImpl.java @@ -1,5 +1,7 @@ package org.eclipse.lyo.store.internals.query; +import static org.apache.jena.http.HttpLib.basicAuth; + /* * Copyright (c) 2022 Contributors to the Eclipse Foundation * @@ -24,8 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.jena.http.HttpLib.basicAuth; - /** * SparqlQueryExecutorImpl is a SPARQL endpoint-based implementation of {@link JenaQueryExecutor}. * diff --git a/store/store-core/src/test/java/org/eclipse/lyo/store/DatasetBuilderTest.java b/store/store-core/src/test/java/org/eclipse/lyo/store/DatasetBuilderTest.java index a7266f6fc..13be0d1bd 100644 --- a/store/store-core/src/test/java/org/eclipse/lyo/store/DatasetBuilderTest.java +++ b/store/store-core/src/test/java/org/eclipse/lyo/store/DatasetBuilderTest.java @@ -14,10 +14,7 @@ package org.eclipse.lyo.store; -import org.apache.jena.query.Dataset; -import org.eclipse.lyo.store.internals.DatasetBuilder; -import org.junit.Ignore; -import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; import java.nio.file.Files; @@ -25,7 +22,10 @@ import java.nio.file.Paths; import java.util.Iterator; -import static org.assertj.core.api.Assertions.*; +import org.apache.jena.query.Dataset; +import org.eclipse.lyo.store.internals.DatasetBuilder; +import org.junit.Ignore; +import org.junit.Test; public class DatasetBuilderTest { diff --git a/store/store-core/src/test/java/org/eclipse/lyo/store/SparqlStoreImplIT.java b/store/store-core/src/test/java/org/eclipse/lyo/store/SparqlStoreImplIT.java index c5b2533db..66b947d43 100644 --- a/store/store-core/src/test/java/org/eclipse/lyo/store/SparqlStoreImplIT.java +++ b/store/store-core/src/test/java/org/eclipse/lyo/store/SparqlStoreImplIT.java @@ -16,6 +16,7 @@ import java.io.IOException; import java.util.Properties; + import org.assertj.core.util.Strings; import org.eclipse.lyo.store.internals.SparqlStoreImpl; import org.junit.jupiter.api.BeforeEach; diff --git a/store/store-core/src/test/java/org/eclipse/lyo/store/SparqlStoreImplTest.java b/store/store-core/src/test/java/org/eclipse/lyo/store/SparqlStoreImplTest.java index 5b820eef0..a5bad6957 100644 --- a/store/store-core/src/test/java/org/eclipse/lyo/store/SparqlStoreImplTest.java +++ b/store/store-core/src/test/java/org/eclipse/lyo/store/SparqlStoreImplTest.java @@ -1,5 +1,25 @@ package org.eclipse.lyo.store; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + +import java.lang.reflect.InvocationTargetException; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +import javax.xml.datatype.DatatypeConfigurationException; + +import org.apache.jena.rdf.model.Model; +import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; +import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; +import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; +import org.eclipse.lyo.store.internals.SparqlStoreImpl; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + /* * Copyright (c) 2022 Contributors to the Eclipse Foundation * @@ -15,23 +35,6 @@ */ import com.google.common.base.Stopwatch; -import org.apache.jena.rdf.model.Model; -import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; -import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; -import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; -import org.eclipse.lyo.store.internals.SparqlStoreImpl; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import javax.xml.datatype.DatatypeConfigurationException; -import java.lang.reflect.InvocationTargetException; -import java.net.URI; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; - -import static org.assertj.core.api.Assertions.*; public class SparqlStoreImplTest extends StoreTestBase { diff --git a/store/store-core/src/test/java/org/eclipse/lyo/store/StorePoolTest.java b/store/store-core/src/test/java/org/eclipse/lyo/store/StorePoolTest.java index e032a9bd9..9f67b2978 100644 --- a/store/store-core/src/test/java/org/eclipse/lyo/store/StorePoolTest.java +++ b/store/store-core/src/test/java/org/eclipse/lyo/store/StorePoolTest.java @@ -1,5 +1,11 @@ package org.eclipse.lyo.store; +import static org.assertj.core.api.Assertions.assertThat; + +import java.net.URI; +import java.util.List; +import java.util.UUID; + /* * Copyright (c) 2022 Contributors to the Eclipse Foundation * @@ -18,12 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.URI; -import java.util.List; -import java.util.UUID; - -import static org.assertj.core.api.Assertions.*; - public class StorePoolTest { private final Logger log = LoggerFactory.getLogger(StorePoolTest.class); diff --git a/store/store-core/src/test/java/org/eclipse/lyo/store/StoreTestBase.java b/store/store-core/src/test/java/org/eclipse/lyo/store/StoreTestBase.java index 05ef84090..3af794175 100644 --- a/store/store-core/src/test/java/org/eclipse/lyo/store/StoreTestBase.java +++ b/store/store-core/src/test/java/org/eclipse/lyo/store/StoreTestBase.java @@ -1,5 +1,29 @@ package org.eclipse.lyo.store; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.Random; + +import org.apache.jena.rdf.model.Model; +import org.assertj.core.api.Assertions; +import org.eclipse.lyo.oslc4j.core.model.IResource; +import org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog; +import org.eclipse.lyo.store.resources.BlankResource; +import org.eclipse.lyo.store.resources.Nsp1DomainConstants; +import org.eclipse.lyo.store.resources.Requirement; +import org.eclipse.lyo.store.resources.WithBlankResource; +import org.eclipse.lyo.store.resources.WithTwoDepthBlankResource; +import org.junit.jupiter.api.Test; + /* * Copyright (c) 2020 Contributors to the Eclipse Foundation * @@ -16,29 +40,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import org.apache.jena.rdf.model.Model; -import org.assertj.core.api.Assertions; -import org.eclipse.lyo.oslc4j.core.model.IResource; -import org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog; -import org.eclipse.lyo.store.resources.BlankResource; -import org.eclipse.lyo.store.resources.Nsp1DomainConstants; -import org.eclipse.lyo.store.resources.Requirement; -import org.eclipse.lyo.store.resources.WithBlankResource; -import org.eclipse.lyo.store.resources.WithTwoDepthBlankResource; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.NoSuchElementException; -import java.util.Random; - -import static org.assertj.core.api.Assertions.*; -import static org.junit.jupiter.api.Assertions.*; /** diff --git a/store/store-core/src/test/java/org/eclipse/lyo/store/resources/BlankResource.java b/store/store-core/src/test/java/org/eclipse/lyo/store/resources/BlankResource.java index 447c00ba0..5516b612f 100644 --- a/store/store-core/src/test/java/org/eclipse/lyo/store/resources/BlankResource.java +++ b/store/store-core/src/test/java/org/eclipse/lyo/store/resources/BlankResource.java @@ -18,48 +18,22 @@ import java.net.URI; import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.text.SimpleDateFormat; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; -import java.util.Iterator; -//import javax.servlet.http.HttpServletRequest; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import javax.ws.rs.core.UriBuilder; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; -import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; -import org.eclipse.lyo.oslc4j.core.annotation.OslcAllowedValue; -import org.eclipse.lyo.oslc4j.core.annotation.OslcDescription; -import org.eclipse.lyo.oslc4j.core.annotation.OslcMemberProperty; import org.eclipse.lyo.oslc4j.core.annotation.OslcName; import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; import org.eclipse.lyo.oslc4j.core.annotation.OslcOccurs; import org.eclipse.lyo.oslc4j.core.annotation.OslcPropertyDefinition; -import org.eclipse.lyo.oslc4j.core.annotation.OslcRange; import org.eclipse.lyo.oslc4j.core.annotation.OslcReadOnly; -import org.eclipse.lyo.oslc4j.core.annotation.OslcRepresentation; import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; -import org.eclipse.lyo.oslc4j.core.annotation.OslcTitle; import org.eclipse.lyo.oslc4j.core.annotation.OslcValueType; +import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; import org.eclipse.lyo.oslc4j.core.model.AbstractResource; -import org.eclipse.lyo.oslc4j.core.model.Link; import org.eclipse.lyo.oslc4j.core.model.Occurs; import org.eclipse.lyo.oslc4j.core.model.OslcConstants; -import org.eclipse.lyo.oslc4j.core.model.Representation; -import org.eclipse.lyo.oslc4j.core.model.ValueType; import org.eclipse.lyo.oslc4j.core.model.ResourceShape; import org.eclipse.lyo.oslc4j.core.model.ResourceShapeFactory; - -import org.eclipse.lyo.store.resources.Nsp1DomainConstants; -import org.eclipse.lyo.store.resources.Nsp1DomainConstants; +import org.eclipse.lyo.oslc4j.core.model.ValueType; // Start of user code imports // End of user code diff --git a/store/store-core/src/test/java/org/eclipse/lyo/store/resources/IBlankResource.java b/store/store-core/src/test/java/org/eclipse/lyo/store/resources/IBlankResource.java index 5e6d8b7c0..3acbe9e71 100644 --- a/store/store-core/src/test/java/org/eclipse/lyo/store/resources/IBlankResource.java +++ b/store/store-core/src/test/java/org/eclipse/lyo/store/resources/IBlankResource.java @@ -16,47 +16,16 @@ package org.eclipse.lyo.store.resources; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.text.SimpleDateFormat; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; -import java.util.Iterator; -//import javax.servlet.http.HttpServletRequest; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import javax.ws.rs.core.UriBuilder; - -import org.eclipse.lyo.oslc4j.core.annotation.OslcAllowedValue; -import org.eclipse.lyo.oslc4j.core.annotation.OslcDescription; -import org.eclipse.lyo.oslc4j.core.annotation.OslcMemberProperty; import org.eclipse.lyo.oslc4j.core.annotation.OslcName; import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; import org.eclipse.lyo.oslc4j.core.annotation.OslcOccurs; import org.eclipse.lyo.oslc4j.core.annotation.OslcPropertyDefinition; -import org.eclipse.lyo.oslc4j.core.annotation.OslcRange; import org.eclipse.lyo.oslc4j.core.annotation.OslcReadOnly; -import org.eclipse.lyo.oslc4j.core.annotation.OslcRepresentation; import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; -import org.eclipse.lyo.oslc4j.core.annotation.OslcTitle; import org.eclipse.lyo.oslc4j.core.annotation.OslcValueType; -import org.eclipse.lyo.oslc4j.core.model.AbstractResource; -import org.eclipse.lyo.oslc4j.core.model.Link; import org.eclipse.lyo.oslc4j.core.model.Occurs; -import org.eclipse.lyo.oslc4j.core.model.OslcConstants; -import org.eclipse.lyo.oslc4j.core.model.Representation; import org.eclipse.lyo.oslc4j.core.model.ValueType; -import org.eclipse.lyo.store.resources.Nsp1DomainConstants; -import org.eclipse.lyo.store.resources.Nsp1DomainConstants; - // Start of user code imports // End of user code diff --git a/store/store-core/src/test/java/org/eclipse/lyo/store/resources/IWithBlankResource.java b/store/store-core/src/test/java/org/eclipse/lyo/store/resources/IWithBlankResource.java index 742f52960..73123d32f 100644 --- a/store/store-core/src/test/java/org/eclipse/lyo/store/resources/IWithBlankResource.java +++ b/store/store-core/src/test/java/org/eclipse/lyo/store/resources/IWithBlankResource.java @@ -16,48 +16,17 @@ package org.eclipse.lyo.store.resources; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.text.SimpleDateFormat; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; -import java.util.Iterator; -//import javax.servlet.http.HttpServletRequest; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import javax.ws.rs.core.UriBuilder; - -import org.eclipse.lyo.oslc4j.core.annotation.OslcAllowedValue; -import org.eclipse.lyo.oslc4j.core.annotation.OslcDescription; -import org.eclipse.lyo.oslc4j.core.annotation.OslcMemberProperty; import org.eclipse.lyo.oslc4j.core.annotation.OslcName; import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; import org.eclipse.lyo.oslc4j.core.annotation.OslcOccurs; import org.eclipse.lyo.oslc4j.core.annotation.OslcPropertyDefinition; import org.eclipse.lyo.oslc4j.core.annotation.OslcRange; import org.eclipse.lyo.oslc4j.core.annotation.OslcReadOnly; -import org.eclipse.lyo.oslc4j.core.annotation.OslcRepresentation; import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; -import org.eclipse.lyo.oslc4j.core.annotation.OslcTitle; import org.eclipse.lyo.oslc4j.core.annotation.OslcValueType; -import org.eclipse.lyo.oslc4j.core.model.AbstractResource; -import org.eclipse.lyo.oslc4j.core.model.Link; import org.eclipse.lyo.oslc4j.core.model.Occurs; -import org.eclipse.lyo.oslc4j.core.model.OslcConstants; -import org.eclipse.lyo.oslc4j.core.model.Representation; import org.eclipse.lyo.oslc4j.core.model.ValueType; -import org.eclipse.lyo.store.resources.Nsp1DomainConstants; -import org.eclipse.lyo.store.resources.Nsp1DomainConstants; -import org.eclipse.lyo.store.resources.IBlankResource; - // Start of user code imports // End of user code diff --git a/store/store-core/src/test/java/org/eclipse/lyo/store/resources/IWithTwoDepthBlankResource.java b/store/store-core/src/test/java/org/eclipse/lyo/store/resources/IWithTwoDepthBlankResource.java index d8a9296c1..6b0478e33 100644 --- a/store/store-core/src/test/java/org/eclipse/lyo/store/resources/IWithTwoDepthBlankResource.java +++ b/store/store-core/src/test/java/org/eclipse/lyo/store/resources/IWithTwoDepthBlankResource.java @@ -16,48 +16,17 @@ package org.eclipse.lyo.store.resources; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.text.SimpleDateFormat; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; -import java.util.Iterator; -//import javax.servlet.http.HttpServletRequest; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import javax.ws.rs.core.UriBuilder; - -import org.eclipse.lyo.oslc4j.core.annotation.OslcAllowedValue; -import org.eclipse.lyo.oslc4j.core.annotation.OslcDescription; -import org.eclipse.lyo.oslc4j.core.annotation.OslcMemberProperty; import org.eclipse.lyo.oslc4j.core.annotation.OslcName; import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; import org.eclipse.lyo.oslc4j.core.annotation.OslcOccurs; import org.eclipse.lyo.oslc4j.core.annotation.OslcPropertyDefinition; import org.eclipse.lyo.oslc4j.core.annotation.OslcRange; import org.eclipse.lyo.oslc4j.core.annotation.OslcReadOnly; -import org.eclipse.lyo.oslc4j.core.annotation.OslcRepresentation; import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; -import org.eclipse.lyo.oslc4j.core.annotation.OslcTitle; import org.eclipse.lyo.oslc4j.core.annotation.OslcValueType; -import org.eclipse.lyo.oslc4j.core.model.AbstractResource; -import org.eclipse.lyo.oslc4j.core.model.Link; import org.eclipse.lyo.oslc4j.core.model.Occurs; -import org.eclipse.lyo.oslc4j.core.model.OslcConstants; -import org.eclipse.lyo.oslc4j.core.model.Representation; import org.eclipse.lyo.oslc4j.core.model.ValueType; -import org.eclipse.lyo.store.resources.Nsp1DomainConstants; -import org.eclipse.lyo.store.resources.Nsp1DomainConstants; -import org.eclipse.lyo.store.resources.IWithBlankResource; - // Start of user code imports // End of user code diff --git a/store/store-core/src/test/java/org/eclipse/lyo/store/resources/Nsp1DomainConstants.java b/store/store-core/src/test/java/org/eclipse/lyo/store/resources/Nsp1DomainConstants.java index 2be02a08e..341d25e80 100644 --- a/store/store-core/src/test/java/org/eclipse/lyo/store/resources/Nsp1DomainConstants.java +++ b/store/store-core/src/test/java/org/eclipse/lyo/store/resources/Nsp1DomainConstants.java @@ -16,9 +16,6 @@ package org.eclipse.lyo.store.resources; -import org.eclipse.lyo.oslc4j.core.model.OslcConstants; - - // Start of user code imports // End of user code diff --git a/store/store-core/src/test/java/org/eclipse/lyo/store/resources/Requirement.java b/store/store-core/src/test/java/org/eclipse/lyo/store/resources/Requirement.java index 850071a49..f621b679f 100644 --- a/store/store-core/src/test/java/org/eclipse/lyo/store/resources/Requirement.java +++ b/store/store-core/src/test/java/org/eclipse/lyo/store/resources/Requirement.java @@ -17,7 +17,6 @@ import org.eclipse.lyo.oslc4j.core.model.Link; import org.eclipse.lyo.oslc4j.core.model.Occurs; import org.eclipse.lyo.oslc4j.core.model.ValueType; -import org.eclipse.lyo.store.resources.Oslc_rmDomainConstants; @OslcNamespace(Oslc_rmDomainConstants.REQUIREMENT_NAMESPACE) @OslcName(Oslc_rmDomainConstants.REQUIREMENT_LOCALNAME) diff --git a/store/store-core/src/test/java/org/eclipse/lyo/store/resources/WithBlankResource.java b/store/store-core/src/test/java/org/eclipse/lyo/store/resources/WithBlankResource.java index 1aee732d0..56f705771 100644 --- a/store/store-core/src/test/java/org/eclipse/lyo/store/resources/WithBlankResource.java +++ b/store/store-core/src/test/java/org/eclipse/lyo/store/resources/WithBlankResource.java @@ -18,49 +18,23 @@ import java.net.URI; import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.text.SimpleDateFormat; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; -import java.util.Iterator; -//import javax.servlet.http.HttpServletRequest; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import javax.ws.rs.core.UriBuilder; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; -import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; -import org.eclipse.lyo.oslc4j.core.annotation.OslcAllowedValue; -import org.eclipse.lyo.oslc4j.core.annotation.OslcDescription; -import org.eclipse.lyo.oslc4j.core.annotation.OslcMemberProperty; import org.eclipse.lyo.oslc4j.core.annotation.OslcName; import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; import org.eclipse.lyo.oslc4j.core.annotation.OslcOccurs; import org.eclipse.lyo.oslc4j.core.annotation.OslcPropertyDefinition; import org.eclipse.lyo.oslc4j.core.annotation.OslcRange; import org.eclipse.lyo.oslc4j.core.annotation.OslcReadOnly; -import org.eclipse.lyo.oslc4j.core.annotation.OslcRepresentation; import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; -import org.eclipse.lyo.oslc4j.core.annotation.OslcTitle; import org.eclipse.lyo.oslc4j.core.annotation.OslcValueType; +import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; import org.eclipse.lyo.oslc4j.core.model.AbstractResource; -import org.eclipse.lyo.oslc4j.core.model.Link; import org.eclipse.lyo.oslc4j.core.model.Occurs; import org.eclipse.lyo.oslc4j.core.model.OslcConstants; -import org.eclipse.lyo.oslc4j.core.model.Representation; -import org.eclipse.lyo.oslc4j.core.model.ValueType; import org.eclipse.lyo.oslc4j.core.model.ResourceShape; import org.eclipse.lyo.oslc4j.core.model.ResourceShapeFactory; - -import org.eclipse.lyo.store.resources.Nsp1DomainConstants; -import org.eclipse.lyo.store.resources.Nsp1DomainConstants; -import org.eclipse.lyo.store.resources.BlankResource; +import org.eclipse.lyo.oslc4j.core.model.ValueType; // Start of user code imports // End of user code diff --git a/store/store-core/src/test/java/org/eclipse/lyo/store/resources/WithTwoDepthBlankResource.java b/store/store-core/src/test/java/org/eclipse/lyo/store/resources/WithTwoDepthBlankResource.java index 1523dafb0..f29d2295d 100644 --- a/store/store-core/src/test/java/org/eclipse/lyo/store/resources/WithTwoDepthBlankResource.java +++ b/store/store-core/src/test/java/org/eclipse/lyo/store/resources/WithTwoDepthBlankResource.java @@ -18,49 +18,23 @@ import java.net.URI; import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.text.SimpleDateFormat; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; -import java.util.Iterator; -//import javax.servlet.http.HttpServletRequest; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import javax.ws.rs.core.UriBuilder; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; -import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; -import org.eclipse.lyo.oslc4j.core.annotation.OslcAllowedValue; -import org.eclipse.lyo.oslc4j.core.annotation.OslcDescription; -import org.eclipse.lyo.oslc4j.core.annotation.OslcMemberProperty; import org.eclipse.lyo.oslc4j.core.annotation.OslcName; import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; import org.eclipse.lyo.oslc4j.core.annotation.OslcOccurs; import org.eclipse.lyo.oslc4j.core.annotation.OslcPropertyDefinition; import org.eclipse.lyo.oslc4j.core.annotation.OslcRange; import org.eclipse.lyo.oslc4j.core.annotation.OslcReadOnly; -import org.eclipse.lyo.oslc4j.core.annotation.OslcRepresentation; import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; -import org.eclipse.lyo.oslc4j.core.annotation.OslcTitle; import org.eclipse.lyo.oslc4j.core.annotation.OslcValueType; +import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; import org.eclipse.lyo.oslc4j.core.model.AbstractResource; -import org.eclipse.lyo.oslc4j.core.model.Link; import org.eclipse.lyo.oslc4j.core.model.Occurs; import org.eclipse.lyo.oslc4j.core.model.OslcConstants; -import org.eclipse.lyo.oslc4j.core.model.Representation; -import org.eclipse.lyo.oslc4j.core.model.ValueType; import org.eclipse.lyo.oslc4j.core.model.ResourceShape; import org.eclipse.lyo.oslc4j.core.model.ResourceShapeFactory; - -import org.eclipse.lyo.store.resources.Nsp1DomainConstants; -import org.eclipse.lyo.store.resources.Nsp1DomainConstants; -import org.eclipse.lyo.store.resources.WithBlankResource; +import org.eclipse.lyo.oslc4j.core.model.ValueType; // Start of user code imports // End of user code diff --git a/trs/client/client-source-mqtt/pom.xml b/trs/client/client-source-mqtt/pom.xml index 7bc1951f2..189997752 100644 --- a/trs/client/client-source-mqtt/pom.xml +++ b/trs/client/client-source-mqtt/pom.xml @@ -76,8 +76,8 @@ pom - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api org.apache.httpcomponents diff --git a/trs/client/trs-client/pom.xml b/trs/client/trs-client/pom.xml index 45259883b..0514cb20e 100644 --- a/trs/client/trs-client/pom.xml +++ b/trs/client/trs-client/pom.xml @@ -58,10 +58,9 @@ - - javax.servlet - javax.servlet-api - + jakarta.servlet + jakarta.servlet-api + 6.0.0 org.eclipse.lyo @@ -79,8 +78,8 @@ pom - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api org.apache.httpcomponents diff --git a/trs/client/trs-client/src/main/java/org/eclipse/lyo/trs/client/config/TrsConsumerConfiguration.java b/trs/client/trs-client/src/main/java/org/eclipse/lyo/trs/client/config/TrsConsumerConfiguration.java index dc95e5a39..2396b5c8e 100644 --- a/trs/client/trs-client/src/main/java/org/eclipse/lyo/trs/client/config/TrsConsumerConfiguration.java +++ b/trs/client/trs-client/src/main/java/org/eclipse/lyo/trs/client/config/TrsConsumerConfiguration.java @@ -14,12 +14,15 @@ package org.eclipse.lyo.trs.client.config; -import com.google.common.base.Strings; import java.util.concurrent.ScheduledExecutorService; -import javax.ws.rs.client.ClientBuilder; + import org.eclipse.lyo.client.OslcClient; import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature; +import com.google.common.base.Strings; + +import jakarta.ws.rs.client.ClientBuilder; + public class TrsConsumerConfiguration { private final String sparqlQueryUrl; private final String sparqlUpdateUrl; diff --git a/trs/client/trs-client/src/main/java/org/eclipse/lyo/trs/client/util/ClientUtil.java b/trs/client/trs-client/src/main/java/org/eclipse/lyo/trs/client/util/ClientUtil.java index cf689ed32..3c9ebfe9f 100644 --- a/trs/client/trs-client/src/main/java/org/eclipse/lyo/trs/client/util/ClientUtil.java +++ b/trs/client/trs-client/src/main/java/org/eclipse/lyo/trs/client/util/ClientUtil.java @@ -5,7 +5,7 @@ import java.io.InputStream; import java.net.URISyntaxException; import java.util.Arrays; -import javax.ws.rs.core.Response; + import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.eclipse.lyo.core.trs.Base; @@ -23,6 +23,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.ws.rs.core.Response; + /** * TODO * diff --git a/trs/client/trs-client/src/main/java/org/eclipse/lyo/trs/client/util/TrackedResourceClient.java b/trs/client/trs-client/src/main/java/org/eclipse/lyo/trs/client/util/TrackedResourceClient.java index d1004d072..b80bc56a1 100644 --- a/trs/client/trs-client/src/main/java/org/eclipse/lyo/trs/client/util/TrackedResourceClient.java +++ b/trs/client/trs-client/src/main/java/org/eclipse/lyo/trs/client/util/TrackedResourceClient.java @@ -17,7 +17,7 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Response; + import org.apache.jena.rdf.model.Model; import org.eclipse.lyo.client.IOslcClient; import org.eclipse.lyo.core.trs.Base; @@ -31,6 +31,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.ws.rs.core.Response; + public class TrackedResourceClient implements ITrackedResourceClient { private static final Logger log = LoggerFactory.getLogger(TrackedResourceClient.class); private final IOslcClient oslcClient; diff --git a/trs/server/pom.xml b/trs/server/pom.xml index 467ce2f7f..33cb7f006 100644 --- a/trs/server/pom.xml +++ b/trs/server/pom.xml @@ -72,14 +72,14 @@ 3.6.0 - 11 + 17 - - + + The reactor is not valid @@ -116,19 +116,17 @@ ${v.slf4j} - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api jakarta.ws.rs jakarta.ws.rs-api - provided - javax.inject - javax.inject - 1 - provided + jakarta.inject + jakarta.inject-api + 2.0.1 diff --git a/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/HistoryData.java b/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/HistoryData.java index 834fbba3a..11c7038ad 100644 --- a/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/HistoryData.java +++ b/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/HistoryData.java @@ -15,6 +15,7 @@ import java.net.URI; import java.util.Date; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/InmemPagedTrs.java b/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/InmemPagedTrs.java index c968df87c..20bdb986a 100644 --- a/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/InmemPagedTrs.java +++ b/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/InmemPagedTrs.java @@ -21,7 +21,7 @@ import java.util.Objects; import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; -import javax.ws.rs.core.UriBuilder; + import org.eclipse.lyo.core.trs.Base; import org.eclipse.lyo.core.trs.ChangeEvent; import org.eclipse.lyo.core.trs.ChangeLog; @@ -34,6 +34,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.ws.rs.core.UriBuilder; + /** * This class is the backbone of the Tracked resource set service class. This class is extended by * oslc adapters wishing to implement an OSLC TRS interface. The implementing classes need to diff --git a/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/PagedTrsFactory.java b/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/PagedTrsFactory.java index 8f98ab6f1..c79770e5f 100644 --- a/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/PagedTrsFactory.java +++ b/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/PagedTrsFactory.java @@ -4,11 +4,11 @@ import java.util.ArrayList; import java.util.Collection; -import javax.ws.rs.core.UriBuilder; - import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; import org.eclipse.lyo.oslc4j.trs.server.service.TrackedResourceSetService; +import jakarta.ws.rs.core.UriBuilder; + public class PagedTrsFactory { public InmemPagedTrs getInmemPagedTrs(final int basePageLimit, final int changelogPageLimit, final URI uriBase, final String baseRelativePath, final String changeLogRelativePath, final Collection baseResourceUris) { diff --git a/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/TRSUtil.java b/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/TRSUtil.java index 92adc2212..7864b8ee6 100644 --- a/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/TRSUtil.java +++ b/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/TRSUtil.java @@ -27,6 +27,7 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; + import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.namespace.QName; diff --git a/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/TrsEventHandler.java b/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/TrsEventHandler.java index f9f2e6e6e..e7da949f8 100644 --- a/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/TrsEventHandler.java +++ b/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/TrsEventHandler.java @@ -1,6 +1,7 @@ package org.eclipse.lyo.oslc4j.trs.server; import java.net.URI; + import org.eclipse.lyo.oslc4j.core.model.IResource; public interface TrsEventHandler { diff --git a/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/service/TrackedResourceSetService.java b/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/service/TrackedResourceSetService.java index d004698ab..dcc6aff6f 100644 --- a/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/service/TrackedResourceSetService.java +++ b/trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/service/TrackedResourceSetService.java @@ -16,15 +16,9 @@ import java.net.URI; import java.net.URISyntaxException; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriBuilder; + +import jakarta.inject.Inject; + import org.apache.jena.ext.com.google.common.base.Strings; import org.eclipse.lyo.core.trs.Base; import org.eclipse.lyo.core.trs.ChangeLog; @@ -40,6 +34,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilder; + /** * The service class for the TRS interface. This class needs to be implemented by an OSLC adapter * wishing to implement a TRS interface diff --git a/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/DummyServiceResource.java b/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/DummyServiceResource.java index 462de1610..f724b8fa1 100644 --- a/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/DummyServiceResource.java +++ b/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/DummyServiceResource.java @@ -1,9 +1,9 @@ package org.eclipse.lyo.oslc4j.trs.server.service; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/test") public class DummyServiceResource { diff --git a/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/DummyServiceTest.java b/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/DummyServiceTest.java index 17e7cfc7d..e22b593e9 100644 --- a/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/DummyServiceTest.java +++ b/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/DummyServiceTest.java @@ -1,19 +1,20 @@ package org.eclipse.lyo.oslc4j.trs.server.service; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.Response; +import static org.assertj.core.api.Assertions.assertThat; + import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.DeploymentContext; import org.glassfish.jersey.test.JerseyTest; import org.glassfish.jersey.test.ServletDeploymentContext; import org.glassfish.jersey.test.TestProperties; import org.glassfish.jersey.test.grizzly.GrizzlyTestContainerFactory; -import org.glassfish.jersey.test.jetty.JettyTestContainerFactory; import org.glassfish.jersey.test.spi.TestContainerException; import org.glassfish.jersey.test.spi.TestContainerFactory; import org.junit.Test; -import static org.assertj.core.api.Assertions.*; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class DummyServiceTest extends JerseyTest { diff --git a/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/TRSServiceDITest.java b/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/TRSServiceDITest.java index b993ff7a2..e2af969c3 100644 --- a/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/TRSServiceDITest.java +++ b/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/TRSServiceDITest.java @@ -1,18 +1,15 @@ package org.eclipse.lyo.oslc4j.trs.server.service; +import static org.assertj.core.api.Assertions.assertThat; + import java.net.MalformedURLException; import java.util.ArrayList; -import javax.inject.Singleton; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import org.apache.http.client.utils.URIBuilder; + import org.eclipse.lyo.core.trs.Base; import org.eclipse.lyo.core.trs.TrackedResourceSet; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; import org.eclipse.lyo.oslc4j.provider.jena.JenaProvidersRegistry; import org.eclipse.lyo.oslc4j.trs.server.InmemPagedTrs; -import org.eclipse.lyo.oslc4j.trs.server.InmemPagedTrsTest; import org.eclipse.lyo.oslc4j.trs.server.PagedTrs; import org.glassfish.hk2.utilities.binding.AbstractBinder; import org.glassfish.jersey.client.ClientConfig; @@ -24,10 +21,11 @@ import org.glassfish.jersey.test.grizzly.GrizzlyTestContainerFactory; import org.glassfish.jersey.test.spi.TestContainerException; import org.glassfish.jersey.test.spi.TestContainerFactory; -import org.junit.Before; import org.junit.Test; -import static org.assertj.core.api.Assertions.*; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; public class TRSServiceDITest extends JerseyTest { diff --git a/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/TRSServiceResource.java b/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/TRSServiceResource.java index cb11a56d4..40758dfe2 100644 --- a/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/TRSServiceResource.java +++ b/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/TRSServiceResource.java @@ -1,16 +1,17 @@ package org.eclipse.lyo.oslc4j.trs.server.service; -import com.google.common.collect.ImmutableList; -import java.util.ArrayList; -import javax.ws.rs.Path; -import javax.ws.rs.core.UriBuilder; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; -import org.eclipse.lyo.oslc4j.trs.server.PagedTrs; import org.eclipse.lyo.oslc4j.trs.server.InmemPagedTrs; +import org.eclipse.lyo.oslc4j.trs.server.PagedTrs; import org.eclipse.lyo.oslc4j.trs.server.TRSTestUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.collect.ImmutableList; + +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.UriBuilder; + @Path("/trs") public class TRSServiceResource extends TrackedResourceSetService { private final static Logger log = LoggerFactory.getLogger(TRSServiceResource.class); diff --git a/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/TRSServiceTest.java b/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/TRSServiceTest.java index 8e4c03b32..924d9a4bc 100644 --- a/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/TRSServiceTest.java +++ b/trs/server/src/test/java/org/eclipse/lyo/oslc4j/trs/server/service/TRSServiceTest.java @@ -1,7 +1,7 @@ package org.eclipse.lyo.oslc4j.trs.server.service; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.Response; +import static org.assertj.core.api.Assertions.assertThat; + import org.eclipse.lyo.core.trs.Base; import org.eclipse.lyo.core.trs.TrackedResourceSet; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; @@ -18,7 +18,8 @@ import org.junit.Before; import org.junit.Test; -import static org.assertj.core.api.Assertions.*; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.Response; public class TRSServiceTest extends JerseyTest { From 86174ce1c31b43af8384dbe2e8c2848ca0fce00a Mon Sep 17 00:00:00 2001 From: Jad El-khoury Date: Mon, 8 Apr 2024 22:03:39 +0200 Subject: [PATCH 027/126] clean up commented-out dependencies. --- core/oslc4j-json4j-provider/pom.xml | 8 -------- core/oslc4j-utils/pom.xml | 5 ----- 2 files changed, 13 deletions(-) diff --git a/core/oslc4j-json4j-provider/pom.xml b/core/oslc4j-json4j-provider/pom.xml index ea981e83e..c320598ff 100644 --- a/core/oslc4j-json4j-provider/pom.xml +++ b/core/oslc4j-json4j-provider/pom.xml @@ -101,14 +101,6 @@ ${v.jersey} test --> - - diff --git a/core/oslc4j-utils/pom.xml b/core/oslc4j-utils/pom.xml index 2b5b02019..da9381a14 100644 --- a/core/oslc4j-utils/pom.xml +++ b/core/oslc4j-utils/pom.xml @@ -58,11 +58,6 @@ jersey-common test - From 638bcf54998c098b5240f04013ef97de82908888 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 16:45:51 +0200 Subject: [PATCH 028/126] chore: Bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 to 3.3.1 (#517) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dabfdff49..ee26636b1 100644 --- a/pom.xml +++ b/pom.xml @@ -438,7 +438,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 attach-sources From bf685191c848f07df1fd5906b228e5b0299b8c11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 16:49:21 +0200 Subject: [PATCH 029/126] chore: Bump com.fasterxml.jackson:jackson-bom from 2.15.3 to 2.17.0 (#502) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ee26636b1..9633d7772 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 3.1.0 4.8.0 - 2.15.3 + 2.17.0 4.5.14 1.7.36 From 241272b6c580a0e748b659bc4fc94ac65fd8f6dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 16:51:36 +0200 Subject: [PATCH 030/126] chore: Bump v.slf4j from 1.7.36 to 2.0.13 (#521) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9633d7772..32e267054 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 4.8.0 2.17.0 4.5.14 - 1.7.36 + 2.0.13 32.1.3-jre From 9437d249f720d3f5e396d231e39f1ec1ca8d8477 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 16:54:55 +0200 Subject: [PATCH 031/126] chore: Bump v.kotlin from 1.9.21 to 1.9.23 (#494) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 32e267054..66669cc8d 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ ${project.version} - 1.9.21 + 1.9.23 1.9.10 3.1.5 From 4329f0a05492da77bb805d86416cabb8ed9a041f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 16:57:18 +0200 Subject: [PATCH 032/126] chore: Bump org.junit:junit-bom from 5.10.1 to 5.10.2 (#483) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 66669cc8d..44562c5a5 100644 --- a/pom.xml +++ b/pom.xml @@ -373,7 +373,7 @@ org.junit junit-bom - 5.10.1 + 5.10.2 pom import From 7310f3bc9525cc55b446d35632e257d0e07a26a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 16:57:48 +0200 Subject: [PATCH 033/126] chore: Bump org.codehaus.mojo:build-helper-maven-plugin from 3.4.0 to 3.5.0 (#437) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- core/oslc-query/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/oslc-query/pom.xml b/core/oslc-query/pom.xml index 26d551cdf..9b27bd1f6 100644 --- a/core/oslc-query/pom.xml +++ b/core/oslc-query/pom.xml @@ -58,7 +58,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.4.0 + 3.5.0 generate-sources From d5eacb580e77be0e99bfe801bce5ad688ecafe3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 16:57:55 +0200 Subject: [PATCH 034/126] chore: Bump org.apache.maven.plugins:maven-war-plugin from 3.3.2 to 3.4.0 (#442) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 44562c5a5..ea2b88546 100644 --- a/pom.xml +++ b/pom.xml @@ -573,7 +573,7 @@ org.apache.maven.plugins maven-war-plugin - 3.3.2 + 3.4.0 org.apache.maven.plugins From 3bc65cef2cc4c871381ebc1c941c797bdba1740e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 16:58:06 +0200 Subject: [PATCH 035/126] chore: Bump org.apache.maven.plugins:maven-project-info-reports-plugin from 3.4.3 to 3.5.0 (#453) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ea2b88546..8dedfa30a 100644 --- a/pom.xml +++ b/pom.xml @@ -496,7 +496,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.3 + 3.5.0 org.apache.maven.plugins From 034d68f5e574be14b662cbe59a40fb1cc25c7393 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 17:14:02 +0200 Subject: [PATCH 036/126] chore: Bump io.github.classgraph:classgraph from 4.8.164 to 4.8.170 (#515) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- core/oslc4j-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml index eb853df39..56a10f26c 100644 --- a/core/oslc4j-core/pom.xml +++ b/core/oslc4j-core/pom.xml @@ -27,7 +27,7 @@ io.github.classgraph classgraph - 4.8.164 + 4.8.170 jakarta.ws.rs From 6604aaff60632d641d47ebffe2de90698859866d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 17:15:29 +0200 Subject: [PATCH 037/126] chore: Bump org.jacoco:jacoco-maven-plugin from 0.8.11 to 0.8.12 (#522) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- store/store-core/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml index 35b9288aa..7bcfb705d 100644 --- a/store/store-core/pom.xml +++ b/store/store-core/pom.xml @@ -152,7 +152,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12 jacoco-initialize @@ -190,7 +190,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12 | Repo | Version | Status | PRs | Bugs | Activity | | ---- | ------- | ------ | --- | ---- | -------- | -| [oslc-op/refimpl](https://github.com/oslc-op/refimpl) | ![](https://img.shields.io/badge/Lyo-5.2.0--S-f329da) | ![](https://github.com/oslc-op/refimpl/workflows/CI/badge.svg) | [![](https://img.shields.io/github/issues-pr/oslc-op/refimpl?label=PR&color=blue)](https://github.com/oslc-op/refimpl/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/oslc-op/refimpl/Type:%20Bug?label=bugs)](https://github.com/oslc-op/refimpl/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/oslc-op/refimpl) | +| [oslc-op/refimpl](https://github.com/oslc-op/refimpl) | ![](https://img.shields.io/badge/Lyo-6.0.0--S-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&color=blue)](https://github.com/oslc-op/refimpl/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/oslc-op/refimpl/Type:%20Bug?label=bugs)](https://github.com/oslc-op/refimpl/issues?q=is%3Aopen+label%3Abug+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-brightgreen) | N/A | [![](https://img.shields.io/github/issues-pr/danlz/lyo-in-spring-boot?label=PR&color=blue)](https://github.com/danlz/lyo-in-spring-boot/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/danlz/lyo-in-spring-boot/Type:%20Bug?label=bugs)](https://github.com/danlz/lyo-in-spring-boot/issues?q=is%3Aopen+label%3Abug+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.0.0--S-f329da) | ![](https://github.com/oslc-op/sysml-oslc-server/workflows/CI/badge.svg) | [![](https://img.shields.io/github/issues-pr/oslc-op/sysml-oslc-server?label=PR&color=blue)](https://github.com/oslc-op/sysml-oslc-server/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/oslc-op/sysml-oslc-server/Type:%20Bug?label=bugs)](https://github.com/oslc-op/sysml-oslc-server/issues?q=is%3Aopen+label%3Abug+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.0--S-f329da) | ![](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&color=blue)](https://github.com/OSLC/lyo-adaptor-sample-modelling/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/lyo-adaptor-sample-modelling/bug?label=bugs)](https://github.com/OSLC/lyo-adaptor-sample-modelling/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/lyo-adaptor-sample-modelling) | diff --git a/tools/readme-matrix/downstream-projects.yml b/tools/readme-matrix/downstream-projects.yml index 6e0a401fd..3664527ff 100644 --- a/tools/readme-matrix/downstream-projects.yml +++ b/tools/readme-matrix/downstream-projects.yml @@ -29,9 +29,8 @@ versions: projects: - slug: "oslc-op/refimpl" link: "https://github.com/oslc-op/refimpl" - version: "5.2.0--S" - # FIXME: new URI - ci_badge: "https://github.com/oslc-op/refimpl/workflows/CI/badge.svg" + version: "6.0.0--S" + ci_badge: "https://github.com/oslc-op/refimpl/actions/workflows/maven.yml/badge.svg" pr_badge: "https://img.shields.io/github/issues-pr/oslc-op/refimpl?label=PR&color=blue" pr_link: "https://github.com/oslc-op/refimpl/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/oslc-op/refimpl/Type:%20Bug?label=bugs" From fbf3fb8ab2c030a6c5b2d617d2e6200190cfc97c Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sun, 14 Apr 2024 13:03:17 +0200 Subject: [PATCH 056/126] docs: update matrix --- README.md | 55 +++++++++------------ tools/readme-matrix/downstream-projects.yml | 28 ++++++----- 2 files changed, 38 insertions(+), 45 deletions(-) diff --git a/README.md b/README.md index a3aeb9513..4accba4f6 100644 --- a/README.md +++ b/README.md @@ -66,24 +66,24 @@ See under [validation/README](validation/README.md). | Repo | Version | Status | PRs | Bugs | Activity | | ---- | ------- | ------ | --- | ---- | -------- | -| [oslc-op/refimpl](https://github.com/oslc-op/refimpl) | ![](https://img.shields.io/badge/Lyo-6.0.0--S-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&color=blue)](https://github.com/oslc-op/refimpl/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/oslc-op/refimpl/Type:%20Bug?label=bugs)](https://github.com/oslc-op/refimpl/issues?q=is%3Aopen+label%3Abug+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-brightgreen) | N/A | [![](https://img.shields.io/github/issues-pr/danlz/lyo-in-spring-boot?label=PR&color=blue)](https://github.com/danlz/lyo-in-spring-boot/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/danlz/lyo-in-spring-boot/Type:%20Bug?label=bugs)](https://github.com/danlz/lyo-in-spring-boot/issues?q=is%3Aopen+label%3Abug+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.0.0--S-f329da) | ![](https://github.com/oslc-op/sysml-oslc-server/workflows/CI/badge.svg) | [![](https://img.shields.io/github/issues-pr/oslc-op/sysml-oslc-server?label=PR&color=blue)](https://github.com/oslc-op/sysml-oslc-server/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/oslc-op/sysml-oslc-server/Type:%20Bug?label=bugs)](https://github.com/oslc-op/sysml-oslc-server/issues?q=is%3Aopen+label%3Abug+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.0--S-f329da) | ![](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&color=blue)](https://github.com/OSLC/lyo-adaptor-sample-modelling/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/lyo-adaptor-sample-modelling/bug?label=bugs)](https://github.com/OSLC/lyo-adaptor-sample-modelling/issues?q=is%3Aopen+label%3Abug+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.0.0--S-f329da) | ![](https://github.com/OSLC/lyo-samples/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/OSLC/lyo-samples?label=PR&color=blue)](https://github.com/OSLC/lyo-samples/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/lyo-samples/bug?label=bugs)](https://github.com/OSLC/lyo-samples/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/lyo-samples) | -| [lyo-samples/client-oauth-discovery-dui](https://github.com/OSLC/lyo-samples) | ![](https://img.shields.io/badge/Lyo-4.0.0-red) | ![](https://github.com/OSLC/lyo-samples/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/OSLC/lyo-samples?label=PR&color=blue)](https://github.com/OSLC/lyo-samples/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/lyo-samples/bug?label=bugs)](https://github.com/OSLC/lyo-samples/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/lyo-samples) | -| [OSLC/lyo-adaptor-bugzilla](https://github.com/OSLC/lyo-adaptor-bugzilla) | ![](https://img.shields.io/badge/Lyo-2.4.0-red) | ![](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&color=blue)](https://github.com/OSLC/lyo-adaptor-bugzilla/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/lyo-adaptor-bugzilla/bug?label=bugs)](https://github.com/OSLC/lyo-adaptor-bugzilla/issues?q=is%3Aopen+label%3Abug+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-red) | ![](https://github.com/OSLC/iotp-adaptor/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/OSLC/iotp-adaptor?label=PR&color=blue)](https://github.com/OSLC/iotp-adaptor/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/iotp-adaptor/bug?label=bugs)](https://github.com/OSLC/iotp-adaptor/issues?q=is%3Aopen+label%3Abug+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-red) | ![](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&color=blue)](https://github.com/OSLC/oslc-adapter-jama/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/oslc-adapter-jama/bug?label=bugs)](https://github.com/OSLC/oslc-adapter-jama/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/oslc-adapter-jama) | -| [eclipse/lyo.testsuite](https://github.com/eclipse/lyo.testsuite) | ![](https://img.shields.io/badge/Lyo-2.4.0-red) | ![](https://github.com/eclipse/lyo.testsuite/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/eclipse/lyo.testsuite?label=PR&color=blue)](https://github.com/eclipse/lyo.testsuite/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/eclipse/lyo.testsuite/Type:%20Bug?label=bugs)](https://github.com/eclipse/lyo.testsuite/issues?q=is%3Aopen+label%3A%22Type%3A+Bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/eclipse/lyo.testsuite) | -| [ld4mbse/oslc4tdb](https://github.com/ld4mbse/oslc4tdb) | ![](https://img.shields.io/badge/Lyo-2.3.0-red) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc4tdb?label=PR&color=blue)](https://github.com/ld4mbse/oslc4tdb/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/ld4mbse/oslc4tdb/bug?label=bugs)](https://github.com/ld4mbse/oslc4tdb/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc4tdb) | -| [kth-mda/adaptor-bugzilla-trs](https://gitlab.com/kth-mda/lyo/adaptor-bugzilla-trs) | ![](https://img.shields.io/badge/Lyo-2.2.0-red) | ![](https://gitlab.com/kth-mda/lyo/adaptor-bugzilla-trs/badges/master/pipeline.svg?ignore_skipped=true) | [![](https://img.shields.io/gitlab/merge-requests/open/kth-mda%2Flyo%2Fadaptor-bugzilla-trs?label=MR)](https://gitlab.com/kth-mda/lyo/adaptor-bugzilla-trs/-/merge_requests) | [![](https://img.shields.io/gitlab/issues/open/kth-mda%2Flyo%2Fadaptor-bugzilla-trs)](https://gitlab.com/kth-mda/lyo/adaptor-bugzilla-trs/-/issues) | ![](https://img.shields.io/gitlab/last-commit/kth-mda%2Flyo%2Fadaptor-bugzilla-trs) | -| [berezovskyi/oslc-adapter-subversion](https://github.com/berezovskyi/oslc-adapter-subversion) | ![](https://img.shields.io/badge/Lyo-2.1.2-red) | ![](https://github.com/berezovskyi/oslc-adapter-subversion/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/berezovskyi/oslc-adapter-subversion?label=PR&color=blue)](https://github.com/berezovskyi/oslc-adapter-subversion/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/berezovskyi/oslc-adapter-subversion/bug?label=bugs)](https://github.com/berezovskyi/oslc-adapter-subversion/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/berezovskyi/oslc-adapter-subversion) | -| [lyo-samples-attic/oslc-java-samples](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-4.1/oslc-java-samples) | ![](https://img.shields.io/badge/Lyo-4.1.0-ffcc00) | N/A | N/A | N/A | N/A | -| [lyo-samples-attic/oslc4j-stockquote](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-2.4/oslc4j-stockquote) | ![](https://img.shields.io/badge/Lyo-2.3.0-red) | N/A | N/A | N/A | N/A | -| [lyo-samples-attic/oslc4j-test](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-2.3/oslc4j-test) | ![](https://img.shields.io/badge/Lyo-2.3.0-red) | N/A | N/A | N/A | N/A | -| [lyo-samples-attic/oslc4j-bugzilla-sample](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-2.2/oslc4j-bugzilla-sample) | ![](https://img.shields.io/badge/Lyo-2.2.0-red) | N/A | N/A | N/A | N/A | -| [lyo-samples-attic/trs4j-bugzilla-sample](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-2.1/trs4j-bugzilla-sample) | ![](https://img.shields.io/badge/Lyo-2.1.2-red) | N/A | N/A | N/A | N/A | +| [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&color=blue)](https://github.com/oslc-op/refimpl/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/oslc-op/refimpl/Type:%20Bug?label=bugs)](https://github.com/oslc-op/refimpl/issues?q=is%3Aopen+label%3Abug+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&color=blue)](https://github.com/danlz/lyo-in-spring-boot/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/danlz/lyo-in-spring-boot/Type:%20Bug?label=bugs)](https://github.com/danlz/lyo-in-spring-boot/issues?q=is%3Aopen+label%3Abug+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/workflows/CI/badge.svg) | [![](https://img.shields.io/github/issues-pr/oslc-op/sysml-oslc-server?label=PR&color=blue)](https://github.com/oslc-op/sysml-oslc-server/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/oslc-op/sysml-oslc-server/Type:%20Bug?label=bugs)](https://github.com/oslc-op/sysml-oslc-server/issues?q=is%3Aopen+label%3Abug+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&color=blue)](https://github.com/OSLC/lyo-adaptor-sample-modelling/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/lyo-adaptor-sample-modelling/bug?label=bugs)](https://github.com/OSLC/lyo-adaptor-sample-modelling/issues?q=is%3Aopen+label%3Abug+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&color=blue)](https://github.com/OSLC/lyo-samples/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/lyo-samples/bug?label=bugs)](https://github.com/OSLC/lyo-samples/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/lyo-samples) | +| [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&color=blue)](https://github.com/OSLC/lyo-samples/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/lyo-samples/bug?label=bugs)](https://github.com/OSLC/lyo-samples/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/lyo-samples) | +| [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&color=blue)](https://github.com/OSLC/lyo-adaptor-bugzilla/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/lyo-adaptor-bugzilla/bug?label=bugs)](https://github.com/OSLC/lyo-adaptor-bugzilla/issues?q=is%3Aopen+label%3Abug+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&color=blue)](https://github.com/OSLC/iotp-adaptor/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/iotp-adaptor/bug?label=bugs)](https://github.com/OSLC/iotp-adaptor/issues?q=is%3Aopen+label%3Abug+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&color=blue)](https://github.com/OSLC/oslc-adapter-jama/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/oslc-adapter-jama/bug?label=bugs)](https://github.com/OSLC/oslc-adapter-jama/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/oslc-adapter-jama) | +| [eclipse/lyo.testsuite](https://github.com/eclipse/lyo.testsuite) | ![](https://img.shields.io/badge/Lyo-2.4.0-f42020) | ![](https://github.com/eclipse/lyo.testsuite/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/eclipse/lyo.testsuite?label=PR&color=blue)](https://github.com/eclipse/lyo.testsuite/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/eclipse/lyo.testsuite/Type:%20Bug?label=bugs)](https://github.com/eclipse/lyo.testsuite/issues?q=is%3Aopen+label%3A%22Type%3A+Bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/eclipse/lyo.testsuite) | +| [ld4mbse/oslc4tdb](https://github.com/ld4mbse/oslc4tdb) | ![](https://img.shields.io/badge/Lyo-2.3.0-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc4tdb?label=PR&color=blue)](https://github.com/ld4mbse/oslc4tdb/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/ld4mbse/oslc4tdb/bug?label=bugs)](https://github.com/ld4mbse/oslc4tdb/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc4tdb) | +| [kth-mda/adaptor-bugzilla-trs](https://gitlab.com/kth-mda/lyo/adaptor-bugzilla-trs) | ![](https://img.shields.io/badge/Lyo-2.2.0-f42020) | ![](https://gitlab.com/kth-mda/lyo/adaptor-bugzilla-trs/badges/master/pipeline.svg?ignore_skipped=true) | [![](https://img.shields.io/gitlab/merge-requests/open/kth-mda%2Flyo%2Fadaptor-bugzilla-trs?label=MR)](https://gitlab.com/kth-mda/lyo/adaptor-bugzilla-trs/-/merge_requests) | [![](https://img.shields.io/gitlab/issues/open/kth-mda%2Flyo%2Fadaptor-bugzilla-trs)](https://gitlab.com/kth-mda/lyo/adaptor-bugzilla-trs/-/issues) | ![](https://img.shields.io/gitlab/last-commit/kth-mda%2Flyo%2Fadaptor-bugzilla-trs) | +| [berezovskyi/oslc-adapter-subversion](https://github.com/berezovskyi/oslc-adapter-subversion) | ![](https://img.shields.io/badge/Lyo-2.1.2-f42020) | ![](https://github.com/berezovskyi/oslc-adapter-subversion/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/berezovskyi/oslc-adapter-subversion?label=PR&color=blue)](https://github.com/berezovskyi/oslc-adapter-subversion/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/berezovskyi/oslc-adapter-subversion/bug?label=bugs)](https://github.com/berezovskyi/oslc-adapter-subversion/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/berezovskyi/oslc-adapter-subversion) | +| [lyo-samples-attic/oslc-java-samples](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-4.1/oslc-java-samples) | ![](https://img.shields.io/badge/Lyo-4.1.0-f42020) | N/A | N/A | N/A | N/A | +| [lyo-samples-attic/oslc4j-stockquote](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-2.4/oslc4j-stockquote) | ![](https://img.shields.io/badge/Lyo-2.3.0-f42020) | N/A | N/A | N/A | N/A | +| [lyo-samples-attic/oslc4j-test](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-2.3/oslc4j-test) | ![](https://img.shields.io/badge/Lyo-2.3.0-f42020) | N/A | N/A | N/A | N/A | +| [lyo-samples-attic/oslc4j-bugzilla-sample](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-2.2/oslc4j-bugzilla-sample) | ![](https://img.shields.io/badge/Lyo-2.2.0-f42020) | N/A | N/A | N/A | N/A | +| [lyo-samples-attic/trs4j-bugzilla-sample](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-2.1/trs4j-bugzilla-sample) | ![](https://img.shields.io/badge/Lyo-2.1.2-f42020) | N/A | N/A | N/A | N/A | | [ld4mbse/oslc-adapter-simulink](https://github.com/ld4mbse/oslc-adapter-simulink) | ![](https://img.shields.io/badge/Lyo-3.0.0--S-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-simulink?label=PR&color=blue)](https://github.com/ld4mbse/oslc-adapter-simulink/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/ld4mbse/oslc-adapter-simulink/bug?label=bugs)](https://github.com/ld4mbse/oslc-adapter-simulink/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-adapter-simulink) | | [ld4mbse/oslc-adapter-magicdraw-sysml](https://github.com/ld4mbse/oslc-adapter-magicdraw-sysml) | ![](https://img.shields.io/badge/Lyo-3.0.0--S-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-magicdraw-sysml?label=PR&color=blue)](https://github.com/ld4mbse/oslc-adapter-magicdraw-sysml/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/ld4mbse/oslc-adapter-magicdraw-sysml/bug?label=bugs)](https://github.com/ld4mbse/oslc-adapter-magicdraw-sysml/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-adapter-magicdraw-sysml) | | [ld4mbse/oslc-adapter-integrity](https://github.com/ld4mbse/oslc-adapter-integrity) | ![](https://img.shields.io/badge/Lyo-3.0.0--S-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-integrity?label=PR&color=blue)](https://github.com/ld4mbse/oslc-adapter-integrity/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/ld4mbse/oslc-adapter-integrity/bug?label=bugs)](https://github.com/ld4mbse/oslc-adapter-integrity/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-adapter-integrity) | @@ -95,21 +95,10 @@ See under [validation/README](validation/README.md). | [kth-mda/adaptor-bugzilla-store](https://gitlab.com/kth-mda/lyo/adaptor-store-support) | ![](https://img.shields.io/badge/Lyo-2.1.0-f42020) | N/A | [![](https://img.shields.io/gitlab/merge-requests/open/kth-mda%2Flyo%2Fadaptor-store-support?label=MR)](https://gitlab.com/kth-mda/lyo/adaptor-store-support/-/merge_requests) | [![](https://img.shields.io/gitlab/issues/open/kth-mda%2Flyo%2Fadaptor-store-support)](https://gitlab.com/kth-mda/lyo/adaptor-store-support/-/issues) | ![](https://img.shields.io/gitlab/last-commit/kth-mda%2Flyo%2Fadaptor-store-support) | - +> [!CAUTION] +> +> Lyo versions 4.1.0 and below are potentially vulnerable to [CVE-2021-41042](https://nvd.nist.gov/vuln/detail/CVE-2021-41042) when processing untrusted RDF/XML inputs. + ### Retired repositories diff --git a/tools/readme-matrix/downstream-projects.yml b/tools/readme-matrix/downstream-projects.yml index 3664527ff..e6f3840de 100644 --- a/tools/readme-matrix/downstream-projects.yml +++ b/tools/readme-matrix/downstream-projects.yml @@ -3,10 +3,10 @@ versions: snapshot: - "6.0.0--S" stable: - - "5.1.0" + - "5.1.1" milestone-warn: - "5.1.0a" - - "5.0.1rc" + - "5.0.1.CR" obsolete-snapshot: - "5.2.0--S" - "5.1.0--S" @@ -14,15 +14,16 @@ versions: - "4.1.0--S" - "4.0.0--S" obsolete-recent: + - "5.1.0" + obsolete-old: - "5.0.0" + obsolete-danger: - "4.1.0" - obsolete-old: - "4.0.0" - "2.4.0" - "2.3.0" - "2.2.0" - "2.1.2" - obsolete-danger: - "3.0.0--S" - "2.0.0" - "2.1.0" @@ -46,7 +47,7 @@ projects: activity_badge: "https://img.shields.io/github/last-commit/danlz/lyo-in-spring-boot" - slug: "oslc-op/sysml-oslc-server" link: "https://github.com/oslc-op/sysml-oslc-server" - version: "5.0.0--S" + version: "5.1.1" # FIXME: new URI ci_badge: "https://github.com/oslc-op/sysml-oslc-server/workflows/CI/badge.svg" pr_badge: "https://img.shields.io/github/issues-pr/oslc-op/sysml-oslc-server?label=PR&color=blue" @@ -56,7 +57,7 @@ projects: activity_badge: "https://img.shields.io/github/last-commit/oslc-op/sysml-oslc-server" - slug: "OSLC/lyo-adaptor-sample-modelling" link: "https://github.com/OSLC/lyo-adaptor-sample-modelling" - version: "5.0.0--S" + version: "5.0.1.CR" ci_badge: "https://github.com/OSLC/lyo-adaptor-sample-modelling/actions/workflows/maven.yml/badge.svg?branch=main-5.x" pr_badge: "https://img.shields.io/github/issues-pr/OSLC/lyo-adaptor-sample-modelling?label=PR&color=blue" pr_link: "https://github.com/OSLC/lyo-adaptor-sample-modelling/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" @@ -65,7 +66,7 @@ projects: activity_badge: "https://img.shields.io/github/last-commit/OSLC/lyo-adaptor-sample-modelling" - slug: "lyo-samples/lyo-client-samples" link: "https://github.com/OSLC/lyo-samples" - version: "5.0.0--S" + version: "5.2.0--S" ci_badge: "https://github.com/OSLC/lyo-samples/actions/workflows/maven.yml/badge.svg" pr_badge: "https://img.shields.io/github/issues-pr/OSLC/lyo-samples?label=PR&color=blue" pr_link: "https://github.com/OSLC/lyo-samples/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" @@ -234,17 +235,20 @@ projects: label-types: - name: "snapshot" - color: "brightgreen" + color: "BCED09" - name: "stable" - color: "green" + color: "brightgreen" + # color: "248232" - name: "milestone-warn" # color: "yellowgreen" - color: "F2CD60" + color: "7B1E7A" - name: "obsolete-snapshot" # color: "yellowgreen" - color: "f329da" + # color: "f329da" + color: "E77728" - name: "obsolete-recent" - color: "ffcc00" + color: "17C3B2" + # color: "255F85" - name: "obsolete-old" color: "red" - name: "obsolete-danger" From 63ac23b49b8b77639824192b03e897e6e2fb0727 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sun, 14 Apr 2024 13:07:56 +0200 Subject: [PATCH 057/126] docs: matrix hide issues column --- README.md | 58 +++++++++---------- tools/readme-matrix/downstream-projects.yml | 38 ++++++------ .../readme-matrix/readme-matrix-generator.py | 9 ++- 3 files changed, 54 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 4accba4f6..a289ee601 100644 --- a/README.md +++ b/README.md @@ -64,35 +64,35 @@ See under [validation/README](validation/README.md). ### Test and sample repositories -| Repo | Version | Status | PRs | Bugs | 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&color=blue)](https://github.com/oslc-op/refimpl/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/oslc-op/refimpl/Type:%20Bug?label=bugs)](https://github.com/oslc-op/refimpl/issues?q=is%3Aopen+label%3Abug+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&color=blue)](https://github.com/danlz/lyo-in-spring-boot/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/danlz/lyo-in-spring-boot/Type:%20Bug?label=bugs)](https://github.com/danlz/lyo-in-spring-boot/issues?q=is%3Aopen+label%3Abug+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/workflows/CI/badge.svg) | [![](https://img.shields.io/github/issues-pr/oslc-op/sysml-oslc-server?label=PR&color=blue)](https://github.com/oslc-op/sysml-oslc-server/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/oslc-op/sysml-oslc-server/Type:%20Bug?label=bugs)](https://github.com/oslc-op/sysml-oslc-server/issues?q=is%3Aopen+label%3Abug+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&color=blue)](https://github.com/OSLC/lyo-adaptor-sample-modelling/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/lyo-adaptor-sample-modelling/bug?label=bugs)](https://github.com/OSLC/lyo-adaptor-sample-modelling/issues?q=is%3Aopen+label%3Abug+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&color=blue)](https://github.com/OSLC/lyo-samples/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/lyo-samples/bug?label=bugs)](https://github.com/OSLC/lyo-samples/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/lyo-samples) | -| [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&color=blue)](https://github.com/OSLC/lyo-samples/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/lyo-samples/bug?label=bugs)](https://github.com/OSLC/lyo-samples/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/lyo-samples) | -| [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&color=blue)](https://github.com/OSLC/lyo-adaptor-bugzilla/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/lyo-adaptor-bugzilla/bug?label=bugs)](https://github.com/OSLC/lyo-adaptor-bugzilla/issues?q=is%3Aopen+label%3Abug+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&color=blue)](https://github.com/OSLC/iotp-adaptor/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/iotp-adaptor/bug?label=bugs)](https://github.com/OSLC/iotp-adaptor/issues?q=is%3Aopen+label%3Abug+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&color=blue)](https://github.com/OSLC/oslc-adapter-jama/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/OSLC/oslc-adapter-jama/bug?label=bugs)](https://github.com/OSLC/oslc-adapter-jama/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/OSLC/oslc-adapter-jama) | -| [eclipse/lyo.testsuite](https://github.com/eclipse/lyo.testsuite) | ![](https://img.shields.io/badge/Lyo-2.4.0-f42020) | ![](https://github.com/eclipse/lyo.testsuite/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/eclipse/lyo.testsuite?label=PR&color=blue)](https://github.com/eclipse/lyo.testsuite/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/eclipse/lyo.testsuite/Type:%20Bug?label=bugs)](https://github.com/eclipse/lyo.testsuite/issues?q=is%3Aopen+label%3A%22Type%3A+Bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/eclipse/lyo.testsuite) | -| [ld4mbse/oslc4tdb](https://github.com/ld4mbse/oslc4tdb) | ![](https://img.shields.io/badge/Lyo-2.3.0-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc4tdb?label=PR&color=blue)](https://github.com/ld4mbse/oslc4tdb/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/ld4mbse/oslc4tdb/bug?label=bugs)](https://github.com/ld4mbse/oslc4tdb/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc4tdb) | -| [kth-mda/adaptor-bugzilla-trs](https://gitlab.com/kth-mda/lyo/adaptor-bugzilla-trs) | ![](https://img.shields.io/badge/Lyo-2.2.0-f42020) | ![](https://gitlab.com/kth-mda/lyo/adaptor-bugzilla-trs/badges/master/pipeline.svg?ignore_skipped=true) | [![](https://img.shields.io/gitlab/merge-requests/open/kth-mda%2Flyo%2Fadaptor-bugzilla-trs?label=MR)](https://gitlab.com/kth-mda/lyo/adaptor-bugzilla-trs/-/merge_requests) | [![](https://img.shields.io/gitlab/issues/open/kth-mda%2Flyo%2Fadaptor-bugzilla-trs)](https://gitlab.com/kth-mda/lyo/adaptor-bugzilla-trs/-/issues) | ![](https://img.shields.io/gitlab/last-commit/kth-mda%2Flyo%2Fadaptor-bugzilla-trs) | -| [berezovskyi/oslc-adapter-subversion](https://github.com/berezovskyi/oslc-adapter-subversion) | ![](https://img.shields.io/badge/Lyo-2.1.2-f42020) | ![](https://github.com/berezovskyi/oslc-adapter-subversion/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/berezovskyi/oslc-adapter-subversion?label=PR&color=blue)](https://github.com/berezovskyi/oslc-adapter-subversion/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/berezovskyi/oslc-adapter-subversion/bug?label=bugs)](https://github.com/berezovskyi/oslc-adapter-subversion/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/berezovskyi/oslc-adapter-subversion) | -| [lyo-samples-attic/oslc-java-samples](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-4.1/oslc-java-samples) | ![](https://img.shields.io/badge/Lyo-4.1.0-f42020) | N/A | N/A | N/A | N/A | -| [lyo-samples-attic/oslc4j-stockquote](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-2.4/oslc4j-stockquote) | ![](https://img.shields.io/badge/Lyo-2.3.0-f42020) | N/A | N/A | N/A | N/A | -| [lyo-samples-attic/oslc4j-test](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-2.3/oslc4j-test) | ![](https://img.shields.io/badge/Lyo-2.3.0-f42020) | N/A | N/A | N/A | N/A | -| [lyo-samples-attic/oslc4j-bugzilla-sample](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-2.2/oslc4j-bugzilla-sample) | ![](https://img.shields.io/badge/Lyo-2.2.0-f42020) | N/A | N/A | N/A | N/A | -| [lyo-samples-attic/trs4j-bugzilla-sample](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-2.1/trs4j-bugzilla-sample) | ![](https://img.shields.io/badge/Lyo-2.1.2-f42020) | N/A | N/A | N/A | N/A | -| [ld4mbse/oslc-adapter-simulink](https://github.com/ld4mbse/oslc-adapter-simulink) | ![](https://img.shields.io/badge/Lyo-3.0.0--S-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-simulink?label=PR&color=blue)](https://github.com/ld4mbse/oslc-adapter-simulink/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/ld4mbse/oslc-adapter-simulink/bug?label=bugs)](https://github.com/ld4mbse/oslc-adapter-simulink/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-adapter-simulink) | -| [ld4mbse/oslc-adapter-magicdraw-sysml](https://github.com/ld4mbse/oslc-adapter-magicdraw-sysml) | ![](https://img.shields.io/badge/Lyo-3.0.0--S-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-magicdraw-sysml?label=PR&color=blue)](https://github.com/ld4mbse/oslc-adapter-magicdraw-sysml/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/ld4mbse/oslc-adapter-magicdraw-sysml/bug?label=bugs)](https://github.com/ld4mbse/oslc-adapter-magicdraw-sysml/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-adapter-magicdraw-sysml) | -| [ld4mbse/oslc-adapter-integrity](https://github.com/ld4mbse/oslc-adapter-integrity) | ![](https://img.shields.io/badge/Lyo-3.0.0--S-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-integrity?label=PR&color=blue)](https://github.com/ld4mbse/oslc-adapter-integrity/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/ld4mbse/oslc-adapter-integrity/bug?label=bugs)](https://github.com/ld4mbse/oslc-adapter-integrity/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-adapter-integrity) | -| [ld4mbse/oslc-adapter-fmi](https://github.com/ld4mbse/oslc-adapter-fmi) | ![](https://img.shields.io/badge/Lyo-3.0.0--S-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-fmi?label=PR&color=blue)](https://github.com/ld4mbse/oslc-adapter-fmi/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/ld4mbse/oslc-adapter-fmi/bug?label=bugs)](https://github.com/ld4mbse/oslc-adapter-fmi/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-adapter-fmi) | -| [ld4mbse/oslc-modeltransformation-simulink-magicdraw](https://github.com/ld4mbse/oslc-modeltransformation-simulink-magicdraw) | ![](https://img.shields.io/badge/Lyo-3.0.0--S-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-modeltransformation-simulink-magicdraw?label=PR&color=blue)](https://github.com/ld4mbse/oslc-modeltransformation-simulink-magicdraw/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/ld4mbse/oslc-modeltransformation-simulink-magicdraw/bug?label=bugs)](https://github.com/ld4mbse/oslc-modeltransformation-simulink-magicdraw/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-modeltransformation-simulink-magicdraw) | -| [ld4mbse/oslc-adapter-jena-tdb](https://github.com/ld4mbse/oslc-adapter-jena-tdb) | ![](https://img.shields.io/badge/Lyo-2.0.0-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-jena-tdb?label=PR&color=blue)](https://github.com/ld4mbse/oslc-adapter-jena-tdb/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/ld4mbse/oslc-adapter-jena-tdb/bug?label=bugs)](https://github.com/ld4mbse/oslc-adapter-jena-tdb/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-adapter-jena-tdb) | -| [ld4mbse/oslc-adapter-amesim](https://github.com/ld4mbse/oslc-adapter-amesim) | ![](https://img.shields.io/badge/Lyo-2.0.0-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-amesim?label=PR&color=blue)](https://github.com/ld4mbse/oslc-adapter-amesim/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | [![](https://img.shields.io/github/issues/ld4mbse/oslc-adapter-amesim/bug?label=bugs)](https://github.com/ld4mbse/oslc-adapter-amesim/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-adapter-amesim) | -| [kth-mda/se.kth.md.cpse.adaptor.bugzilla](https://gitlab.com/kth-mda/lyo/se.kth.md.cpse.adaptor.bugzilla) | ![](https://img.shields.io/badge/Lyo-2.0.0-f42020) | ![](https://gitlab.com/kth-mda/lyo/se.kth.md.cpse.adaptor.bugzilla/badges/master/pipeline.svg?ignore_skipped=true) | [![](https://img.shields.io/gitlab/merge-requests/open/kth-mda%2Flyo%2Fse.kth.md.cpse.adaptor.bugzilla?label=MR)](https://gitlab.com/kth-mda/lyo/se.kth.md.cpse.adaptor.bugzilla/-/merge_requests) | [![](https://img.shields.io/gitlab/issues/open/kth-mda%2Flyo%2Fse.kth.md.cpse.adaptor.bugzilla)](https://gitlab.com/kth-mda/lyo/se.kth.md.cpse.adaptor.bugzilla/-/issues) | ![](https://img.shields.io/gitlab/last-commit/kth-mda%2Flyo%2Fse.kth.md.cpse.adaptor.bugzilla) | -| [kth-mda/adaptor-bugzilla-store](https://gitlab.com/kth-mda/lyo/adaptor-store-support) | ![](https://img.shields.io/badge/Lyo-2.1.0-f42020) | N/A | [![](https://img.shields.io/gitlab/merge-requests/open/kth-mda%2Flyo%2Fadaptor-store-support?label=MR)](https://gitlab.com/kth-mda/lyo/adaptor-store-support/-/merge_requests) | [![](https://img.shields.io/gitlab/issues/open/kth-mda%2Flyo%2Fadaptor-store-support)](https://gitlab.com/kth-mda/lyo/adaptor-store-support/-/issues) | ![](https://img.shields.io/gitlab/last-commit/kth-mda%2Flyo%2Fadaptor-store-support) | +| 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/workflows/CI/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) | +| [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) | +| [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) | +| [eclipse/lyo.testsuite](https://github.com/eclipse/lyo.testsuite) | ![](https://img.shields.io/badge/Lyo-2.4.0-f42020) | ![](https://github.com/eclipse/lyo.testsuite/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/eclipse/lyo.testsuite?label=PR)](https://github.com/eclipse/lyo.testsuite/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/eclipse/lyo.testsuite) | +| [ld4mbse/oslc4tdb](https://github.com/ld4mbse/oslc4tdb) | ![](https://img.shields.io/badge/Lyo-2.3.0-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc4tdb?label=PR)](https://github.com/ld4mbse/oslc4tdb/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc4tdb) | +| [kth-mda/adaptor-bugzilla-trs](https://gitlab.com/kth-mda/lyo/adaptor-bugzilla-trs) | ![](https://img.shields.io/badge/Lyo-2.2.0-f42020) | ![](https://gitlab.com/kth-mda/lyo/adaptor-bugzilla-trs/badges/master/pipeline.svg?ignore_skipped=true) | [![](https://img.shields.io/gitlab/merge-requests/open/kth-mda%2Flyo%2Fadaptor-bugzilla-trs?label=MR)](https://gitlab.com/kth-mda/lyo/adaptor-bugzilla-trs/-/merge_requests) | ![](https://img.shields.io/gitlab/last-commit/kth-mda%2Flyo%2Fadaptor-bugzilla-trs) | +| [berezovskyi/oslc-adapter-subversion](https://github.com/berezovskyi/oslc-adapter-subversion) | ![](https://img.shields.io/badge/Lyo-2.1.2-f42020) | ![](https://github.com/berezovskyi/oslc-adapter-subversion/actions/workflows/maven.yml/badge.svg) | [![](https://img.shields.io/github/issues-pr/berezovskyi/oslc-adapter-subversion?label=PR)](https://github.com/berezovskyi/oslc-adapter-subversion/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/berezovskyi/oslc-adapter-subversion) | +| [lyo-samples-attic/oslc-java-samples](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-4.1/oslc-java-samples) | ![](https://img.shields.io/badge/Lyo-4.1.0-f42020) | N/A | N/A | N/A | +| [lyo-samples-attic/oslc4j-stockquote](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-2.4/oslc4j-stockquote) | ![](https://img.shields.io/badge/Lyo-2.3.0-f42020) | N/A | N/A | N/A | +| [lyo-samples-attic/oslc4j-test](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-2.3/oslc4j-test) | ![](https://img.shields.io/badge/Lyo-2.3.0-f42020) | N/A | N/A | N/A | +| [lyo-samples-attic/oslc4j-bugzilla-sample](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-2.2/oslc4j-bugzilla-sample) | ![](https://img.shields.io/badge/Lyo-2.2.0-f42020) | N/A | N/A | N/A | +| [lyo-samples-attic/trs4j-bugzilla-sample](https://github.com/OSLC/lyo-samples-attic/tree/main/lyo-2.1/trs4j-bugzilla-sample) | ![](https://img.shields.io/badge/Lyo-2.1.2-f42020) | N/A | N/A | N/A | +| [ld4mbse/oslc-adapter-simulink](https://github.com/ld4mbse/oslc-adapter-simulink) | ![](https://img.shields.io/badge/Lyo-3.0.0--S-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-simulink?label=PR)](https://github.com/ld4mbse/oslc-adapter-simulink/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-adapter-simulink) | +| [ld4mbse/oslc-adapter-magicdraw-sysml](https://github.com/ld4mbse/oslc-adapter-magicdraw-sysml) | ![](https://img.shields.io/badge/Lyo-3.0.0--S-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-magicdraw-sysml?label=PR)](https://github.com/ld4mbse/oslc-adapter-magicdraw-sysml/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-adapter-magicdraw-sysml) | +| [ld4mbse/oslc-adapter-integrity](https://github.com/ld4mbse/oslc-adapter-integrity) | ![](https://img.shields.io/badge/Lyo-3.0.0--S-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-integrity?label=PR)](https://github.com/ld4mbse/oslc-adapter-integrity/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-adapter-integrity) | +| [ld4mbse/oslc-adapter-fmi](https://github.com/ld4mbse/oslc-adapter-fmi) | ![](https://img.shields.io/badge/Lyo-3.0.0--S-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-fmi?label=PR)](https://github.com/ld4mbse/oslc-adapter-fmi/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-adapter-fmi) | +| [ld4mbse/oslc-modeltransformation-simulink-magicdraw](https://github.com/ld4mbse/oslc-modeltransformation-simulink-magicdraw) | ![](https://img.shields.io/badge/Lyo-3.0.0--S-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-modeltransformation-simulink-magicdraw?label=PR)](https://github.com/ld4mbse/oslc-modeltransformation-simulink-magicdraw/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-modeltransformation-simulink-magicdraw) | +| [ld4mbse/oslc-adapter-jena-tdb](https://github.com/ld4mbse/oslc-adapter-jena-tdb) | ![](https://img.shields.io/badge/Lyo-2.0.0-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-jena-tdb?label=PR)](https://github.com/ld4mbse/oslc-adapter-jena-tdb/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-adapter-jena-tdb) | +| [ld4mbse/oslc-adapter-amesim](https://github.com/ld4mbse/oslc-adapter-amesim) | ![](https://img.shields.io/badge/Lyo-2.0.0-f42020) | N/A | [![](https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-amesim?label=PR)](https://github.com/ld4mbse/oslc-adapter-amesim/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) | ![](https://img.shields.io/github/last-commit/ld4mbse/oslc-adapter-amesim) | +| [kth-mda/se.kth.md.cpse.adaptor.bugzilla](https://gitlab.com/kth-mda/lyo/se.kth.md.cpse.adaptor.bugzilla) | ![](https://img.shields.io/badge/Lyo-2.0.0-f42020) | ![](https://gitlab.com/kth-mda/lyo/se.kth.md.cpse.adaptor.bugzilla/badges/master/pipeline.svg?ignore_skipped=true) | [![](https://img.shields.io/gitlab/merge-requests/open/kth-mda%2Flyo%2Fse.kth.md.cpse.adaptor.bugzilla?label=MR)](https://gitlab.com/kth-mda/lyo/se.kth.md.cpse.adaptor.bugzilla/-/merge_requests) | ![](https://img.shields.io/gitlab/last-commit/kth-mda%2Flyo%2Fse.kth.md.cpse.adaptor.bugzilla) | +| [kth-mda/adaptor-bugzilla-store](https://gitlab.com/kth-mda/lyo/adaptor-store-support) | ![](https://img.shields.io/badge/Lyo-2.1.0-f42020) | N/A | [![](https://img.shields.io/gitlab/merge-requests/open/kth-mda%2Flyo%2Fadaptor-store-support?label=MR)](https://gitlab.com/kth-mda/lyo/adaptor-store-support/-/merge_requests) | ![](https://img.shields.io/gitlab/last-commit/kth-mda%2Flyo%2Fadaptor-store-support) | > [!CAUTION] diff --git a/tools/readme-matrix/downstream-projects.yml b/tools/readme-matrix/downstream-projects.yml index e6f3840de..c9bc22bee 100644 --- a/tools/readme-matrix/downstream-projects.yml +++ b/tools/readme-matrix/downstream-projects.yml @@ -32,7 +32,7 @@ projects: link: "https://github.com/oslc-op/refimpl" version: "6.0.0--S" ci_badge: "https://github.com/oslc-op/refimpl/actions/workflows/maven.yml/badge.svg" - pr_badge: "https://img.shields.io/github/issues-pr/oslc-op/refimpl?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/oslc-op/refimpl?label=PR" pr_link: "https://github.com/oslc-op/refimpl/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/oslc-op/refimpl/Type:%20Bug?label=bugs" issues_link: "https://github.com/oslc-op/refimpl/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc" @@ -40,7 +40,7 @@ projects: - slug: "danlz/lyo-in-spring-boot" link: "https://github.com/danlz/lyo-in-spring-boot" version: "6.0.0--S" - pr_badge: "https://img.shields.io/github/issues-pr/danlz/lyo-in-spring-boot?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/danlz/lyo-in-spring-boot?label=PR" pr_link: "https://github.com/danlz/lyo-in-spring-boot/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/danlz/lyo-in-spring-boot/Type:%20Bug?label=bugs" issues_link: "https://github.com/danlz/lyo-in-spring-boot/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc" @@ -50,7 +50,7 @@ projects: version: "5.1.1" # FIXME: new URI ci_badge: "https://github.com/oslc-op/sysml-oslc-server/workflows/CI/badge.svg" - pr_badge: "https://img.shields.io/github/issues-pr/oslc-op/sysml-oslc-server?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/oslc-op/sysml-oslc-server?label=PR" pr_link: "https://github.com/oslc-op/sysml-oslc-server/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/oslc-op/sysml-oslc-server/Type:%20Bug?label=bugs" issues_link: "https://github.com/oslc-op/sysml-oslc-server/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc" @@ -59,7 +59,7 @@ projects: link: "https://github.com/OSLC/lyo-adaptor-sample-modelling" version: "5.0.1.CR" ci_badge: "https://github.com/OSLC/lyo-adaptor-sample-modelling/actions/workflows/maven.yml/badge.svg?branch=main-5.x" - pr_badge: "https://img.shields.io/github/issues-pr/OSLC/lyo-adaptor-sample-modelling?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/OSLC/lyo-adaptor-sample-modelling?label=PR" pr_link: "https://github.com/OSLC/lyo-adaptor-sample-modelling/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/OSLC/lyo-adaptor-sample-modelling/bug?label=bugs" issues_link: "https://github.com/OSLC/lyo-adaptor-sample-modelling/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc" @@ -68,7 +68,7 @@ projects: link: "https://github.com/OSLC/lyo-samples" version: "5.2.0--S" ci_badge: "https://github.com/OSLC/lyo-samples/actions/workflows/maven.yml/badge.svg" - pr_badge: "https://img.shields.io/github/issues-pr/OSLC/lyo-samples?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/OSLC/lyo-samples?label=PR" pr_link: "https://github.com/OSLC/lyo-samples/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/OSLC/lyo-samples/bug?label=bugs" issues_link: "https://github.com/OSLC/lyo-samples/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc" @@ -77,7 +77,7 @@ projects: link: "https://github.com/OSLC/lyo-samples" version: "4.0.0" ci_badge: "https://github.com/OSLC/lyo-samples/actions/workflows/maven.yml/badge.svg" - pr_badge: "https://img.shields.io/github/issues-pr/OSLC/lyo-samples?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/OSLC/lyo-samples?label=PR" pr_link: "https://github.com/OSLC/lyo-samples/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/OSLC/lyo-samples/bug?label=bugs" issues_link: "https://github.com/OSLC/lyo-samples/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc" @@ -86,7 +86,7 @@ projects: link: "https://github.com/OSLC/lyo-adaptor-bugzilla" version: "2.4.0" ci_badge: "https://github.com/OSLC/lyo-adaptor-bugzilla/actions/workflows/maven.yml/badge.svg" - pr_badge: "https://img.shields.io/github/issues-pr/OSLC/lyo-adaptor-bugzilla?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/OSLC/lyo-adaptor-bugzilla?label=PR" pr_link: "https://github.com/OSLC/lyo-adaptor-bugzilla/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/OSLC/lyo-adaptor-bugzilla/bug?label=bugs" issues_link: "https://github.com/OSLC/lyo-adaptor-bugzilla/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc" @@ -95,7 +95,7 @@ projects: link: "https://github.com/OSLC/iotp-adaptor" version: "2.4.0" ci_badge: "https://github.com/OSLC/iotp-adaptor/actions/workflows/maven.yml/badge.svg" - pr_badge: "https://img.shields.io/github/issues-pr/OSLC/iotp-adaptor?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/OSLC/iotp-adaptor?label=PR" pr_link: "https://github.com/OSLC/iotp-adaptor/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/OSLC/iotp-adaptor/bug?label=bugs" issues_link: "https://github.com/OSLC/iotp-adaptor/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc" @@ -104,7 +104,7 @@ projects: link: "https://github.com/OSLC/oslc-adapter-jama" version: "2.4.0" ci_badge: "https://github.com/OSLC/oslc-adapter-jama/actions/workflows/maven.yml/badge.svg" - pr_badge: "https://img.shields.io/github/issues-pr/OSLC/oslc-adapter-jama?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/OSLC/oslc-adapter-jama?label=PR" pr_link: "https://github.com/OSLC/oslc-adapter-jama/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/OSLC/oslc-adapter-jama/bug?label=bugs" issues_link: "https://github.com/OSLC/oslc-adapter-jama/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc" @@ -113,7 +113,7 @@ projects: link: "https://github.com/eclipse/lyo.testsuite" version: "2.4.0" ci_badge: "https://github.com/eclipse/lyo.testsuite/actions/workflows/maven.yml/badge.svg" - pr_badge: "https://img.shields.io/github/issues-pr/eclipse/lyo.testsuite?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/eclipse/lyo.testsuite?label=PR" pr_link: "https://github.com/eclipse/lyo.testsuite/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/eclipse/lyo.testsuite/Type:%20Bug?label=bugs" issues_link: "https://github.com/eclipse/lyo.testsuite/issues?q=is%3Aopen+label%3A%22Type%3A+Bug%22+sort%3Aupdated-desc" @@ -121,7 +121,7 @@ projects: - slug: "ld4mbse/oslc4tdb" link: "https://github.com/ld4mbse/oslc4tdb" version: "2.3.0" - pr_badge: "https://img.shields.io/github/issues-pr/ld4mbse/oslc4tdb?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/ld4mbse/oslc4tdb?label=PR" pr_link: "https://github.com/ld4mbse/oslc4tdb/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/ld4mbse/oslc4tdb/bug?label=bugs" issues_link: "https://github.com/ld4mbse/oslc4tdb/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc" @@ -139,7 +139,7 @@ projects: link: "https://github.com/berezovskyi/oslc-adapter-subversion" version: "2.1.2" ci_badge: "https://github.com/berezovskyi/oslc-adapter-subversion/actions/workflows/maven.yml/badge.svg" - pr_badge: "https://img.shields.io/github/issues-pr/berezovskyi/oslc-adapter-subversion?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/berezovskyi/oslc-adapter-subversion?label=PR" pr_link: "https://github.com/berezovskyi/oslc-adapter-subversion/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/berezovskyi/oslc-adapter-subversion/bug?label=bugs" issues_link: "https://github.com/berezovskyi/oslc-adapter-subversion/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc" @@ -162,7 +162,7 @@ projects: - slug: "ld4mbse/oslc-adapter-simulink" link: "https://github.com/ld4mbse/oslc-adapter-simulink" version: "3.0.0--S" - pr_badge: "https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-simulink?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-simulink?label=PR" pr_link: "https://github.com/ld4mbse/oslc-adapter-simulink/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/ld4mbse/oslc-adapter-simulink/bug?label=bugs" issues_link: "https://github.com/ld4mbse/oslc-adapter-simulink/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc" @@ -170,7 +170,7 @@ projects: - slug: "ld4mbse/oslc-adapter-magicdraw-sysml" link: "https://github.com/ld4mbse/oslc-adapter-magicdraw-sysml" version: "3.0.0--S" - pr_badge: "https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-magicdraw-sysml?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-magicdraw-sysml?label=PR" pr_link: "https://github.com/ld4mbse/oslc-adapter-magicdraw-sysml/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/ld4mbse/oslc-adapter-magicdraw-sysml/bug?label=bugs" issues_link: "https://github.com/ld4mbse/oslc-adapter-magicdraw-sysml/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc" @@ -178,7 +178,7 @@ projects: - slug: "ld4mbse/oslc-adapter-integrity" link: "https://github.com/ld4mbse/oslc-adapter-integrity" version: "3.0.0--S" - pr_badge: "https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-integrity?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-integrity?label=PR" pr_link: "https://github.com/ld4mbse/oslc-adapter-integrity/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/ld4mbse/oslc-adapter-integrity/bug?label=bugs" issues_link: "https://github.com/ld4mbse/oslc-adapter-integrity/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc" @@ -186,7 +186,7 @@ projects: - slug: "ld4mbse/oslc-adapter-fmi" link: "https://github.com/ld4mbse/oslc-adapter-fmi" version: "3.0.0--S" - pr_badge: "https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-fmi?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-fmi?label=PR" pr_link: "https://github.com/ld4mbse/oslc-adapter-fmi/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/ld4mbse/oslc-adapter-fmi/bug?label=bugs" issues_link: "https://github.com/ld4mbse/oslc-adapter-fmi/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc" @@ -194,7 +194,7 @@ projects: - slug: "ld4mbse/oslc-modeltransformation-simulink-magicdraw" link: "https://github.com/ld4mbse/oslc-modeltransformation-simulink-magicdraw" version: "3.0.0--S" - pr_badge: "https://img.shields.io/github/issues-pr/ld4mbse/oslc-modeltransformation-simulink-magicdraw?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/ld4mbse/oslc-modeltransformation-simulink-magicdraw?label=PR" pr_link: "https://github.com/ld4mbse/oslc-modeltransformation-simulink-magicdraw/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/ld4mbse/oslc-modeltransformation-simulink-magicdraw/bug?label=bugs" issues_link: "https://github.com/ld4mbse/oslc-modeltransformation-simulink-magicdraw/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc" @@ -202,7 +202,7 @@ projects: - slug: "ld4mbse/oslc-adapter-jena-tdb" link: "https://github.com/ld4mbse/oslc-adapter-jena-tdb" version: "2.0.0" - pr_badge: "https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-jena-tdb?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-jena-tdb?label=PR" pr_link: "https://github.com/ld4mbse/oslc-adapter-jena-tdb/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/ld4mbse/oslc-adapter-jena-tdb/bug?label=bugs" issues_link: "https://github.com/ld4mbse/oslc-adapter-jena-tdb/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc" @@ -210,7 +210,7 @@ projects: - slug: "ld4mbse/oslc-adapter-amesim" link: "https://github.com/ld4mbse/oslc-adapter-amesim" version: "2.0.0" - pr_badge: "https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-amesim?label=PR&color=blue" + pr_badge: "https://img.shields.io/github/issues-pr/ld4mbse/oslc-adapter-amesim?label=PR" pr_link: "https://github.com/ld4mbse/oslc-adapter-amesim/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/ld4mbse/oslc-adapter-amesim/bug?label=bugs" issues_link: "https://github.com/ld4mbse/oslc-adapter-amesim/issues?q=is%3Aopen+label%3A%22bug%22+sort%3Aupdated-desc" diff --git a/tools/readme-matrix/readme-matrix-generator.py b/tools/readme-matrix/readme-matrix-generator.py index 7afdab1f7..e7a2d2c24 100755 --- a/tools/readme-matrix/readme-matrix-generator.py +++ b/tools/readme-matrix/readme-matrix-generator.py @@ -33,8 +33,10 @@ def generate_md_table(config): print(label_types, file=sys.stderr) print(lyo_versions, file=sys.stderr) - print("| Repo | Version | Status | PRs | Bugs | Activity |") - print("| ---- | ------- | ------ | --- | ---- | -------- |") + # print("| Repo | Version | Status | PRs | Bugs | Activity |") + # print("| ---- | ------- | ------ | --- | ---- | -------- |") + print("| Repo | Version | Status | PRs | Activity |") + print("| ---- | ------- | ------ | --- | -------- |") for p in config["projects"]: project_link = f"[{p['slug']}]({p['link']})" @@ -44,7 +46,8 @@ def generate_md_table(config): pr_badge = f"[![]({p['pr_badge']})]({p['pr_link']})" if 'pr_badge' in p else "N/A" issues_badge = f"[![]({p['issues_badge']})]({p['issues_link']})" if 'issues_badge' in p else "N/A" activity_badge = f"![]({p['activity_badge']})" if 'activity_badge' in p else "N/A" - print(f"| {project_link} | {version_badge} | {ci_badge} | {pr_badge} | {issues_badge} | {activity_badge} |") + # print(f"| {project_link} | {version_badge} | {ci_badge} | {pr_badge} | {issues_badge} | {activity_badge} |") + print(f"| {project_link} | {version_badge} | {ci_badge} | {pr_badge} | {activity_badge} |") if __name__ == "__main__": From bbe47002f71c5089bc29d808f15da1cd65af16cc Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sun, 14 Apr 2024 13:21:03 +0200 Subject: [PATCH 058/126] docs: matrix upd sysml --- README.md | 2 +- tools/readme-matrix/downstream-projects.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a289ee601..ff30f54a2 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ See under [validation/README](validation/README.md). | ---- | ------- | ------ | --- | -------- | | [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/workflows/CI/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/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/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) | | [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) | diff --git a/tools/readme-matrix/downstream-projects.yml b/tools/readme-matrix/downstream-projects.yml index c9bc22bee..ec90eb569 100644 --- a/tools/readme-matrix/downstream-projects.yml +++ b/tools/readme-matrix/downstream-projects.yml @@ -48,8 +48,7 @@ projects: - slug: "oslc-op/sysml-oslc-server" link: "https://github.com/oslc-op/sysml-oslc-server" version: "5.1.1" - # FIXME: new URI - ci_badge: "https://github.com/oslc-op/sysml-oslc-server/workflows/CI/badge.svg" + ci_badge: "https://github.com/oslc-op/sysml-oslc-server/actions/workflows/maven.yml/badge.svg" pr_badge: "https://img.shields.io/github/issues-pr/oslc-op/sysml-oslc-server?label=PR" pr_link: "https://github.com/oslc-op/sysml-oslc-server/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/oslc-op/sysml-oslc-server/Type:%20Bug?label=bugs" From 10b0114bc1344833e39f95d9fec568c4c668ec70 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sun, 14 Apr 2024 13:34:49 +0200 Subject: [PATCH 059/126] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff30f54a2..7961914c5 100644 --- 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.0.0.Final-blue.svg)](https://download.eclipse.org/lyo/docs/all/5.0.0.Final/apidocs/) +[![](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-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/) From c0701b91af89dac827bb4bb31b7728d42412250b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Apr 2024 23:44:19 +0200 Subject: [PATCH 060/126] chore: Bump org.apache.maven.plugins:maven-gpg-plugin (#530) Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.2.3 to 3.2.4. - [Release notes](https://github.com/apache/maven-gpg-plugin/releases) - [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.2.3...maven-gpg-plugin-3.2.4) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c634bb829..0df0b8ae6 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sign-artifacts From 87dec648327c927309eafd5807317c1ef68d4537 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Apr 2024 23:44:57 +0200 Subject: [PATCH 061/126] chore: Bump io.github.classgraph:classgraph from 4.8.170 to 4.8.172 (#529) Bumps [io.github.classgraph:classgraph](https://github.com/classgraph/classgraph) from 4.8.170 to 4.8.172. - [Release notes](https://github.com/classgraph/classgraph/releases) - [Commits](https://github.com/classgraph/classgraph/compare/classgraph-4.8.170...classgraph-4.8.172) --- updated-dependencies: - dependency-name: io.github.classgraph:classgraph dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- core/oslc4j-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml index 56a10f26c..7032cbeda 100644 --- a/core/oslc4j-core/pom.xml +++ b/core/oslc4j-core/pom.xml @@ -27,7 +27,7 @@ io.github.classgraph classgraph - 4.8.170 + 4.8.172 jakarta.ws.rs From 1cbae934b702568a7b4692edb1323d9b09f1261c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Apr 2024 23:53:18 +0200 Subject: [PATCH 062/126] chore: Bump jakarta.annotation:jakarta.annotation-api (#519) Bumps [jakarta.annotation:jakarta.annotation-api](https://github.com/jakartaee/common-annotations-api) from 2.1.1 to 3.0.0. - [Commits](https://github.com/jakartaee/common-annotations-api/compare/2.1.1...3.0.0) --- updated-dependencies: - dependency-name: jakarta.annotation:jakarta.annotation-api dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0df0b8ae6..b9edc3d15 100644 --- a/pom.xml +++ b/pom.xml @@ -247,7 +247,7 @@ jakarta.annotation jakarta.annotation-api - 2.1.1 + 3.0.0 provided From 02e30bd22770919841e82244b5e548c9d8172e67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 18:28:52 +0200 Subject: [PATCH 063/126] chore: Bump v.kotlin from 1.9.23 to 1.9.24 (#540) Bumps `v.kotlin` from 1.9.23 to 1.9.24. Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 1.9.23 to 1.9.24 Updates `org.jetbrains.kotlin:kotlin-stdlib` from 1.9.23 to 1.9.24 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.24/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.23...v1.9.24) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b9edc3d15..e3857f4be 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ ${project.version} - 1.9.23 + 1.9.24 1.9.20 3.1.6 From 41da9a6297869e8040b738298880d0f3a3069bf4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 18:29:11 +0200 Subject: [PATCH 064/126] chore: Bump com.fasterxml.jackson:jackson-bom from 2.17.0 to 2.17.1 (#539) Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.17.0 to 2.17.1. - [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.17.0...jackson-bom-2.17.1) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3857f4be..96d7bcb8e 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 3.1.0 4.8.0 - 2.17.0 + 2.17.1 4.5.14 2.0.13 From adb6345be469596dd6aeaf0f21caf586cab182a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 18:29:55 +0200 Subject: [PATCH 065/126] chore: Bump commons-codec:commons-codec from 1.16.1 to 1.17.0 (#535) Bumps [commons-codec:commons-codec](https://github.com/apache/commons-codec) from 1.16.1 to 1.17.0. - [Changelog](https://github.com/apache/commons-codec/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-codec/compare/rel/commons-codec-1.16.1...rel/commons-codec-1.17.0) --- updated-dependencies: - dependency-name: commons-codec:commons-codec dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 96d7bcb8e..dab631442 100644 --- a/pom.xml +++ b/pom.xml @@ -388,7 +388,7 @@ commons-codec commons-codec - 1.16.1 + 1.17.0 com.google.guava From b5eecacbee329595e7d0c9a1e10f22eb982c2ecd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 18:30:07 +0200 Subject: [PATCH 066/126] chore: Bump com.google.guava:guava from 33.1.0-jre to 33.2.0-jre (#538) Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.1.0-jre to 33.2.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dab631442..ef2aadc8b 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.5.14 2.0.13 - 33.1.0-jre + 33.2.0-jre From e362c5695f80cf166f2554cadec45ba7d82adb66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 18:32:27 +0200 Subject: [PATCH 067/126] chore: Bump org.apache.maven.plugins:maven-jar-plugin (#532) Bumps [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.3.0 to 3.4.1. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.3.0...maven-jar-plugin-3.4.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-jar-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef2aadc8b..16831981e 100644 --- a/pom.xml +++ b/pom.xml @@ -593,7 +593,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.1 From 55162ef27b87bd63c199781341accb8d02a8ef34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 22:30:40 +0200 Subject: [PATCH 068/126] --- (#542) updated-dependencies: - dependency-name: org.codehaus.mojo:build-helper-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- core/oslc-query/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/oslc-query/pom.xml b/core/oslc-query/pom.xml index 9b27bd1f6..333077d25 100644 --- a/core/oslc-query/pom.xml +++ b/core/oslc-query/pom.xml @@ -58,7 +58,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.5.0 + 3.6.0 generate-sources From 21e7d1414c00c1cd73282729ad067c61527883ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 22:31:50 +0200 Subject: [PATCH 069/126] chore: Bump org.apache.maven.plugins:maven-install-plugin (#533) Bumps [org.apache.maven.plugins:maven-install-plugin](https://github.com/apache/maven-install-plugin) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/apache/maven-install-plugin/releases) - [Commits](https://github.com/apache/maven-install-plugin/compare/maven-install-plugin-3.1.1...maven-install-plugin-3.1.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-install-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 16831981e..5facbacce 100644 --- a/pom.xml +++ b/pom.xml @@ -588,7 +588,7 @@ org.apache.maven.plugins maven-install-plugin - 3.1.1 + 3.1.2 org.apache.maven.plugins From d31ed152b7d66cd5fd9e0af46c04475cf740b219 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 22:31:57 +0200 Subject: [PATCH 070/126] chore: Bump org.apache.maven.plugins:maven-deploy-plugin (#534) Bumps [org.apache.maven.plugins:maven-deploy-plugin](https://github.com/apache/maven-deploy-plugin) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/apache/maven-deploy-plugin/releases) - [Commits](https://github.com/apache/maven-deploy-plugin/compare/maven-deploy-plugin-3.1.1...maven-deploy-plugin-3.1.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-deploy-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5facbacce..61402f138 100644 --- a/pom.xml +++ b/pom.xml @@ -583,7 +583,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + 3.1.2 org.apache.maven.plugins From e72267fb049869b140babd1168dfd7a13a64b9b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 22:35:12 +0200 Subject: [PATCH 071/126] chore: Bump org.mockito:mockito-core from 5.11.0 to 5.12.0 (#541) Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.11.0 to 5.12.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.11.0...v5.12.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 61402f138..80ac6bf19 100644 --- a/pom.xml +++ b/pom.xml @@ -361,7 +361,7 @@ org.mockito mockito-core - 5.11.0 + 5.12.0 test From 0ac65067342fd03f80294e478665519b7233ef43 Mon Sep 17 00:00:00 2001 From: jhemm2 <96134203+jhemm2@users.noreply.github.com> Date: Fri, 21 Jun 2024 10:30:54 +0200 Subject: [PATCH 072/126] add support for additional request headers in OslcQuery (#553) --- CHANGELOG.md | 1 + .../eclipse/lyo/client/query/OslcQuery.java | 435 ++++++++++-------- .../lyo/client/query/OslcQueryTest.java | 36 ++ 3 files changed, 278 insertions(+), 194 deletions(-) create mode 100644 client/oslc-client/src/test/java/org/eclipse/lyo/client/query/OslcQueryTest.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 089a014c1..2c9480028 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Introducing capability to set the servletUri to be used by the OAuthConfiguration - OSLC PROMCODE domain model and generated POJOs +- Support for additional request headers to OslcQuery ### Changed - 🧨Migrated from Javax to Jakarta packages diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/query/OslcQuery.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/query/OslcQuery.java index 0c2befb23..700708814 100644 --- a/client/oslc-client/src/main/java/org/eclipse/lyo/client/query/OslcQuery.java +++ b/client/oslc-client/src/main/java/org/eclipse/lyo/client/query/OslcQuery.java @@ -1,214 +1,261 @@ /* - * Copyright (c) 2020 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License 1.0 - * which is available at http://www.eclipse.org/org/documents/edl-v10.php. - * + * Copyright (c) 2020 Contributors to the Eclipse Foundation See the NOTICE file(s) distributed with this work for + * additional information regarding copyright ownership. This program and the accompanying materials are made available + * under the terms of the Eclipse Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0, or the + * Eclipse Distribution License 1.0 which is available at http://www.eclipse.org/org/documents/edl-v10.php. * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause */ package org.eclipse.lyo.client.query; +import java.util.Collections; +import java.util.Map; import org.eclipse.lyo.client.OSLCConstants; import org.eclipse.lyo.client.OslcClient; +import jakarta.ws.rs.client.Invocation.Builder; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.Response; /** - * Represents an OSLC query (HTTP GET) request to be made of a remote system. - * - * Immutable. + * Represents an OSLC query (HTTP GET) request to be made of a remote system. Immutable. */ @SuppressWarnings("WeakerAccess") public class OslcQuery { - private final OslcClient oslcClient; - - private final String capabilityUrl; - - private String queryUrl; - - private final int pageSize; - - private WebTarget queryResource; - - //query parameters - private final String where; - private final String select; - private final String orderBy; - private final String searchTerms; - private final String prefix; - private final String version; - private final String configurationContext; - - /** - * Create an OSLC query that uses the remote system's default page size. - * - * @param oslcClient the authenticated OSLC client - * @param capabilityUrl the URL that is the base - */ - public OslcQuery(OslcClient oslcClient, String capabilityUrl) { - this(oslcClient, capabilityUrl, 0); - } - - /** - * Create an OSLC query with query parameters that uses the default page size - * @param oslcClient the authenticated OSLC client - * @param capabilityUrl capabilityUrl the URL that is the base - * @param oslcQueryParams an OslcQueryParameters object - * @see OslcQueryParameters - */ - public OslcQuery(OslcClient oslcClient, String capabilityUrl, OslcQueryParameters oslcQueryParams) { - this(oslcClient, capabilityUrl, 0, oslcQueryParams); - } - - /** - * Create an OSLC query that uses the given page size - * - * @param oslcClient the authenticated OSLC client - * @param capabilityUrl the URL that is the base - * @param pageSize the number of results to include on each page (OslcQueryResult) - * - */ - public OslcQuery(OslcClient oslcClient, String capabilityUrl, int pageSize) { - this(oslcClient, capabilityUrl, pageSize, null); - } - - /** - * Create an OSLC query that uses OSLC query parameters and the given page size - * - * @param oslcClient the authenticated OSLC client - * @param capabilityUrl the URL that is the base - * @param pageSize the number of results to include on each page (OslcQueryResult) - * @param oslcQueryParams an OslcQueryParameters object (see {@link OslcQueryParameters}) - */ - public OslcQuery(OslcClient oslcClient, String capabilityUrl, - int pageSize, OslcQueryParameters oslcQueryParams) { - this(oslcClient, capabilityUrl, pageSize, oslcQueryParams, OSLCConstants.OSLC2_0); - } - - /** - * Create an OSLC query that uses OSLC query parameters and the given page size - * - * @param oslcClient the authenticated OSLC client - * @param capabilityUrl the URL that is the base - * @param pageSize the number of results to include on each page (OslcQueryResult) - * @param oslcQueryParams an OslcQueryParameters object (see {@link OslcQueryParameters}) - * @param version OSLC Version (see {@link OSLCConstants}) - */ - public OslcQuery(OslcClient oslcClient, String capabilityUrl, - int pageSize, OslcQueryParameters oslcQueryParams, String version) { - this.oslcClient = oslcClient; - this.capabilityUrl = capabilityUrl; - this.pageSize = (pageSize < 1) ? 0 : pageSize; - - //make a local copy of any query parameters - if (oslcQueryParams != null) - { - this.where = oslcQueryParams.getWhere(); - this.select = oslcQueryParams.getSelect(); - this.orderBy = oslcQueryParams.getOrderBy(); - this.searchTerms = oslcQueryParams.getSearchTerms(); - this.prefix = oslcQueryParams.getPrefix(); - this.configurationContext = oslcQueryParams.getConfigurationContext(); - } else { - this.where = this.select = this.orderBy = this.searchTerms = this.prefix = this.configurationContext = null; - } - this.queryResource = createQueryResource(this.getCapabilityUrl()); - this.queryUrl = this.getQueryUrl(); - - this.version = version; - } - - OslcQuery(OslcQueryResult previousResult) { - this(previousResult.getQuery(), previousResult.getNextPageUrl()); - } - - private OslcQuery(OslcQuery previousQuery, String nextPageUrl) { - this(previousQuery.oslcClient, previousQuery.capabilityUrl, previousQuery.pageSize); - this.queryUrl = nextPageUrl; - this.queryResource = createQueryResource(nextPageUrl); - } - - private WebTarget createQueryResource(final String capabilityUri) { - WebTarget resource = oslcClient.getWebResource(capabilityUri); - resource = applyPagination(resource); - resource = applyOslcQueryParams(resource); - return resource; - } - - private WebTarget applyPagination(WebTarget resource) { - WebTarget result = resource; - if (pageSize > 0) { - result = result.queryParam("oslc.paging", "true"); - result = result.queryParam("oslc.pageSize", pageSize); - } - return result; - } - - private WebTarget applyOslcQueryParams(WebTarget resource) { - WebTarget result = resource; - if (this.where != null && !this.where.isEmpty()) { - result = result.queryParam("oslc.where", this.where); - } - if (this.select != null && !this.select.isEmpty()) { - result = result.queryParam("oslc.select", this.select); - } - if (this.orderBy != null && !this.orderBy.isEmpty()) { - result = result.queryParam("oslc.orderBy", this.orderBy); - } - if (this.searchTerms != null && !this.searchTerms.isEmpty()) { - result = result.queryParam("oslc.searchTerms", this.searchTerms); - } - if (this.prefix != null && !this.prefix.isEmpty()) { - result = result.queryParam("oslc.prefix", this.prefix); - } - if (this.configurationContext != null && !this.configurationContext.isEmpty()) { - result = result.queryParam("oslc_config.context", this.configurationContext); - } - return result; - } - - /** - * @return the number of entries to return for each page, - * if zero, the remote system's (or full query's) default is used - */ - public int getPageSize() { - return pageSize; - } - - /** - * @return the base query capability URL - */ - public String getCapabilityUrl() { - return capabilityUrl; - } - - /** - * @return the complete query URL - */ - public String getQueryUrl() { - if (queryUrl == null) { - queryUrl = queryResource.getUriBuilder().build(new Object[0]).toString(); - } - return queryUrl; - } - - public OslcQueryResult submit() { - return new OslcQueryResult(this, getResponse()); - } - - Response getResponse() { - return queryResource.request(OSLCConstants.CT_RDF) - .header(OSLCConstants.OSLC_CORE_VERSION, version) - .get(); - } + private final OslcClient oslcClient; + private final String capabilityUrl; + + private String queryUrl; + + private final int pageSize; + + private WebTarget queryResource; + + // query parameters + private final String where; + private final String select; + private final String orderBy; + private final String searchTerms; + private final String prefix; + private final String version; + private final String configurationContext; + private final Map additionalHeaders; + + /** + * Create an OSLC query that uses the remote system's default page size. + * + * @param oslcClient the authenticated OSLC client + * @param capabilityUrl the URL that is the base + */ + public OslcQuery(final OslcClient oslcClient, final String capabilityUrl) { + this(oslcClient, capabilityUrl, 0); + } + + /** + * Create an OSLC query with query parameters that uses the default page size + * + * @param oslcClient the authenticated OSLC client + * @param capabilityUrl capabilityUrl the URL that is the base + * @param oslcQueryParams an OslcQueryParameters object + * @see OslcQueryParameters + */ + public OslcQuery(final OslcClient oslcClient, final String capabilityUrl, + final OslcQueryParameters oslcQueryParams) { + this(oslcClient, capabilityUrl, 0, oslcQueryParams); + } + + /** + * Create an OSLC query with query parameters that uses the default page size + * + * @param oslcClient the authenticated OSLC client + * @param capabilityUrl capabilityUrl the URL that is the base + * @param oslcQueryParams an OslcQueryParameters object + * @param additionalHeaders additional request headers sent with the query + * @see OslcQueryParameters + */ + public OslcQuery(final OslcClient oslcClient, final String capabilityUrl, final OslcQueryParameters oslcQueryParams, + final Map additionalHeaders) { + this(oslcClient, capabilityUrl, 0, oslcQueryParams, additionalHeaders); + } + + /** + * Create an OSLC query that uses the given page size + * + * @param oslcClient the authenticated OSLC client + * @param capabilityUrl the URL that is the base + * @param pageSize the number of results to include on each page (OslcQueryResult) + */ + public OslcQuery(final OslcClient oslcClient, final String capabilityUrl, final int pageSize) { + this(oslcClient, capabilityUrl, pageSize, null); + } + + /** + * Create an OSLC query that uses OSLC query parameters and the given page size + * + * @param oslcClient the authenticated OSLC client + * @param capabilityUrl the URL that is the base + * @param pageSize the number of results to include on each page (OslcQueryResult) + * @param oslcQueryParams an OslcQueryParameters object (see {@link OslcQueryParameters}) + */ + public OslcQuery(final OslcClient oslcClient, final String capabilityUrl, final int pageSize, + final OslcQueryParameters oslcQueryParams) { + this(oslcClient, capabilityUrl, pageSize, oslcQueryParams, OSLCConstants.OSLC2_0); + } + + /** + * Create an OSLC query that uses OSLC query parameters and the given page size + * + * @param oslcClient the authenticated OSLC client + * @param capabilityUrl the URL that is the base + * @param pageSize the number of results to include on each page (OslcQueryResult) + * @param oslcQueryParams an OslcQueryParameters object (see {@link OslcQueryParameters}) + * @param additionalHeaders additional request headers sent with the query + */ + public OslcQuery(final OslcClient oslcClient, final String capabilityUrl, final int pageSize, + final OslcQueryParameters oslcQueryParams, final Map additionalHeaders) { + this(oslcClient, capabilityUrl, pageSize, oslcQueryParams, OSLCConstants.OSLC2_0, additionalHeaders); + } + + /** + * Create an OSLC query that uses OSLC query parameters and the given page size + * + * @param oslcClient the authenticated OSLC client + * @param capabilityUrl the URL that is the base + * @param pageSize the number of results to include on each page (OslcQueryResult) + * @param oslcQueryParams an OslcQueryParameters object (see {@link OslcQueryParameters}) + * @param version OSLC Version (see {@link OSLCConstants}) + */ + public OslcQuery(final OslcClient oslcClient, final String capabilityUrl, final int pageSize, + final OslcQueryParameters oslcQueryParams, final String version) { + this(oslcClient, capabilityUrl, pageSize, oslcQueryParams, version, Collections.emptyMap()); + } + + /** + * Create an OSLC query that uses OSLC query parameters and the given page size + * + * @param oslcClient the authenticated OSLC client + * @param capabilityUrl the URL that is the base + * @param pageSize the number of results to include on each page (OslcQueryResult) + * @param oslcQueryParams an OslcQueryParameters object (see {@link OslcQueryParameters}) + * @param version OSLC Version (see {@link OSLCConstants}) + * @param additionalHeaders additional request headers sent with the query + */ + public OslcQuery(final OslcClient oslcClient, final String capabilityUrl, final int pageSize, + final OslcQueryParameters oslcQueryParams, final String version, + final Map additionalHeaders) { + this.oslcClient = oslcClient; + this.capabilityUrl = capabilityUrl; + this.pageSize = (pageSize < 1) ? 0 : pageSize; + + // make a local copy of any query parameters + if (oslcQueryParams != null) { + this.where = oslcQueryParams.getWhere(); + this.select = oslcQueryParams.getSelect(); + this.orderBy = oslcQueryParams.getOrderBy(); + this.searchTerms = oslcQueryParams.getSearchTerms(); + this.prefix = oslcQueryParams.getPrefix(); + this.configurationContext = oslcQueryParams.getConfigurationContext(); + } else { + this.where = this.select = this.orderBy = this.searchTerms = this.prefix = this.configurationContext = null; + } + this.queryResource = createQueryResource(this.getCapabilityUrl()); + this.queryUrl = this.getQueryUrl(); + + this.version = version; + this.additionalHeaders = additionalHeaders; + } + + OslcQuery(final OslcQueryResult previousResult) { + this(previousResult.getQuery(), previousResult.getNextPageUrl()); + } + + private OslcQuery(final OslcQuery previousQuery, final String nextPageUrl) { + this(previousQuery.oslcClient, previousQuery.capabilityUrl, previousQuery.pageSize); + this.queryUrl = nextPageUrl; + this.queryResource = createQueryResource(nextPageUrl); + } + + private WebTarget createQueryResource(final String capabilityUri) { + WebTarget resource = oslcClient.getWebResource(capabilityUri); + resource = applyPagination(resource); + resource = applyOslcQueryParams(resource); + return resource; + } + + private WebTarget applyPagination(final WebTarget resource) { + WebTarget result = resource; + if (pageSize > 0) { + result = result.queryParam("oslc.paging", "true"); + result = result.queryParam("oslc.pageSize", pageSize); + } + return result; + } + + private WebTarget applyOslcQueryParams(final WebTarget resource) { + WebTarget result = resource; + if (this.where != null && !this.where.isEmpty()) { + result = result.queryParam("oslc.where", this.where); + } + if (this.select != null && !this.select.isEmpty()) { + result = result.queryParam("oslc.select", this.select); + } + if (this.orderBy != null && !this.orderBy.isEmpty()) { + result = result.queryParam("oslc.orderBy", this.orderBy); + } + if (this.searchTerms != null && !this.searchTerms.isEmpty()) { + result = result.queryParam("oslc.searchTerms", this.searchTerms); + } + if (this.prefix != null && !this.prefix.isEmpty()) { + result = result.queryParam("oslc.prefix", this.prefix); + } + if (this.configurationContext != null && !this.configurationContext.isEmpty()) { + result = result.queryParam("oslc_config.context", this.configurationContext); + } + return result; + } + + /** + * @return the number of entries to return for each page, if zero, the remote system's (or full query's) default is + * used + */ + public int getPageSize() { + return pageSize; + } + + /** + * @return the base query capability URL + */ + public String getCapabilityUrl() { + return capabilityUrl; + } + + /** + * @return the complete query URL + */ + public String getQueryUrl() { + if (queryUrl == null) { + queryUrl = queryResource.getUriBuilder().build(new Object[0]).toString(); + } + return queryUrl; + } + + public OslcQueryResult submit() { + return new OslcQueryResult(this, getResponse()); + } + + Response getResponse() { + Builder builder = queryResource.request(OSLCConstants.CT_RDF).header(OSLCConstants.OSLC_CORE_VERSION, version); + if (additionalHeaders != null) { + additionalHeaders.entrySet().forEach(header -> builder.header(header.getKey(), header.getValue())); + } + return builder.get(); + } + + + Map getAdditionalHeaders() { + return additionalHeaders; + } } diff --git a/client/oslc-client/src/test/java/org/eclipse/lyo/client/query/OslcQueryTest.java b/client/oslc-client/src/test/java/org/eclipse/lyo/client/query/OslcQueryTest.java new file mode 100644 index 000000000..1e15637eb --- /dev/null +++ b/client/oslc-client/src/test/java/org/eclipse/lyo/client/query/OslcQueryTest.java @@ -0,0 +1,36 @@ +package org.eclipse.lyo.client.query; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.Collections; +import java.util.Map; + +import org.eclipse.lyo.client.OslcClient; +import org.junit.Test; + +public class OslcQueryTest { + + private static final String CAPABILITY_URL = "http://lyo.query.capability.url"; + OslcClient client = new OslcClient(); + + @Test + public void testConstructors_default() { + OslcQuery query = new OslcQuery(client, CAPABILITY_URL); + + assertEquals(CAPABILITY_URL, query.getCapabilityUrl()); + assertEquals(0, query.getPageSize()); + assertEquals(CAPABILITY_URL, query.getQueryUrl()); + assertEquals(Collections.emptyMap(), query.getAdditionalHeaders()); + } + + @Test + public void testConstructors_additionalHeaders() { + OslcQuery query = new OslcQuery(client, CAPABILITY_URL, null, Map.of("key", "value")); + + assertEquals(CAPABILITY_URL, query.getCapabilityUrl()); + assertEquals(0, query.getPageSize()); + assertEquals(CAPABILITY_URL, query.getQueryUrl()); + assertEquals(Map.of("key", "value"), query.getAdditionalHeaders()); + } + +} From 9fd5cbbdce224d5d429c054b2e6dd02603fe0650 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 21:20:05 +0200 Subject: [PATCH 073/126] chore: Bump commons-codec:commons-codec from 1.17.0 to 1.17.1 (#571) Bumps [commons-codec:commons-codec](https://github.com/apache/commons-codec) from 1.17.0 to 1.17.1. - [Changelog](https://github.com/apache/commons-codec/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-codec/compare/rel/commons-codec-1.17.0...rel/commons-codec-1.17.1) --- updated-dependencies: - dependency-name: commons-codec:commons-codec dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 80ac6bf19..7c63f87c0 100644 --- a/pom.xml +++ b/pom.xml @@ -388,7 +388,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 com.google.guava From c249cae04589a84b7b8d142de283d2b908872780 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 21:20:30 +0200 Subject: [PATCH 074/126] chore: Bump org.assertj:assertj-core from 3.25.3 to 3.26.3 (#565) Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c63f87c0..127d33cf5 100644 --- a/pom.xml +++ b/pom.xml @@ -380,7 +380,7 @@ org.assertj assertj-core - 3.25.3 + 3.26.3 From 34652db79c0817db83de64af9d1b7372157fcd24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 21:21:13 +0200 Subject: [PATCH 075/126] chore: Bump com.google.guava:guava from 33.2.0-jre to 33.2.1-jre (#550) Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.2.0-jre to 33.2.1-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 127d33cf5..fb33de94a 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.5.14 2.0.13 - 33.2.0-jre + 33.2.1-jre From ceb62e97d531bee7ab0269efba1e9b04d903304d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 21:21:36 +0200 Subject: [PATCH 076/126] chore: Bump com.fasterxml.jackson:jackson-bom from 2.17.1 to 2.17.2 (#564) Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.17.1 to 2.17.2. - [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.17.1...jackson-bom-2.17.2) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb33de94a..32d206242 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 3.1.0 4.8.0 - 2.17.1 + 2.17.2 4.5.14 2.0.13 From 5eff80b5b44be2232906e6e94ce14ff08a8f2d92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 21:21:53 +0200 Subject: [PATCH 077/126] chore: Bump org.junit:junit-bom from 5.10.2 to 5.10.3 (#562) Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.10.2 to 5.10.3. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.2...r5.10.3) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 32d206242..06d5d997e 100644 --- a/pom.xml +++ b/pom.xml @@ -373,7 +373,7 @@ org.junit junit-bom - 5.10.2 + 5.10.3 pom import From 77cfa2436d492d0519cfc88a9e8397811e8bd6f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 22:24:19 +0200 Subject: [PATCH 078/126] chore: Bump org.apache.maven.plugins:maven-javadoc-plugin (#574) Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.3 to 3.8.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.6.3...maven-javadoc-plugin-3.8.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 06d5d997e..2f40eebc8 100644 --- a/pom.xml +++ b/pom.xml @@ -451,7 +451,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.8.0 all,-accessibility,-html,-missing From 6d0d67118ffee636a50e171bd3c1d5ee888e5270 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 22:24:48 +0200 Subject: [PATCH 079/126] chore: Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0 (#573) Bumps org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2f40eebc8..497ae082b 100644 --- a/pom.xml +++ b/pom.xml @@ -353,7 +353,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.15.0 From bb1b03344e6c385b2ac21d94799aed025f10b7af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 22:25:44 +0200 Subject: [PATCH 080/126] chore: Bump io.github.classgraph:classgraph from 4.8.172 to 4.8.174 (#559) Bumps [io.github.classgraph:classgraph](https://github.com/classgraph/classgraph) from 4.8.172 to 4.8.174. - [Release notes](https://github.com/classgraph/classgraph/releases) - [Commits](https://github.com/classgraph/classgraph/compare/classgraph-4.8.172...classgraph-4.8.174) --- updated-dependencies: - dependency-name: io.github.classgraph:classgraph dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- core/oslc4j-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml index 7032cbeda..3b7d7b6e9 100644 --- a/core/oslc4j-core/pom.xml +++ b/core/oslc4j-core/pom.xml @@ -27,7 +27,7 @@ io.github.classgraph classgraph - 4.8.172 + 4.8.174 jakarta.ws.rs From a3d768075964d475f1a5802be0c2ccd9571b6420 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 22:26:33 +0200 Subject: [PATCH 081/126] chore: Bump org.apache.maven.plugins:maven-enforcer-plugin (#546) Bumps [org.apache.maven.plugins:maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.4.1...enforcer-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 497ae082b..137cee748 100644 --- a/pom.xml +++ b/pom.xml @@ -501,7 +501,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.4.1 + 3.5.0 enforce-maven From ef26167ee431cb26c295c983922cc19ee337a19c Mon Sep 17 00:00:00 2001 From: Jad El-khoury <121724599+Jad-el-khoury@users.noreply.github.com> Date: Mon, 2 Sep 2024 08:37:49 +0200 Subject: [PATCH 082/126] 6.0.0.Beta (#603) --- client/oslc-client-base/pom.xml | 4 ++-- client/oslc-client/pom.xml | 4 ++-- client/oslc-java-client-resources/pom.xml | 4 ++-- client/pom.xml | 4 ++-- core/lyo-core-model/pom.xml | 2 +- core/lyo-core-settings/pom.xml | 2 +- core/oslc-query/pom.xml | 2 +- core/oslc-trs/pom.xml | 2 +- core/oslc4j-core-build/pom.xml | 2 +- core/oslc4j-core-wink/pom.xml | 2 +- core/oslc4j-core/pom.xml | 2 +- core/oslc4j-jena-provider/pom.xml | 2 +- core/oslc4j-json4j-provider/pom.xml | 2 +- core/oslc4j-utils/pom.xml | 2 +- core/shacl/pom.xml | 2 +- domains/oslc-domains/pom.xml | 4 ++-- pom.xml | 2 +- server/net.oauth.core-oauth-consumer-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-provider-jakarta/pom.xml | 2 +- server/oauth-consumer-store/pom.xml | 2 +- server/oauth-core/pom.xml | 2 +- server/oauth-webapp/pom.xml | 2 +- server/oslc-ui-model/pom.xml | 2 +- server/pom.xml | 2 +- store/pom.xml | 4 ++-- store/store-core/pom.xml | 2 +- trs/client/client-source-mqtt/pom.xml | 2 +- trs/client/pom.xml | 2 +- trs/client/trs-client/pom.xml | 2 +- trs/server/pom.xml | 4 ++-- validation/pom.xml | 4 ++-- 33 files changed, 41 insertions(+), 41 deletions(-) diff --git a/client/oslc-client-base/pom.xml b/client/oslc-client-base/pom.xml index 8b3e20a3e..4830523e8 100644 --- a/client/oslc-client-base/pom.xml +++ b/client/oslc-client-base/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta oslc-client-base - 6.0.0-SNAPSHOT + 6.0.0.Beta Lyo :: Client :: Base diff --git a/client/oslc-client/pom.xml b/client/oslc-client/pom.xml index 306f50419..2f3c4f3fe 100644 --- a/client/oslc-client/pom.xml +++ b/client/oslc-client/pom.xml @@ -6,12 +6,12 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta ../pom.xml oslc-client - 6.0.0-SNAPSHOT + 6.0.0.Beta Lyo :: Client :: OSLC JAX-RS 2.0 (new) Eclipse Lyo OSLC Java client based on OSLC4J and JAX-RS 2.0 diff --git a/client/oslc-java-client-resources/pom.xml b/client/oslc-java-client-resources/pom.xml index 104065f1e..f519ab570 100644 --- a/client/oslc-java-client-resources/pom.xml +++ b/client/oslc-java-client-resources/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta oslc-java-client-resources - 6.0.0-SNAPSHOT + 6.0.0.Beta Lyo :: Client :: Resources (legacy) diff --git a/client/pom.xml b/client/pom.xml index c9e8fa16e..20b8a00c3 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,13 +6,13 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta pom Lyo :: Client :: _Parent org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta ../pom.xml diff --git a/core/lyo-core-model/pom.xml b/core/lyo-core-model/pom.xml index 6f95f3530..d05e890af 100644 --- a/core/lyo-core-model/pom.xml +++ b/core/lyo-core-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../oslc4j-core-build/pom.xml Lyo :: Core :: OSLC Core model diff --git a/core/lyo-core-settings/pom.xml b/core/lyo-core-settings/pom.xml index 034f79bd4..be5370cf3 100644 --- a/core/lyo-core-settings/pom.xml +++ b/core/lyo-core-settings/pom.xml @@ -5,7 +5,7 @@ oslc4j-core-build org.eclipse.lyo.oslc4j.core - 6.0.0-SNAPSHOT + 6.0.0.Beta ../oslc4j-core-build 4.0.0 diff --git a/core/oslc-query/pom.xml b/core/oslc-query/pom.xml index 333077d25..7a20db1ad 100644 --- a/core/oslc-query/pom.xml +++ b/core/oslc-query/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../oslc4j-core-build/pom.xml diff --git a/core/oslc-trs/pom.xml b/core/oslc-trs/pom.xml index efc9d0638..8c6c5a2a7 100644 --- a/core/oslc-trs/pom.xml +++ b/core/oslc-trs/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../oslc4j-core-build/pom.xml diff --git a/core/oslc4j-core-build/pom.xml b/core/oslc4j-core-build/pom.xml index 8741150dd..6375e0307 100644 --- a/core/oslc4j-core-build/pom.xml +++ b/core/oslc4j-core-build/pom.xml @@ -8,7 +8,7 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta ../../pom.xml diff --git a/core/oslc4j-core-wink/pom.xml b/core/oslc4j-core-wink/pom.xml index 089f25bcb..f41111e23 100644 --- a/core/oslc4j-core-wink/pom.xml +++ b/core/oslc4j-core-wink/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../oslc4j-core-build/pom.xml oslc4j-core-wink diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml index 3b7d7b6e9..b6defe954 100644 --- a/core/oslc4j-core/pom.xml +++ b/core/oslc4j-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../oslc4j-core-build/pom.xml oslc4j-core diff --git a/core/oslc4j-jena-provider/pom.xml b/core/oslc4j-jena-provider/pom.xml index 3451b0b53..c1d7bc765 100644 --- a/core/oslc4j-jena-provider/pom.xml +++ b/core/oslc4j-jena-provider/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../oslc4j-core-build/pom.xml oslc4j-jena-provider diff --git a/core/oslc4j-json4j-provider/pom.xml b/core/oslc4j-json4j-provider/pom.xml index c320598ff..134985587 100644 --- a/core/oslc4j-json4j-provider/pom.xml +++ b/core/oslc4j-json4j-provider/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../oslc4j-core-build/pom.xml oslc4j-json4j-provider diff --git a/core/oslc4j-utils/pom.xml b/core/oslc4j-utils/pom.xml index da9381a14..61770dc63 100644 --- a/core/oslc4j-utils/pom.xml +++ b/core/oslc4j-utils/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../oslc4j-core-build/pom.xml Lyo :: Core :: Utilities diff --git a/core/shacl/pom.xml b/core/shacl/pom.xml index 5f95257f7..206fc57f8 100644 --- a/core/shacl/pom.xml +++ b/core/shacl/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../oslc4j-core-build/pom.xml diff --git a/domains/oslc-domains/pom.xml b/domains/oslc-domains/pom.xml index 7a2468eda..d4ff3e1d5 100644 --- a/domains/oslc-domains/pom.xml +++ b/domains/oslc-domains/pom.xml @@ -10,14 +10,14 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta ../../pom.xml org.eclipse.lyo oslc-domains - 6.0.0-SNAPSHOT + 6.0.0.Beta jar Lyo :: Domains diff --git a/pom.xml b/pom.xml index 137cee748..4e8fa5e57 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta pom Lyo :: _Parent diff --git a/server/net.oauth.core-oauth-consumer-jakarta/pom.xml b/server/net.oauth.core-oauth-consumer-jakarta/pom.xml index 68dbd584a..df493c035 100644 --- a/server/net.oauth.core-oauth-consumer-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-consumer-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml b/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml index 3a30a1e58..5a2577b9c 100644 --- a/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-jakarta/pom.xml b/server/net.oauth.core-oauth-jakarta/pom.xml index e1620ae9a..43cb00c43 100644 --- a/server/net.oauth.core-oauth-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-provider-jakarta/pom.xml b/server/net.oauth.core-oauth-provider-jakarta/pom.xml index 5488d39d7..ebb47c02e 100644 --- a/server/net.oauth.core-oauth-provider-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-provider-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-consumer-store/pom.xml b/server/oauth-consumer-store/pom.xml index 2469934f8..294192330 100644 --- a/server/oauth-consumer-store/pom.xml +++ b/server/oauth-consumer-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-core/pom.xml b/server/oauth-core/pom.xml index 0ef21dbeb..5d7623e73 100644 --- a/server/oauth-core/pom.xml +++ b/server/oauth-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-webapp/pom.xml b/server/oauth-webapp/pom.xml index 548ede7c4..2285f25e3 100644 --- a/server/oauth-webapp/pom.xml +++ b/server/oauth-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../pom.xml org.eclipse.lyo.server diff --git a/server/oslc-ui-model/pom.xml b/server/oslc-ui-model/pom.xml index 005f0a519..4e7a4752d 100644 --- a/server/oslc-ui-model/pom.xml +++ b/server/oslc-ui-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Beta ../pom.xml org.eclipse.lyo.server diff --git a/server/pom.xml b/server/pom.xml index cfe2be6a4..dbd145383 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta ../pom.xml diff --git a/store/pom.xml b/store/pom.xml index 712de061e..5de46dcb7 100644 --- a/store/pom.xml +++ b/store/pom.xml @@ -6,14 +6,14 @@ org.eclipse.lyo.store store-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta pom Lyo :: Store :: _Parent org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml index 7bcfb705d..b91204835 100644 --- a/store/store-core/pom.xml +++ b/store/store-core/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lyo.store store-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta ../pom.xml diff --git a/trs/client/client-source-mqtt/pom.xml b/trs/client/client-source-mqtt/pom.xml index 189997752..af59b56fa 100644 --- a/trs/client/client-source-mqtt/pom.xml +++ b/trs/client/client-source-mqtt/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta ../pom.xml diff --git a/trs/client/pom.xml b/trs/client/pom.xml index 7ece1f8c2..1f4d2f2a6 100644 --- a/trs/client/pom.xml +++ b/trs/client/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta ../../pom.xml diff --git a/trs/client/trs-client/pom.xml b/trs/client/trs-client/pom.xml index 0514cb20e..313033583 100644 --- a/trs/client/trs-client/pom.xml +++ b/trs/client/trs-client/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta ../pom.xml diff --git a/trs/server/pom.xml b/trs/server/pom.xml index 33cb7f006..42661798d 100644 --- a/trs/server/pom.xml +++ b/trs/server/pom.xml @@ -20,13 +20,13 @@ 4.0.0 org.eclipse.lyo.trs trs-server - 6.0.0-SNAPSHOT + 6.0.0.Beta Lyo :: TRS :: Server org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta ../../pom.xml diff --git a/validation/pom.xml b/validation/pom.xml index a0ddb9500..5dc0f0005 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -3,13 +3,13 @@ 4.0.0 lyo-validation - 6.0.0-SNAPSHOT + 6.0.0.Beta Lyo :: Validation org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Beta ../pom.xml From 14a7d9e0c2d7fc7f0e6f7cecbcfd8053c1b6eb32 Mon Sep 17 00:00:00 2001 From: Jad El-khoury Date: Tue, 17 Sep 2024 21:18:40 +0200 Subject: [PATCH 083/126] Continue the SNAPSHOT development --- client/oslc-client-base/pom.xml | 4 ++-- client/oslc-client/pom.xml | 4 ++-- client/oslc-java-client-resources/pom.xml | 4 ++-- client/pom.xml | 4 ++-- core/lyo-core-model/pom.xml | 2 +- core/lyo-core-settings/pom.xml | 2 +- core/oslc-query/pom.xml | 2 +- core/oslc-trs/pom.xml | 2 +- core/oslc4j-core-build/pom.xml | 2 +- core/oslc4j-core-wink/pom.xml | 2 +- core/oslc4j-core/pom.xml | 2 +- core/oslc4j-jena-provider/pom.xml | 2 +- core/oslc4j-json4j-provider/pom.xml | 2 +- core/oslc4j-utils/pom.xml | 2 +- core/shacl/pom.xml | 2 +- domains/oslc-domains/pom.xml | 4 ++-- pom.xml | 2 +- server/net.oauth.core-oauth-consumer-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-provider-jakarta/pom.xml | 2 +- server/oauth-consumer-store/pom.xml | 2 +- server/oauth-core/pom.xml | 2 +- server/oauth-webapp/pom.xml | 2 +- server/oslc-ui-model/pom.xml | 2 +- server/pom.xml | 2 +- store/pom.xml | 4 ++-- store/store-core/pom.xml | 2 +- trs/client/client-source-mqtt/pom.xml | 2 +- trs/client/pom.xml | 2 +- trs/client/trs-client/pom.xml | 2 +- trs/server/pom.xml | 4 ++-- validation/pom.xml | 4 ++-- 33 files changed, 41 insertions(+), 41 deletions(-) diff --git a/client/oslc-client-base/pom.xml b/client/oslc-client-base/pom.xml index 4830523e8..8b3e20a3e 100644 --- a/client/oslc-client-base/pom.xml +++ b/client/oslc-client-base/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT oslc-client-base - 6.0.0.Beta + 6.0.0-SNAPSHOT Lyo :: Client :: Base diff --git a/client/oslc-client/pom.xml b/client/oslc-client/pom.xml index 2f3c4f3fe..306f50419 100644 --- a/client/oslc-client/pom.xml +++ b/client/oslc-client/pom.xml @@ -6,12 +6,12 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT ../pom.xml oslc-client - 6.0.0.Beta + 6.0.0-SNAPSHOT Lyo :: Client :: OSLC JAX-RS 2.0 (new) Eclipse Lyo OSLC Java client based on OSLC4J and JAX-RS 2.0 diff --git a/client/oslc-java-client-resources/pom.xml b/client/oslc-java-client-resources/pom.xml index f519ab570..104065f1e 100644 --- a/client/oslc-java-client-resources/pom.xml +++ b/client/oslc-java-client-resources/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT oslc-java-client-resources - 6.0.0.Beta + 6.0.0-SNAPSHOT Lyo :: Client :: Resources (legacy) diff --git a/client/pom.xml b/client/pom.xml index 20b8a00c3..c9e8fa16e 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,13 +6,13 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT pom Lyo :: Client :: _Parent org.eclipse.lyo lyo-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT ../pom.xml diff --git a/core/lyo-core-model/pom.xml b/core/lyo-core-model/pom.xml index d05e890af..6f95f3530 100644 --- a/core/lyo-core-model/pom.xml +++ b/core/lyo-core-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml Lyo :: Core :: OSLC Core model diff --git a/core/lyo-core-settings/pom.xml b/core/lyo-core-settings/pom.xml index be5370cf3..034f79bd4 100644 --- a/core/lyo-core-settings/pom.xml +++ b/core/lyo-core-settings/pom.xml @@ -5,7 +5,7 @@ oslc4j-core-build org.eclipse.lyo.oslc4j.core - 6.0.0.Beta + 6.0.0-SNAPSHOT ../oslc4j-core-build 4.0.0 diff --git a/core/oslc-query/pom.xml b/core/oslc-query/pom.xml index 7a20db1ad..333077d25 100644 --- a/core/oslc-query/pom.xml +++ b/core/oslc-query/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml diff --git a/core/oslc-trs/pom.xml b/core/oslc-trs/pom.xml index 8c6c5a2a7..efc9d0638 100644 --- a/core/oslc-trs/pom.xml +++ b/core/oslc-trs/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml diff --git a/core/oslc4j-core-build/pom.xml b/core/oslc4j-core-build/pom.xml index 6375e0307..8741150dd 100644 --- a/core/oslc4j-core-build/pom.xml +++ b/core/oslc4j-core-build/pom.xml @@ -8,7 +8,7 @@ org.eclipse.lyo lyo-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT ../../pom.xml diff --git a/core/oslc4j-core-wink/pom.xml b/core/oslc4j-core-wink/pom.xml index f41111e23..089f25bcb 100644 --- a/core/oslc4j-core-wink/pom.xml +++ b/core/oslc4j-core-wink/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-core-wink diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml index b6defe954..3b7d7b6e9 100644 --- a/core/oslc4j-core/pom.xml +++ b/core/oslc4j-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-core diff --git a/core/oslc4j-jena-provider/pom.xml b/core/oslc4j-jena-provider/pom.xml index c1d7bc765..3451b0b53 100644 --- a/core/oslc4j-jena-provider/pom.xml +++ b/core/oslc4j-jena-provider/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-jena-provider diff --git a/core/oslc4j-json4j-provider/pom.xml b/core/oslc4j-json4j-provider/pom.xml index 134985587..c320598ff 100644 --- a/core/oslc4j-json4j-provider/pom.xml +++ b/core/oslc4j-json4j-provider/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-json4j-provider diff --git a/core/oslc4j-utils/pom.xml b/core/oslc4j-utils/pom.xml index 61770dc63..da9381a14 100644 --- a/core/oslc4j-utils/pom.xml +++ b/core/oslc4j-utils/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml Lyo :: Core :: Utilities diff --git a/core/shacl/pom.xml b/core/shacl/pom.xml index 206fc57f8..5f95257f7 100644 --- a/core/shacl/pom.xml +++ b/core/shacl/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml diff --git a/domains/oslc-domains/pom.xml b/domains/oslc-domains/pom.xml index d4ff3e1d5..7a2468eda 100644 --- a/domains/oslc-domains/pom.xml +++ b/domains/oslc-domains/pom.xml @@ -10,14 +10,14 @@ org.eclipse.lyo lyo-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT ../../pom.xml org.eclipse.lyo oslc-domains - 6.0.0.Beta + 6.0.0-SNAPSHOT jar Lyo :: Domains diff --git a/pom.xml b/pom.xml index 4e8fa5e57..137cee748 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.eclipse.lyo lyo-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT pom Lyo :: _Parent diff --git a/server/net.oauth.core-oauth-consumer-jakarta/pom.xml b/server/net.oauth.core-oauth-consumer-jakarta/pom.xml index df493c035..68dbd584a 100644 --- a/server/net.oauth.core-oauth-consumer-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-consumer-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml b/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml index 5a2577b9c..3a30a1e58 100644 --- a/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-jakarta/pom.xml b/server/net.oauth.core-oauth-jakarta/pom.xml index 43cb00c43..e1620ae9a 100644 --- a/server/net.oauth.core-oauth-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-provider-jakarta/pom.xml b/server/net.oauth.core-oauth-provider-jakarta/pom.xml index ebb47c02e..5488d39d7 100644 --- a/server/net.oauth.core-oauth-provider-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-provider-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-consumer-store/pom.xml b/server/oauth-consumer-store/pom.xml index 294192330..2469934f8 100644 --- a/server/oauth-consumer-store/pom.xml +++ b/server/oauth-consumer-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-core/pom.xml b/server/oauth-core/pom.xml index 5d7623e73..0ef21dbeb 100644 --- a/server/oauth-core/pom.xml +++ b/server/oauth-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-webapp/pom.xml b/server/oauth-webapp/pom.xml index 2285f25e3..548ede7c4 100644 --- a/server/oauth-webapp/pom.xml +++ b/server/oauth-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oslc-ui-model/pom.xml b/server/oslc-ui-model/pom.xml index 4e7a4752d..005f0a519 100644 --- a/server/oslc-ui-model/pom.xml +++ b/server/oslc-ui-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Beta + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/pom.xml b/server/pom.xml index dbd145383..cfe2be6a4 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT ../pom.xml diff --git a/store/pom.xml b/store/pom.xml index 5de46dcb7..712de061e 100644 --- a/store/pom.xml +++ b/store/pom.xml @@ -6,14 +6,14 @@ org.eclipse.lyo.store store-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT pom Lyo :: Store :: _Parent org.eclipse.lyo lyo-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml index b91204835..7bcfb705d 100644 --- a/store/store-core/pom.xml +++ b/store/store-core/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lyo.store store-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT ../pom.xml diff --git a/trs/client/client-source-mqtt/pom.xml b/trs/client/client-source-mqtt/pom.xml index af59b56fa..189997752 100644 --- a/trs/client/client-source-mqtt/pom.xml +++ b/trs/client/client-source-mqtt/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT ../pom.xml diff --git a/trs/client/pom.xml b/trs/client/pom.xml index 1f4d2f2a6..7ece1f8c2 100644 --- a/trs/client/pom.xml +++ b/trs/client/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT ../../pom.xml diff --git a/trs/client/trs-client/pom.xml b/trs/client/trs-client/pom.xml index 313033583..0514cb20e 100644 --- a/trs/client/trs-client/pom.xml +++ b/trs/client/trs-client/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT ../pom.xml diff --git a/trs/server/pom.xml b/trs/server/pom.xml index 42661798d..33cb7f006 100644 --- a/trs/server/pom.xml +++ b/trs/server/pom.xml @@ -20,13 +20,13 @@ 4.0.0 org.eclipse.lyo.trs trs-server - 6.0.0.Beta + 6.0.0-SNAPSHOT Lyo :: TRS :: Server org.eclipse.lyo lyo-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT ../../pom.xml diff --git a/validation/pom.xml b/validation/pom.xml index 5dc0f0005..a0ddb9500 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -3,13 +3,13 @@ 4.0.0 lyo-validation - 6.0.0.Beta + 6.0.0-SNAPSHOT Lyo :: Validation org.eclipse.lyo lyo-parent - 6.0.0.Beta + 6.0.0-SNAPSHOT ../pom.xml From 27b148b9e34d46159b9c01b99fc1a04b36a4232a Mon Sep 17 00:00:00 2001 From: Jad El-khoury <121724599+Jad-el-khoury@users.noreply.github.com> Date: Tue, 17 Sep 2024 21:21:58 +0200 Subject: [PATCH 084/126] adding java folder to be able to create source jar files. (#604) --- server/net.oauth.core-oauth-consumer-jakarta/pom.xml | 4 ++++ .../src/main/java/readme.md | 2 ++ server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml | 4 ++++ .../src/main/java/readme.md | 2 ++ server/net.oauth.core-oauth-jakarta/pom.xml | 4 ++++ server/net.oauth.core-oauth-jakarta/src/main/java/readme.md | 2 ++ server/net.oauth.core-oauth-provider-jakarta/pom.xml | 4 ++++ .../src/main/java/readme.md | 2 ++ 8 files changed, 24 insertions(+) create mode 100644 server/net.oauth.core-oauth-consumer-jakarta/src/main/java/readme.md create mode 100644 server/net.oauth.core-oauth-httpclient4-jakarta/src/main/java/readme.md create mode 100644 server/net.oauth.core-oauth-jakarta/src/main/java/readme.md create mode 100644 server/net.oauth.core-oauth-provider-jakarta/src/main/java/readme.md diff --git a/server/net.oauth.core-oauth-consumer-jakarta/pom.xml b/server/net.oauth.core-oauth-consumer-jakarta/pom.xml index 68dbd584a..5d7b0bac1 100644 --- a/server/net.oauth.core-oauth-consumer-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-consumer-jakarta/pom.xml @@ -18,6 +18,10 @@ + + org.apache.maven.plugins + maven-source-plugin + org.eclipse.transformer transformer-maven-plugin diff --git a/server/net.oauth.core-oauth-consumer-jakarta/src/main/java/readme.md b/server/net.oauth.core-oauth-consumer-jakarta/src/main/java/readme.md new file mode 100644 index 000000000..81c49c44a --- /dev/null +++ b/server/net.oauth.core-oauth-consumer-jakarta/src/main/java/readme.md @@ -0,0 +1,2 @@ +Need to have the src/main/java folder in order to produce a source.jar file. +This in turn is needed to be able to publish to Maven Central. diff --git a/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml b/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml index 3a30a1e58..4b94094cd 100644 --- a/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml @@ -24,6 +24,10 @@ + + org.apache.maven.plugins + maven-source-plugin + org.eclipse.transformer transformer-maven-plugin diff --git a/server/net.oauth.core-oauth-httpclient4-jakarta/src/main/java/readme.md b/server/net.oauth.core-oauth-httpclient4-jakarta/src/main/java/readme.md new file mode 100644 index 000000000..81c49c44a --- /dev/null +++ b/server/net.oauth.core-oauth-httpclient4-jakarta/src/main/java/readme.md @@ -0,0 +1,2 @@ +Need to have the src/main/java folder in order to produce a source.jar file. +This in turn is needed to be able to publish to Maven Central. diff --git a/server/net.oauth.core-oauth-jakarta/pom.xml b/server/net.oauth.core-oauth-jakarta/pom.xml index e1620ae9a..af79404d8 100644 --- a/server/net.oauth.core-oauth-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-jakarta/pom.xml @@ -18,6 +18,10 @@ + + org.apache.maven.plugins + maven-source-plugin + org.eclipse.transformer transformer-maven-plugin diff --git a/server/net.oauth.core-oauth-jakarta/src/main/java/readme.md b/server/net.oauth.core-oauth-jakarta/src/main/java/readme.md new file mode 100644 index 000000000..81c49c44a --- /dev/null +++ b/server/net.oauth.core-oauth-jakarta/src/main/java/readme.md @@ -0,0 +1,2 @@ +Need to have the src/main/java folder in order to produce a source.jar file. +This in turn is needed to be able to publish to Maven Central. diff --git a/server/net.oauth.core-oauth-provider-jakarta/pom.xml b/server/net.oauth.core-oauth-provider-jakarta/pom.xml index 5488d39d7..76bdd86af 100644 --- a/server/net.oauth.core-oauth-provider-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-provider-jakarta/pom.xml @@ -18,6 +18,10 @@ + + org.apache.maven.plugins + maven-source-plugin + org.eclipse.transformer transformer-maven-plugin diff --git a/server/net.oauth.core-oauth-provider-jakarta/src/main/java/readme.md b/server/net.oauth.core-oauth-provider-jakarta/src/main/java/readme.md new file mode 100644 index 000000000..81c49c44a --- /dev/null +++ b/server/net.oauth.core-oauth-provider-jakarta/src/main/java/readme.md @@ -0,0 +1,2 @@ +Need to have the src/main/java folder in order to produce a source.jar file. +This in turn is needed to be able to publish to Maven Central. From d37225c462f2c85225ec21e3694dcb8705d0ddfb Mon Sep 17 00:00:00 2001 From: Jad El-khoury <121724599+Jad-el-khoury@users.noreply.github.com> Date: Tue, 17 Sep 2024 22:23:51 +0200 Subject: [PATCH 085/126] 6.0.0.CR (#609) --- client/oslc-client-base/pom.xml | 4 ++-- client/oslc-client/pom.xml | 4 ++-- client/oslc-java-client-resources/pom.xml | 4 ++-- client/pom.xml | 4 ++-- core/lyo-core-model/pom.xml | 2 +- core/lyo-core-settings/pom.xml | 2 +- core/oslc-query/pom.xml | 2 +- core/oslc-trs/pom.xml | 2 +- core/oslc4j-core-build/pom.xml | 2 +- core/oslc4j-core-wink/pom.xml | 2 +- core/oslc4j-core/pom.xml | 2 +- core/oslc4j-jena-provider/pom.xml | 2 +- core/oslc4j-json4j-provider/pom.xml | 2 +- core/oslc4j-utils/pom.xml | 2 +- core/shacl/pom.xml | 2 +- domains/oslc-domains/pom.xml | 4 ++-- pom.xml | 2 +- server/net.oauth.core-oauth-consumer-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-provider-jakarta/pom.xml | 2 +- server/oauth-consumer-store/pom.xml | 2 +- server/oauth-core/pom.xml | 2 +- server/oauth-webapp/pom.xml | 2 +- server/oslc-ui-model/pom.xml | 2 +- server/pom.xml | 2 +- store/pom.xml | 4 ++-- store/store-core/pom.xml | 2 +- trs/client/client-source-mqtt/pom.xml | 2 +- trs/client/pom.xml | 2 +- trs/client/trs-client/pom.xml | 2 +- trs/server/pom.xml | 4 ++-- validation/pom.xml | 4 ++-- 33 files changed, 41 insertions(+), 41 deletions(-) diff --git a/client/oslc-client-base/pom.xml b/client/oslc-client-base/pom.xml index 8b3e20a3e..6a1b7abc6 100644 --- a/client/oslc-client-base/pom.xml +++ b/client/oslc-client-base/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.CR oslc-client-base - 6.0.0-SNAPSHOT + 6.0.0.CR Lyo :: Client :: Base diff --git a/client/oslc-client/pom.xml b/client/oslc-client/pom.xml index 306f50419..64c5af010 100644 --- a/client/oslc-client/pom.xml +++ b/client/oslc-client/pom.xml @@ -6,12 +6,12 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.CR ../pom.xml oslc-client - 6.0.0-SNAPSHOT + 6.0.0.CR Lyo :: Client :: OSLC JAX-RS 2.0 (new) Eclipse Lyo OSLC Java client based on OSLC4J and JAX-RS 2.0 diff --git a/client/oslc-java-client-resources/pom.xml b/client/oslc-java-client-resources/pom.xml index 104065f1e..670655a06 100644 --- a/client/oslc-java-client-resources/pom.xml +++ b/client/oslc-java-client-resources/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.CR oslc-java-client-resources - 6.0.0-SNAPSHOT + 6.0.0.CR Lyo :: Client :: Resources (legacy) diff --git a/client/pom.xml b/client/pom.xml index c9e8fa16e..620713434 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,13 +6,13 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.CR pom Lyo :: Client :: _Parent org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.CR ../pom.xml diff --git a/core/lyo-core-model/pom.xml b/core/lyo-core-model/pom.xml index 6f95f3530..9285e813f 100644 --- a/core/lyo-core-model/pom.xml +++ b/core/lyo-core-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../oslc4j-core-build/pom.xml Lyo :: Core :: OSLC Core model diff --git a/core/lyo-core-settings/pom.xml b/core/lyo-core-settings/pom.xml index 034f79bd4..b0ec37452 100644 --- a/core/lyo-core-settings/pom.xml +++ b/core/lyo-core-settings/pom.xml @@ -5,7 +5,7 @@ oslc4j-core-build org.eclipse.lyo.oslc4j.core - 6.0.0-SNAPSHOT + 6.0.0.CR ../oslc4j-core-build 4.0.0 diff --git a/core/oslc-query/pom.xml b/core/oslc-query/pom.xml index 333077d25..dd672da65 100644 --- a/core/oslc-query/pom.xml +++ b/core/oslc-query/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../oslc4j-core-build/pom.xml diff --git a/core/oslc-trs/pom.xml b/core/oslc-trs/pom.xml index efc9d0638..35bd6fbf2 100644 --- a/core/oslc-trs/pom.xml +++ b/core/oslc-trs/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../oslc4j-core-build/pom.xml diff --git a/core/oslc4j-core-build/pom.xml b/core/oslc4j-core-build/pom.xml index 8741150dd..cc23c8d4b 100644 --- a/core/oslc4j-core-build/pom.xml +++ b/core/oslc4j-core-build/pom.xml @@ -8,7 +8,7 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.CR ../../pom.xml diff --git a/core/oslc4j-core-wink/pom.xml b/core/oslc4j-core-wink/pom.xml index 089f25bcb..2a16b61cf 100644 --- a/core/oslc4j-core-wink/pom.xml +++ b/core/oslc4j-core-wink/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../oslc4j-core-build/pom.xml oslc4j-core-wink diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml index 3b7d7b6e9..5182d34e4 100644 --- a/core/oslc4j-core/pom.xml +++ b/core/oslc4j-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../oslc4j-core-build/pom.xml oslc4j-core diff --git a/core/oslc4j-jena-provider/pom.xml b/core/oslc4j-jena-provider/pom.xml index 3451b0b53..b54d1b374 100644 --- a/core/oslc4j-jena-provider/pom.xml +++ b/core/oslc4j-jena-provider/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../oslc4j-core-build/pom.xml oslc4j-jena-provider diff --git a/core/oslc4j-json4j-provider/pom.xml b/core/oslc4j-json4j-provider/pom.xml index c320598ff..5e0f620be 100644 --- a/core/oslc4j-json4j-provider/pom.xml +++ b/core/oslc4j-json4j-provider/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../oslc4j-core-build/pom.xml oslc4j-json4j-provider diff --git a/core/oslc4j-utils/pom.xml b/core/oslc4j-utils/pom.xml index da9381a14..45c5c7a43 100644 --- a/core/oslc4j-utils/pom.xml +++ b/core/oslc4j-utils/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../oslc4j-core-build/pom.xml Lyo :: Core :: Utilities diff --git a/core/shacl/pom.xml b/core/shacl/pom.xml index 5f95257f7..a6626ad36 100644 --- a/core/shacl/pom.xml +++ b/core/shacl/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../oslc4j-core-build/pom.xml diff --git a/domains/oslc-domains/pom.xml b/domains/oslc-domains/pom.xml index 7a2468eda..c3e5fdfd6 100644 --- a/domains/oslc-domains/pom.xml +++ b/domains/oslc-domains/pom.xml @@ -10,14 +10,14 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.CR ../../pom.xml org.eclipse.lyo oslc-domains - 6.0.0-SNAPSHOT + 6.0.0.CR jar Lyo :: Domains diff --git a/pom.xml b/pom.xml index 137cee748..ccf333fa7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.CR pom Lyo :: _Parent diff --git a/server/net.oauth.core-oauth-consumer-jakarta/pom.xml b/server/net.oauth.core-oauth-consumer-jakarta/pom.xml index 5d7b0bac1..46bcde334 100644 --- a/server/net.oauth.core-oauth-consumer-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-consumer-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml b/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml index 4b94094cd..c4cb4bf6a 100644 --- a/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-jakarta/pom.xml b/server/net.oauth.core-oauth-jakarta/pom.xml index af79404d8..5f8f1fb7b 100644 --- a/server/net.oauth.core-oauth-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-provider-jakarta/pom.xml b/server/net.oauth.core-oauth-provider-jakarta/pom.xml index 76bdd86af..86d7241c3 100644 --- a/server/net.oauth.core-oauth-provider-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-provider-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-consumer-store/pom.xml b/server/oauth-consumer-store/pom.xml index 2469934f8..31f6af1ed 100644 --- a/server/oauth-consumer-store/pom.xml +++ b/server/oauth-consumer-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-core/pom.xml b/server/oauth-core/pom.xml index 0ef21dbeb..ba23939df 100644 --- a/server/oauth-core/pom.xml +++ b/server/oauth-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-webapp/pom.xml b/server/oauth-webapp/pom.xml index 548ede7c4..5a5973159 100644 --- a/server/oauth-webapp/pom.xml +++ b/server/oauth-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../pom.xml org.eclipse.lyo.server diff --git a/server/oslc-ui-model/pom.xml b/server/oslc-ui-model/pom.xml index 005f0a519..aae0d280e 100644 --- a/server/oslc-ui-model/pom.xml +++ b/server/oslc-ui-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.CR ../pom.xml org.eclipse.lyo.server diff --git a/server/pom.xml b/server/pom.xml index cfe2be6a4..5d4dd9f3d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.CR ../pom.xml diff --git a/store/pom.xml b/store/pom.xml index 712de061e..a176a5014 100644 --- a/store/pom.xml +++ b/store/pom.xml @@ -6,14 +6,14 @@ org.eclipse.lyo.store store-parent - 6.0.0-SNAPSHOT + 6.0.0.CR pom Lyo :: Store :: _Parent org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.CR diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml index 7bcfb705d..8508e7a2d 100644 --- a/store/store-core/pom.xml +++ b/store/store-core/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lyo.store store-parent - 6.0.0-SNAPSHOT + 6.0.0.CR ../pom.xml diff --git a/trs/client/client-source-mqtt/pom.xml b/trs/client/client-source-mqtt/pom.xml index 189997752..3ba0f53a9 100644 --- a/trs/client/client-source-mqtt/pom.xml +++ b/trs/client/client-source-mqtt/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0-SNAPSHOT + 6.0.0.CR ../pom.xml diff --git a/trs/client/pom.xml b/trs/client/pom.xml index 7ece1f8c2..99ac4c822 100644 --- a/trs/client/pom.xml +++ b/trs/client/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.CR ../../pom.xml diff --git a/trs/client/trs-client/pom.xml b/trs/client/trs-client/pom.xml index 0514cb20e..432e0ab1d 100644 --- a/trs/client/trs-client/pom.xml +++ b/trs/client/trs-client/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0-SNAPSHOT + 6.0.0.CR ../pom.xml diff --git a/trs/server/pom.xml b/trs/server/pom.xml index 33cb7f006..41de32846 100644 --- a/trs/server/pom.xml +++ b/trs/server/pom.xml @@ -20,13 +20,13 @@ 4.0.0 org.eclipse.lyo.trs trs-server - 6.0.0-SNAPSHOT + 6.0.0.CR Lyo :: TRS :: Server org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.CR ../../pom.xml diff --git a/validation/pom.xml b/validation/pom.xml index a0ddb9500..2cc8b7b4b 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -3,13 +3,13 @@ 4.0.0 lyo-validation - 6.0.0-SNAPSHOT + 6.0.0.CR Lyo :: Validation org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.CR ../pom.xml From e92695f6e996f79f14f73d439892a5726e75a554 Mon Sep 17 00:00:00 2001 From: Jad El-khoury Date: Tue, 17 Sep 2024 23:00:10 +0200 Subject: [PATCH 086/126] Continue the SNAPSHOT development --- client/oslc-client-base/pom.xml | 4 ++-- client/oslc-client/pom.xml | 4 ++-- client/oslc-java-client-resources/pom.xml | 4 ++-- client/pom.xml | 4 ++-- core/lyo-core-model/pom.xml | 2 +- core/lyo-core-settings/pom.xml | 2 +- core/oslc-query/pom.xml | 2 +- core/oslc-trs/pom.xml | 2 +- core/oslc4j-core-build/pom.xml | 2 +- core/oslc4j-core-wink/pom.xml | 2 +- core/oslc4j-core/pom.xml | 2 +- core/oslc4j-jena-provider/pom.xml | 2 +- core/oslc4j-json4j-provider/pom.xml | 2 +- core/oslc4j-utils/pom.xml | 2 +- core/shacl/pom.xml | 2 +- domains/oslc-domains/pom.xml | 4 ++-- pom.xml | 2 +- server/net.oauth.core-oauth-consumer-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-provider-jakarta/pom.xml | 2 +- server/oauth-consumer-store/pom.xml | 2 +- server/oauth-core/pom.xml | 2 +- server/oauth-webapp/pom.xml | 2 +- server/oslc-ui-model/pom.xml | 2 +- server/pom.xml | 2 +- store/pom.xml | 4 ++-- store/store-core/pom.xml | 2 +- trs/client/client-source-mqtt/pom.xml | 2 +- trs/client/pom.xml | 2 +- trs/client/trs-client/pom.xml | 2 +- trs/server/pom.xml | 4 ++-- validation/pom.xml | 4 ++-- 33 files changed, 41 insertions(+), 41 deletions(-) diff --git a/client/oslc-client-base/pom.xml b/client/oslc-client-base/pom.xml index 6a1b7abc6..8b3e20a3e 100644 --- a/client/oslc-client-base/pom.xml +++ b/client/oslc-client-base/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.CR + 6.0.0-SNAPSHOT oslc-client-base - 6.0.0.CR + 6.0.0-SNAPSHOT Lyo :: Client :: Base diff --git a/client/oslc-client/pom.xml b/client/oslc-client/pom.xml index 64c5af010..306f50419 100644 --- a/client/oslc-client/pom.xml +++ b/client/oslc-client/pom.xml @@ -6,12 +6,12 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.CR + 6.0.0-SNAPSHOT ../pom.xml oslc-client - 6.0.0.CR + 6.0.0-SNAPSHOT Lyo :: Client :: OSLC JAX-RS 2.0 (new) Eclipse Lyo OSLC Java client based on OSLC4J and JAX-RS 2.0 diff --git a/client/oslc-java-client-resources/pom.xml b/client/oslc-java-client-resources/pom.xml index 670655a06..104065f1e 100644 --- a/client/oslc-java-client-resources/pom.xml +++ b/client/oslc-java-client-resources/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.CR + 6.0.0-SNAPSHOT oslc-java-client-resources - 6.0.0.CR + 6.0.0-SNAPSHOT Lyo :: Client :: Resources (legacy) diff --git a/client/pom.xml b/client/pom.xml index 620713434..c9e8fa16e 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,13 +6,13 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.CR + 6.0.0-SNAPSHOT pom Lyo :: Client :: _Parent org.eclipse.lyo lyo-parent - 6.0.0.CR + 6.0.0-SNAPSHOT ../pom.xml diff --git a/core/lyo-core-model/pom.xml b/core/lyo-core-model/pom.xml index 9285e813f..6f95f3530 100644 --- a/core/lyo-core-model/pom.xml +++ b/core/lyo-core-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml Lyo :: Core :: OSLC Core model diff --git a/core/lyo-core-settings/pom.xml b/core/lyo-core-settings/pom.xml index b0ec37452..034f79bd4 100644 --- a/core/lyo-core-settings/pom.xml +++ b/core/lyo-core-settings/pom.xml @@ -5,7 +5,7 @@ oslc4j-core-build org.eclipse.lyo.oslc4j.core - 6.0.0.CR + 6.0.0-SNAPSHOT ../oslc4j-core-build 4.0.0 diff --git a/core/oslc-query/pom.xml b/core/oslc-query/pom.xml index dd672da65..333077d25 100644 --- a/core/oslc-query/pom.xml +++ b/core/oslc-query/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml diff --git a/core/oslc-trs/pom.xml b/core/oslc-trs/pom.xml index 35bd6fbf2..efc9d0638 100644 --- a/core/oslc-trs/pom.xml +++ b/core/oslc-trs/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml diff --git a/core/oslc4j-core-build/pom.xml b/core/oslc4j-core-build/pom.xml index cc23c8d4b..8741150dd 100644 --- a/core/oslc4j-core-build/pom.xml +++ b/core/oslc4j-core-build/pom.xml @@ -8,7 +8,7 @@ org.eclipse.lyo lyo-parent - 6.0.0.CR + 6.0.0-SNAPSHOT ../../pom.xml diff --git a/core/oslc4j-core-wink/pom.xml b/core/oslc4j-core-wink/pom.xml index 2a16b61cf..089f25bcb 100644 --- a/core/oslc4j-core-wink/pom.xml +++ b/core/oslc4j-core-wink/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-core-wink diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml index 5182d34e4..3b7d7b6e9 100644 --- a/core/oslc4j-core/pom.xml +++ b/core/oslc4j-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-core diff --git a/core/oslc4j-jena-provider/pom.xml b/core/oslc4j-jena-provider/pom.xml index b54d1b374..3451b0b53 100644 --- a/core/oslc4j-jena-provider/pom.xml +++ b/core/oslc4j-jena-provider/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-jena-provider diff --git a/core/oslc4j-json4j-provider/pom.xml b/core/oslc4j-json4j-provider/pom.xml index 5e0f620be..c320598ff 100644 --- a/core/oslc4j-json4j-provider/pom.xml +++ b/core/oslc4j-json4j-provider/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-json4j-provider diff --git a/core/oslc4j-utils/pom.xml b/core/oslc4j-utils/pom.xml index 45c5c7a43..da9381a14 100644 --- a/core/oslc4j-utils/pom.xml +++ b/core/oslc4j-utils/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml Lyo :: Core :: Utilities diff --git a/core/shacl/pom.xml b/core/shacl/pom.xml index a6626ad36..5f95257f7 100644 --- a/core/shacl/pom.xml +++ b/core/shacl/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml diff --git a/domains/oslc-domains/pom.xml b/domains/oslc-domains/pom.xml index c3e5fdfd6..7a2468eda 100644 --- a/domains/oslc-domains/pom.xml +++ b/domains/oslc-domains/pom.xml @@ -10,14 +10,14 @@ org.eclipse.lyo lyo-parent - 6.0.0.CR + 6.0.0-SNAPSHOT ../../pom.xml org.eclipse.lyo oslc-domains - 6.0.0.CR + 6.0.0-SNAPSHOT jar Lyo :: Domains diff --git a/pom.xml b/pom.xml index ccf333fa7..137cee748 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.eclipse.lyo lyo-parent - 6.0.0.CR + 6.0.0-SNAPSHOT pom Lyo :: _Parent diff --git a/server/net.oauth.core-oauth-consumer-jakarta/pom.xml b/server/net.oauth.core-oauth-consumer-jakarta/pom.xml index 46bcde334..5d7b0bac1 100644 --- a/server/net.oauth.core-oauth-consumer-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-consumer-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml b/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml index c4cb4bf6a..4b94094cd 100644 --- a/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-jakarta/pom.xml b/server/net.oauth.core-oauth-jakarta/pom.xml index 5f8f1fb7b..af79404d8 100644 --- a/server/net.oauth.core-oauth-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-provider-jakarta/pom.xml b/server/net.oauth.core-oauth-provider-jakarta/pom.xml index 86d7241c3..76bdd86af 100644 --- a/server/net.oauth.core-oauth-provider-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-provider-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-consumer-store/pom.xml b/server/oauth-consumer-store/pom.xml index 31f6af1ed..2469934f8 100644 --- a/server/oauth-consumer-store/pom.xml +++ b/server/oauth-consumer-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-core/pom.xml b/server/oauth-core/pom.xml index ba23939df..0ef21dbeb 100644 --- a/server/oauth-core/pom.xml +++ b/server/oauth-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-webapp/pom.xml b/server/oauth-webapp/pom.xml index 5a5973159..548ede7c4 100644 --- a/server/oauth-webapp/pom.xml +++ b/server/oauth-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oslc-ui-model/pom.xml b/server/oslc-ui-model/pom.xml index aae0d280e..005f0a519 100644 --- a/server/oslc-ui-model/pom.xml +++ b/server/oslc-ui-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.CR + 6.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/pom.xml b/server/pom.xml index 5d4dd9f3d..cfe2be6a4 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0.CR + 6.0.0-SNAPSHOT ../pom.xml diff --git a/store/pom.xml b/store/pom.xml index a176a5014..712de061e 100644 --- a/store/pom.xml +++ b/store/pom.xml @@ -6,14 +6,14 @@ org.eclipse.lyo.store store-parent - 6.0.0.CR + 6.0.0-SNAPSHOT pom Lyo :: Store :: _Parent org.eclipse.lyo lyo-parent - 6.0.0.CR + 6.0.0-SNAPSHOT diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml index 8508e7a2d..7bcfb705d 100644 --- a/store/store-core/pom.xml +++ b/store/store-core/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lyo.store store-parent - 6.0.0.CR + 6.0.0-SNAPSHOT ../pom.xml diff --git a/trs/client/client-source-mqtt/pom.xml b/trs/client/client-source-mqtt/pom.xml index 3ba0f53a9..189997752 100644 --- a/trs/client/client-source-mqtt/pom.xml +++ b/trs/client/client-source-mqtt/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0.CR + 6.0.0-SNAPSHOT ../pom.xml diff --git a/trs/client/pom.xml b/trs/client/pom.xml index 99ac4c822..7ece1f8c2 100644 --- a/trs/client/pom.xml +++ b/trs/client/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0.CR + 6.0.0-SNAPSHOT ../../pom.xml diff --git a/trs/client/trs-client/pom.xml b/trs/client/trs-client/pom.xml index 432e0ab1d..0514cb20e 100644 --- a/trs/client/trs-client/pom.xml +++ b/trs/client/trs-client/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0.CR + 6.0.0-SNAPSHOT ../pom.xml diff --git a/trs/server/pom.xml b/trs/server/pom.xml index 41de32846..33cb7f006 100644 --- a/trs/server/pom.xml +++ b/trs/server/pom.xml @@ -20,13 +20,13 @@ 4.0.0 org.eclipse.lyo.trs trs-server - 6.0.0.CR + 6.0.0-SNAPSHOT Lyo :: TRS :: Server org.eclipse.lyo lyo-parent - 6.0.0.CR + 6.0.0-SNAPSHOT ../../pom.xml diff --git a/validation/pom.xml b/validation/pom.xml index 2cc8b7b4b..a0ddb9500 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -3,13 +3,13 @@ 4.0.0 lyo-validation - 6.0.0.CR + 6.0.0-SNAPSHOT Lyo :: Validation org.eclipse.lyo lyo-parent - 6.0.0.CR + 6.0.0-SNAPSHOT ../pom.xml From 1f2e784ed5594ff6ee276eb71dc456ab973ba548 Mon Sep 17 00:00:00 2001 From: Jad El-khoury <121724599+Jad-el-khoury@users.noreply.github.com> Date: Fri, 20 Sep 2024 09:38:18 +0200 Subject: [PATCH 087/126] sbom (#611) --- pom.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pom.xml b/pom.xml index 137cee748..ee872167d 100644 --- a/pom.xml +++ b/pom.xml @@ -639,6 +639,23 @@ org.apache.maven.plugins maven-install-plugin + + org.cyclonedx + cyclonedx-maven-plugin + 2.7.9 + + 1.4 + library + + + + package + + makeAggregateBom + + + + From 46daf14c3d0502ac97b1b8bf0c8ffa07739ff315 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sat, 21 Sep 2024 15:38:14 +0200 Subject: [PATCH 088/126] update changelog --- CHANGELOG.md | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c9480028..daec5ce4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,30 +2,46 @@ ## [6.0.0-SNAPSHOT] +### Security + +This release does not contain security updates. + ### Added -- Introducing capability to set the servletUri to be used by the OAuthConfiguration +- Introducing capability to set the `servletUri` to be used by the `OAuthConfiguration` - OSLC PROMCODE domain model and generated POJOs -- Support for additional request headers to OslcQuery +- Support for additional request headers to `OslcQuery` ### Changed -- 🧨Migrated from Javax to Jakarta packages + +- 🧨 Migrated from Java EE (`javax.` namespace) to Jakarta packages - upgrade to Jersey 3.1.5 -- Kotlin 1.9.0 is used; `kotlin-stdlib-jdk8` dependency was replaced with `kotlin-stdlib` due to [Kotlin updates](https://kotlinlang.org/docs/whatsnew18.html#updated-jvm-compilation-target). -- Allow application to reset the oauth token cached within the server, when it deems that it is no longer valid -- 🧨Corrected cardinality and range of the oslc_config:acceptedBy property (from String[0..1] to Resource[0..*]) -- changed scope of dependencies in oauth-webapp to avoid inclusion multiple times during runtime. +- **JDK 17 is the new baseline for Eclipse Lyo.** The SDK and sample code has + been tested using JDK 17, 21, 23, and 24-ea. +- Kotlin 1.9.0 is used; `kotlin-stdlib-jdk8` dependency was replaced with + `kotlin-stdlib` due to + [Kotlin updates](https://kotlinlang.org/docs/whatsnew18.html#updated-jvm-compilation-target). +- Allow application to reset the oauth token cached within the server, when it + deems that it is no longer valid +- 🧨 Corrected cardinality and range of the oslc_config:acceptedBy property (from + String[0..1] to Resource[0..*]) +- changed scope of dependencies in oauth-webapp to avoid inclusion multiple times + during runtime. - Migrated from Javax to Jakarta packages, including upgrade to Jersey 3.1.5 ### Deprecated +This release does not introduce deprecations. + ### Removed -- 🧨 Support for JDK 11 (and all versions below 17) is removed. **JDK 17 is the new baseline for Eclipse Lyo.** The SDK and sample code has been tested using JDK 17, 20, and 21-ea. +- 🧨 Support for JDK 11 (and all versions below 17) is removed. - 🧨 Support for Java EE and Jakarta EE 8 is removed. ### Fixed +This release does not contain bug fixes. + ## [5.1.1] ### Added From 2e7ecee28a134ff9f587b50bb58328d9a460ecf5 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sat, 21 Sep 2024 15:41:20 +0200 Subject: [PATCH 089/126] changelog update --- CHANGELOG.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index daec5ce4e..53ae16e12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,19 +15,18 @@ This release does not contain security updates. ### Changed - 🧨 Migrated from Java EE (`javax.` namespace) to Jakarta packages -- upgrade to Jersey 3.1.5 +- Upgrade to Jersey 3.1.5 - **JDK 17 is the new baseline for Eclipse Lyo.** The SDK and sample code has been tested using JDK 17, 21, 23, and 24-ea. - Kotlin 1.9.0 is used; `kotlin-stdlib-jdk8` dependency was replaced with `kotlin-stdlib` due to [Kotlin updates](https://kotlinlang.org/docs/whatsnew18.html#updated-jvm-compilation-target). -- Allow application to reset the oauth token cached within the server, when it +- Allow application to reset the OAuth token cached within the server, when it deems that it is no longer valid -- 🧨 Corrected cardinality and range of the oslc_config:acceptedBy property (from +- 🧨 Corrected cardinality and range of the `oslc_config:acceptedBy` property (from String[0..1] to Resource[0..*]) -- changed scope of dependencies in oauth-webapp to avoid inclusion multiple times +- Changed scope of dependencies in `oauth-webapp` to avoid inclusion multiple times during runtime. -- Migrated from Javax to Jakarta packages, including upgrade to Jersey 3.1.5 ### Deprecated From 3a6531079669c45a43ec838b12b86484159b9c2d Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sat, 21 Sep 2024 17:15:23 +0200 Subject: [PATCH 090/126] restore Jenkinsfile triggers --- Jenkinsfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d141fb659..241ff96c5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,9 +9,9 @@ pipeline { } stages { stage('SonarCloud') { - // when { - // triggeredBy 'SCMTrigger' - // } + when { + triggeredBy 'SCMTrigger' + } environment { PROJECT_NAME = 'lyo' } @@ -33,6 +33,7 @@ pipeline { } stage('Publish (OSSRH)') { when { + triggeredBy 'SCMTrigger' anyOf { branch 'master' branch 'main' @@ -80,6 +81,7 @@ pipeline { } stage('Publish (Eclipse)') { when { + triggeredBy 'SCMTrigger' anyOf { branch 'master' branch 'main' @@ -111,6 +113,7 @@ pipeline { } stage('Publish HEAD Javadocs') { when { + triggeredBy 'SCMTrigger' branch 'master' } steps { From dd32f16ec8274248cb5dc77bb355d9750006977b Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sat, 21 Sep 2024 17:20:43 +0200 Subject: [PATCH 091/126] prevent Jenkins builds on Dependabot PRs --- .editorconfig | 4 + Jenkinsfile | 302 ++++++++++++++++++++++++++------------------------ 2 files changed, 159 insertions(+), 147 deletions(-) diff --git a/.editorconfig b/.editorconfig index bab3389dd..6ba6af2ba 100644 --- a/.editorconfig +++ b/.editorconfig @@ -20,3 +20,7 @@ indent_size = 4 [*.{xml,html,js,yml,css}] indent_style = space indent_size = 2 + +[Jenkinsfile] +indent_style = space +indent_size = 2 diff --git a/Jenkinsfile b/Jenkinsfile index 241ff96c5..596fcabb0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,153 +1,161 @@ pipeline { - agent any - options { - timeout(time: 40, unit: 'MINUTES') // timeout on whole pipeline job - } - tools { - maven 'apache-maven-latest' - jdk 'temurin-jdk17-latest' - } - stages { - stage('SonarCloud') { - when { - triggeredBy 'SCMTrigger' - } - environment { - PROJECT_NAME = 'lyo' - } - steps { - withCredentials([string(credentialsId: 'sonarcloud-token', variable: 'SONARCLOUD_TOKEN')]) { - withSonarQubeEnv('SonarCloud.io') { - script { - 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 ''' - mvn clean verify -B org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \ - -Dsonar.projectKey=org.eclipse.lyo -Dsonar.organization=eclipse -Dsonar.host.url=${SONAR_HOST_URL} -Dsonar.token=${SONARCLOUD_TOKEN}''' + sonar_pr - } - } - } - } - } - stage('Publish (OSSRH)') { - when { - triggeredBy 'SCMTrigger' - anyOf { - branch 'master' - branch 'main' - branch 'maint-*' - } - } - steps { - withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) { - sh 'gpg --batch --import "${KEYRING}"' - sh 'for fpr in $(gpg --list-keys --with-colons | awk -F: \'/fpr:/ {print $10}\' | sort -u); do echo -e "5\ny\n" | gpg --batch --command-fd 0 --expert --edit-key ${fpr} trust; done' - } - sh ''' - mvn -B -fae clean install -DskipTests javadoc:aggregate \ - -P dev,gpg-sign,!eclipse-deploy,ossrh-deploy - mvn -B deploy -DskipTests -Dmaven.install.skip=true \ - -P dev,gpg-sign,!eclipse-deploy,ossrh-deploy - ''' - } - } - stage('Publish (Javadocs)') { - when { - anyOf { - branch 'master' - branch 'main' - branch 'maint-*' - } - } - steps { - sshagent(['projects-storage.eclipse.org-bot-ssh']) { - sh ''' - DOCS_HOME=/home/data/httpd/download.eclipse.org/lyo/docs/all - VERSION=$(mvn -q \ - -Dexec.executable="echo" \ - -Dexec.args='${project.version}' \ - --non-recursive \ - org.codehaus.mojo:exec-maven-plugin:1.3.1:exec | tail -n 1 | xargs) - # see https://github.com/eclipse/lyo.core/issues/135 for the tail/xargs temp fix + agent any + options { + timeout(time: 40, unit: 'MINUTES') // timeout on whole pipeline job + } + tools { + maven 'apache-maven-latest' + jdk 'temurin-jdk17-latest' + } + stages { + stage('SonarCloud') { + when { + allOf { + triggeredBy 'SCMTrigger' + not { + environment name: 'CHANGE_AUTHOR', value: 'dependabot[bot]' + } + not { + environment name: 'CHANGE_AUTHOR', value: 'dependabot-preview[bot]' + } + } + } + environment { + PROJECT_NAME = 'lyo' + } + steps { + withCredentials([string(credentialsId: 'sonarcloud-token', variable: 'SONARCLOUD_TOKEN')]) { + withSonarQubeEnv('SonarCloud.io') { + script { + 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 ''' + mvn clean verify -B org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \ + -Dsonar.projectKey=org.eclipse.lyo -Dsonar.organization=eclipse -Dsonar.host.url=${SONAR_HOST_URL} -Dsonar.token=${SONARCLOUD_TOKEN}''' + sonar_pr + } + } + } + } + } + stage('Publish (OSSRH)') { + when { + triggeredBy 'SCMTrigger' + anyOf { + branch 'master' + branch 'main' + branch 'maint-*' + } + } + steps { + withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) { + sh 'gpg --batch --import "${KEYRING}"' + sh 'for fpr in $(gpg --list-keys --with-colons | awk -F: \'/fpr:/ {print $10}\' | sort -u); do echo -e "5\ny\n" | gpg --batch --command-fd 0 --expert --edit-key ${fpr} trust; done' + } + sh ''' + mvn -B -fae clean install -DskipTests javadoc:aggregate \ + -P dev,gpg-sign,!eclipse-deploy,ossrh-deploy + mvn -B deploy -DskipTests -Dmaven.install.skip=true \ + -P dev,gpg-sign,!eclipse-deploy,ossrh-deploy + ''' + } + } + stage('Publish (Javadocs)') { + when { + anyOf { + branch 'master' + branch 'main' + branch 'maint-*' + } + } + steps { + sshagent(['projects-storage.eclipse.org-bot-ssh']) { + sh ''' + DOCS_HOME=/home/data/httpd/download.eclipse.org/lyo/docs/all + VERSION=$(mvn -q \ + -Dexec.executable="echo" \ + -Dexec.args='${project.version}' \ + --non-recursive \ + org.codehaus.mojo:exec-maven-plugin:1.3.1:exec | tail -n 1 | xargs) + # see https://github.com/eclipse/lyo.core/issues/135 for the tail/xargs temp fix - ssh genie.lyo@projects-storage.eclipse.org rm -rf $DOCS_HOME/$VERSION - ssh genie.lyo@projects-storage.eclipse.org mkdir -p $DOCS_HOME/$VERSION - scp -rp target/site/apidocs/ genie.lyo@projects-storage.eclipse.org:$DOCS_HOME/$VERSION - ''' - } - } - } - stage('Publish (Eclipse)') { - when { - triggeredBy 'SCMTrigger' - anyOf { - branch 'master' - branch 'main' - branch 'maint-*' - } - } - steps { - sh ''' - mvn -B deploy -DskipTests -Dmaven.install.skip=true \ - -P dev,gpg-sign,eclipse-deploy - ''' - // sh 'gpg --verify my-app/target/my-app-1.0-SNAPSHOT.jar.asc' - sshagent(['projects-storage.eclipse.org-bot-ssh']) { - sh ''' - DOCS_HOME=/home/data/httpd/download.eclipse.org/lyo/docs/all - VERSION=$(mvn -q \ - -Dexec.executable="echo" \ - -Dexec.args='${project.version}' \ - --non-recursive \ - org.codehaus.mojo:exec-maven-plugin:1.3.1:exec | tail -n 1 | xargs) - # see https://github.com/eclipse/lyo.core/issues/135 for the tail/xargs temp fix + ssh genie.lyo@projects-storage.eclipse.org rm -rf $DOCS_HOME/$VERSION + ssh genie.lyo@projects-storage.eclipse.org mkdir -p $DOCS_HOME/$VERSION + scp -rp target/site/apidocs/ genie.lyo@projects-storage.eclipse.org:$DOCS_HOME/$VERSION + ''' + } + } + } + stage('Publish (Eclipse)') { + when { + triggeredBy 'SCMTrigger' + anyOf { + branch 'master' + branch 'main' + branch 'maint-*' + } + } + steps { + sh ''' + mvn -B deploy -DskipTests -Dmaven.install.skip=true \ + -P dev,gpg-sign,eclipse-deploy + ''' + // sh 'gpg --verify my-app/target/my-app-1.0-SNAPSHOT.jar.asc' + sshagent(['projects-storage.eclipse.org-bot-ssh']) { + sh ''' + DOCS_HOME=/home/data/httpd/download.eclipse.org/lyo/docs/all + VERSION=$(mvn -q \ + -Dexec.executable="echo" \ + -Dexec.args='${project.version}' \ + --non-recursive \ + org.codehaus.mojo:exec-maven-plugin:1.3.1:exec | tail -n 1 | xargs) + # see https://github.com/eclipse/lyo.core/issues/135 for the tail/xargs temp fix - ssh genie.lyo@projects-storage.eclipse.org rm -rf $DOCS_HOME/$VERSION - ssh genie.lyo@projects-storage.eclipse.org mkdir -p $DOCS_HOME/$VERSION - scp -rp target/site/apidocs/ genie.lyo@projects-storage.eclipse.org:$DOCS_HOME/$VERSION - ''' - } - } - } - stage('Publish HEAD Javadocs') { - when { - triggeredBy 'SCMTrigger' - branch 'master' - } - steps { - sshagent(['projects-storage.eclipse.org-bot-ssh']) { - sh ''' - DOCS_HOME=/home/data/httpd/download.eclipse.org/lyo/docs/all - VERSION=$(mvn -q \ - -Dexec.executable="echo" \ - -Dexec.args='${project.version}' \ - --non-recursive \ - org.codehaus.mojo:exec-maven-plugin:1.3.1:exec | tail -n 1 | xargs) - # see https://github.com/eclipse/lyo.core/issues/135 for the tail/xargs temp fix + ssh genie.lyo@projects-storage.eclipse.org rm -rf $DOCS_HOME/$VERSION + ssh genie.lyo@projects-storage.eclipse.org mkdir -p $DOCS_HOME/$VERSION + scp -rp target/site/apidocs/ genie.lyo@projects-storage.eclipse.org:$DOCS_HOME/$VERSION + ''' + } + } + } + stage('Publish HEAD Javadocs') { + when { + triggeredBy 'SCMTrigger' + branch 'master' + } + steps { + sshagent(['projects-storage.eclipse.org-bot-ssh']) { + sh ''' + DOCS_HOME=/home/data/httpd/download.eclipse.org/lyo/docs/all + VERSION=$(mvn -q \ + -Dexec.executable="echo" \ + -Dexec.args='${project.version}' \ + --non-recursive \ + org.codehaus.mojo:exec-maven-plugin:1.3.1:exec | tail -n 1 | xargs) + # see https://github.com/eclipse/lyo.core/issues/135 for the tail/xargs temp fix - ssh genie.lyo@projects-storage.eclipse.org rm -rf $DOCS_HOME/latest - ssh genie.lyo@projects-storage.eclipse.org mkdir -p $DOCS_HOME/latest - scp -rp target/site/apidocs/ genie.lyo@projects-storage.eclipse.org:$DOCS_HOME/latest - ''' - } - } + ssh genie.lyo@projects-storage.eclipse.org rm -rf $DOCS_HOME/latest + ssh genie.lyo@projects-storage.eclipse.org mkdir -p $DOCS_HOME/latest + scp -rp target/site/apidocs/ genie.lyo@projects-storage.eclipse.org:$DOCS_HOME/latest + ''' } - } - post { - // send a mail on unsuccessful and fixed builds - unsuccessful { // means unstable || failure || aborted - emailext subject: 'Build $BUILD_STATUS $PROJECT_NAME #$BUILD_NUMBER!', - body: '''Check console output at $BUILD_URL to view the results.''', - recipientProviders: [culprits(), requestor()], - to: 'andrew+ham@berezovskyi.me' - } - fixed { // back to normal - emailext subject: 'Build $BUILD_STATUS $PROJECT_NAME #$BUILD_NUMBER!', - body: '''Check console output at $BUILD_URL to view the results.''', - recipientProviders: [culprits(), requestor()], - to: 'andrew+ham@berezovskyi.me' - } - } + } + } + } + post { + // send a mail on unsuccessful and fixed builds + unsuccessful { // means unstable || failure || aborted + emailext subject: 'Build $BUILD_STATUS $PROJECT_NAME #$BUILD_NUMBER!', + body: '''Check console output at $BUILD_URL to view the results.''', + recipientProviders: [culprits(), requestor()], + to: 'andrew+ham@berezovskyi.me' + } + fixed { // back to normal + emailext subject: 'Build $BUILD_STATUS $PROJECT_NAME #$BUILD_NUMBER!', + body: '''Check console output at $BUILD_URL to view the results.''', + recipientProviders: [culprits(), requestor()], + to: 'andrew+ham@berezovskyi.me' + } + } } From 4546c30c35fc3384f6f55bd9a00e13fbb5842acc Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sat, 21 Sep 2024 18:00:53 +0200 Subject: [PATCH 092/126] README matrix update; test Jenkinsfile Signed-off-by: Andrew Berezovskyi --- README.md | 2 +- tools/readme-matrix/downstream-projects.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7961914c5..a7675b70a 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ See under [validation/README](validation/README.md). | 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) | +| [oslc-op/refimpl](https://github.com/oslc-op/refimpl) | ![](https://img.shields.io/badge/Lyo-6.0.0.CR-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/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) | diff --git a/tools/readme-matrix/downstream-projects.yml b/tools/readme-matrix/downstream-projects.yml index ec90eb569..c7cddcf1a 100644 --- a/tools/readme-matrix/downstream-projects.yml +++ b/tools/readme-matrix/downstream-projects.yml @@ -1,6 +1,7 @@ versions: # shields.io requires '-' to be escaped thru '--' snapshot: + - "6.0.0.CR" - "6.0.0--S" stable: - "5.1.1" @@ -30,7 +31,7 @@ versions: projects: - slug: "oslc-op/refimpl" link: "https://github.com/oslc-op/refimpl" - version: "6.0.0--S" + version: "6.0.0.CR" ci_badge: "https://github.com/oslc-op/refimpl/actions/workflows/maven.yml/badge.svg" pr_badge: "https://img.shields.io/github/issues-pr/oslc-op/refimpl?label=PR" pr_link: "https://github.com/oslc-op/refimpl/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" From e834e4af475c63d0b64101b95b6b517a5ada692b Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sat, 21 Sep 2024 18:10:41 +0200 Subject: [PATCH 093/126] update Jenkins config Signed-off-by: Andrew Berezovskyi --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 596fcabb0..6d3e02938 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,6 +2,7 @@ pipeline { agent any options { timeout(time: 40, unit: 'MINUTES') // timeout on whole pipeline job + disableConcurrentBuilds(abortPrevious: false) } tools { maven 'apache-maven-latest' @@ -41,7 +42,6 @@ pipeline { } stage('Publish (OSSRH)') { when { - triggeredBy 'SCMTrigger' anyOf { branch 'master' branch 'main' @@ -89,7 +89,6 @@ pipeline { } stage('Publish (Eclipse)') { when { - triggeredBy 'SCMTrigger' anyOf { branch 'master' branch 'main' From ab798f5bb705ffb9a5711003441419b9c56bb038 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sat, 21 Sep 2024 18:17:51 +0200 Subject: [PATCH 094/126] further Jenkins changes Signed-off-by: Andrew Berezovskyi --- Jenkinsfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6d3e02938..75d715947 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,11 +8,14 @@ pipeline { 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]' } @@ -28,8 +31,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 ''' From e6894bca807fc3c9e95e68896056edc37a5ca547 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sat, 21 Sep 2024 18:20:18 +0200 Subject: [PATCH 095/126] further exclusion Signed-off-by: Andrew Berezovskyi --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 75d715947..2d2223c52 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,6 +22,9 @@ pipeline { not { environment name: 'CHANGE_AUTHOR', value: 'dependabot-preview[bot]' } + not { + branch pattern: 'dependabot/*', comparator: 'REGEXP' + } } } environment { From e4a274cd055a514b3441d5588886f6ef8930ebb6 Mon Sep 17 00:00:00 2001 From: Jad El-khoury <121724599+Jad-el-khoury@users.noreply.github.com> Date: Sun, 29 Sep 2024 13:52:33 +0200 Subject: [PATCH 096/126] 6.0.0.Final (#622) --- CHANGELOG.md | 2 +- client/oslc-client-base/pom.xml | 4 ++-- client/oslc-client/pom.xml | 4 ++-- client/oslc-java-client-resources/pom.xml | 4 ++-- client/pom.xml | 4 ++-- core/lyo-core-model/pom.xml | 2 +- core/lyo-core-settings/pom.xml | 2 +- core/oslc-query/pom.xml | 2 +- core/oslc-trs/pom.xml | 2 +- core/oslc4j-core-build/pom.xml | 2 +- core/oslc4j-core-wink/pom.xml | 2 +- core/oslc4j-core/pom.xml | 2 +- core/oslc4j-jena-provider/pom.xml | 2 +- core/oslc4j-json4j-provider/pom.xml | 2 +- core/oslc4j-utils/pom.xml | 2 +- core/shacl/pom.xml | 2 +- domains/oslc-domains/pom.xml | 4 ++-- pom.xml | 2 +- server/net.oauth.core-oauth-consumer-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-provider-jakarta/pom.xml | 2 +- server/oauth-consumer-store/pom.xml | 2 +- server/oauth-core/pom.xml | 2 +- server/oauth-webapp/pom.xml | 2 +- server/oslc-ui-model/pom.xml | 2 +- server/pom.xml | 2 +- store/pom.xml | 4 ++-- store/store-core/pom.xml | 2 +- trs/client/client-source-mqtt/pom.xml | 2 +- trs/client/pom.xml | 2 +- trs/client/trs-client/pom.xml | 2 +- trs/server/pom.xml | 4 ++-- validation/pom.xml | 4 ++-- 34 files changed, 42 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53ae16e12..0c10faf20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Eclipse Lyo changelog -## [6.0.0-SNAPSHOT] +## [6.0.0] ### Security diff --git a/client/oslc-client-base/pom.xml b/client/oslc-client-base/pom.xml index 8b3e20a3e..c6d3c0c39 100644 --- a/client/oslc-client-base/pom.xml +++ b/client/oslc-client-base/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.Final oslc-client-base - 6.0.0-SNAPSHOT + 6.0.0.Final Lyo :: Client :: Base diff --git a/client/oslc-client/pom.xml b/client/oslc-client/pom.xml index 306f50419..7337f98e7 100644 --- a/client/oslc-client/pom.xml +++ b/client/oslc-client/pom.xml @@ -6,12 +6,12 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.Final ../pom.xml oslc-client - 6.0.0-SNAPSHOT + 6.0.0.Final Lyo :: Client :: OSLC JAX-RS 2.0 (new) Eclipse Lyo OSLC Java client based on OSLC4J and JAX-RS 2.0 diff --git a/client/oslc-java-client-resources/pom.xml b/client/oslc-java-client-resources/pom.xml index 104065f1e..a9dc2bce1 100644 --- a/client/oslc-java-client-resources/pom.xml +++ b/client/oslc-java-client-resources/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.Final oslc-java-client-resources - 6.0.0-SNAPSHOT + 6.0.0.Final Lyo :: Client :: Resources (legacy) diff --git a/client/pom.xml b/client/pom.xml index c9e8fa16e..677becf0e 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,13 +6,13 @@ org.eclipse.lyo.clients clients-parent - 6.0.0-SNAPSHOT + 6.0.0.Final pom Lyo :: Client :: _Parent org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Final ../pom.xml diff --git a/core/lyo-core-model/pom.xml b/core/lyo-core-model/pom.xml index 6f95f3530..ac064e78a 100644 --- a/core/lyo-core-model/pom.xml +++ b/core/lyo-core-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../oslc4j-core-build/pom.xml Lyo :: Core :: OSLC Core model diff --git a/core/lyo-core-settings/pom.xml b/core/lyo-core-settings/pom.xml index 034f79bd4..211d9635b 100644 --- a/core/lyo-core-settings/pom.xml +++ b/core/lyo-core-settings/pom.xml @@ -5,7 +5,7 @@ oslc4j-core-build org.eclipse.lyo.oslc4j.core - 6.0.0-SNAPSHOT + 6.0.0.Final ../oslc4j-core-build 4.0.0 diff --git a/core/oslc-query/pom.xml b/core/oslc-query/pom.xml index 333077d25..7c9bfa599 100644 --- a/core/oslc-query/pom.xml +++ b/core/oslc-query/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../oslc4j-core-build/pom.xml diff --git a/core/oslc-trs/pom.xml b/core/oslc-trs/pom.xml index efc9d0638..dda80c38a 100644 --- a/core/oslc-trs/pom.xml +++ b/core/oslc-trs/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../oslc4j-core-build/pom.xml diff --git a/core/oslc4j-core-build/pom.xml b/core/oslc4j-core-build/pom.xml index 8741150dd..8e339807d 100644 --- a/core/oslc4j-core-build/pom.xml +++ b/core/oslc4j-core-build/pom.xml @@ -8,7 +8,7 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Final ../../pom.xml diff --git a/core/oslc4j-core-wink/pom.xml b/core/oslc4j-core-wink/pom.xml index 089f25bcb..940fccb32 100644 --- a/core/oslc4j-core-wink/pom.xml +++ b/core/oslc4j-core-wink/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../oslc4j-core-build/pom.xml oslc4j-core-wink diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml index 3b7d7b6e9..4699bbd04 100644 --- a/core/oslc4j-core/pom.xml +++ b/core/oslc4j-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../oslc4j-core-build/pom.xml oslc4j-core diff --git a/core/oslc4j-jena-provider/pom.xml b/core/oslc4j-jena-provider/pom.xml index 3451b0b53..18557023e 100644 --- a/core/oslc4j-jena-provider/pom.xml +++ b/core/oslc4j-jena-provider/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../oslc4j-core-build/pom.xml oslc4j-jena-provider diff --git a/core/oslc4j-json4j-provider/pom.xml b/core/oslc4j-json4j-provider/pom.xml index c320598ff..fa1c683f8 100644 --- a/core/oslc4j-json4j-provider/pom.xml +++ b/core/oslc4j-json4j-provider/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../oslc4j-core-build/pom.xml oslc4j-json4j-provider diff --git a/core/oslc4j-utils/pom.xml b/core/oslc4j-utils/pom.xml index da9381a14..4bc48248d 100644 --- a/core/oslc4j-utils/pom.xml +++ b/core/oslc4j-utils/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../oslc4j-core-build/pom.xml Lyo :: Core :: Utilities diff --git a/core/shacl/pom.xml b/core/shacl/pom.xml index 5f95257f7..5dc6e3374 100644 --- a/core/shacl/pom.xml +++ b/core/shacl/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../oslc4j-core-build/pom.xml diff --git a/domains/oslc-domains/pom.xml b/domains/oslc-domains/pom.xml index 7a2468eda..de8e41087 100644 --- a/domains/oslc-domains/pom.xml +++ b/domains/oslc-domains/pom.xml @@ -10,14 +10,14 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Final ../../pom.xml org.eclipse.lyo oslc-domains - 6.0.0-SNAPSHOT + 6.0.0.Final jar Lyo :: Domains diff --git a/pom.xml b/pom.xml index ee872167d..e2a751484 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Final pom Lyo :: _Parent diff --git a/server/net.oauth.core-oauth-consumer-jakarta/pom.xml b/server/net.oauth.core-oauth-consumer-jakarta/pom.xml index 5d7b0bac1..be43d817c 100644 --- a/server/net.oauth.core-oauth-consumer-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-consumer-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml b/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml index 4b94094cd..fd29454c4 100644 --- a/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-jakarta/pom.xml b/server/net.oauth.core-oauth-jakarta/pom.xml index af79404d8..07b6a0836 100644 --- a/server/net.oauth.core-oauth-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-provider-jakarta/pom.xml b/server/net.oauth.core-oauth-provider-jakarta/pom.xml index 76bdd86af..1efd0e359 100644 --- a/server/net.oauth.core-oauth-provider-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-provider-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-consumer-store/pom.xml b/server/oauth-consumer-store/pom.xml index 2469934f8..e788ee05a 100644 --- a/server/oauth-consumer-store/pom.xml +++ b/server/oauth-consumer-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-core/pom.xml b/server/oauth-core/pom.xml index 0ef21dbeb..d2983ce48 100644 --- a/server/oauth-core/pom.xml +++ b/server/oauth-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-webapp/pom.xml b/server/oauth-webapp/pom.xml index 548ede7c4..714421245 100644 --- a/server/oauth-webapp/pom.xml +++ b/server/oauth-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../pom.xml org.eclipse.lyo.server diff --git a/server/oslc-ui-model/pom.xml b/server/oslc-ui-model/pom.xml index 005f0a519..68a93efea 100644 --- a/server/oslc-ui-model/pom.xml +++ b/server/oslc-ui-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0-SNAPSHOT + 6.0.0.Final ../pom.xml org.eclipse.lyo.server diff --git a/server/pom.xml b/server/pom.xml index cfe2be6a4..b40891373 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Final ../pom.xml diff --git a/store/pom.xml b/store/pom.xml index 712de061e..29fc11cb4 100644 --- a/store/pom.xml +++ b/store/pom.xml @@ -6,14 +6,14 @@ org.eclipse.lyo.store store-parent - 6.0.0-SNAPSHOT + 6.0.0.Final pom Lyo :: Store :: _Parent org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Final diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml index 7bcfb705d..512e91ff8 100644 --- a/store/store-core/pom.xml +++ b/store/store-core/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lyo.store store-parent - 6.0.0-SNAPSHOT + 6.0.0.Final ../pom.xml diff --git a/trs/client/client-source-mqtt/pom.xml b/trs/client/client-source-mqtt/pom.xml index 189997752..d3be4bc3e 100644 --- a/trs/client/client-source-mqtt/pom.xml +++ b/trs/client/client-source-mqtt/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0-SNAPSHOT + 6.0.0.Final ../pom.xml diff --git a/trs/client/pom.xml b/trs/client/pom.xml index 7ece1f8c2..b1d41064a 100644 --- a/trs/client/pom.xml +++ b/trs/client/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Final ../../pom.xml diff --git a/trs/client/trs-client/pom.xml b/trs/client/trs-client/pom.xml index 0514cb20e..3c1405ce7 100644 --- a/trs/client/trs-client/pom.xml +++ b/trs/client/trs-client/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0-SNAPSHOT + 6.0.0.Final ../pom.xml diff --git a/trs/server/pom.xml b/trs/server/pom.xml index 33cb7f006..c459b390c 100644 --- a/trs/server/pom.xml +++ b/trs/server/pom.xml @@ -20,13 +20,13 @@ 4.0.0 org.eclipse.lyo.trs trs-server - 6.0.0-SNAPSHOT + 6.0.0.Final Lyo :: TRS :: Server org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Final ../../pom.xml diff --git a/validation/pom.xml b/validation/pom.xml index a0ddb9500..59a971f30 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -3,13 +3,13 @@ 4.0.0 lyo-validation - 6.0.0-SNAPSHOT + 6.0.0.Final Lyo :: Validation org.eclipse.lyo lyo-parent - 6.0.0-SNAPSHOT + 6.0.0.Final ../pom.xml From 06e3695e923ec8d285306042c09fa1dfbb049aa9 Mon Sep 17 00:00:00 2001 From: Jad El-khoury Date: Sun, 29 Sep 2024 14:53:52 +0200 Subject: [PATCH 097/126] Continue the SNAPSHOT development --- CHANGELOG.md | 12 ++++++++++++ client/oslc-client-base/pom.xml | 4 ++-- client/oslc-client/pom.xml | 4 ++-- client/oslc-java-client-resources/pom.xml | 4 ++-- client/pom.xml | 4 ++-- core/lyo-core-model/pom.xml | 2 +- core/lyo-core-settings/pom.xml | 2 +- core/oslc-query/pom.xml | 2 +- core/oslc-trs/pom.xml | 2 +- core/oslc4j-core-build/pom.xml | 2 +- core/oslc4j-core-wink/pom.xml | 2 +- core/oslc4j-core/pom.xml | 2 +- core/oslc4j-jena-provider/pom.xml | 2 +- core/oslc4j-json4j-provider/pom.xml | 2 +- core/oslc4j-utils/pom.xml | 2 +- core/shacl/pom.xml | 2 +- domains/oslc-domains/pom.xml | 4 ++-- pom.xml | 2 +- server/net.oauth.core-oauth-consumer-jakarta/pom.xml | 2 +- .../net.oauth.core-oauth-httpclient4-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-jakarta/pom.xml | 2 +- server/net.oauth.core-oauth-provider-jakarta/pom.xml | 2 +- server/oauth-consumer-store/pom.xml | 2 +- server/oauth-core/pom.xml | 2 +- server/oauth-webapp/pom.xml | 2 +- server/oslc-ui-model/pom.xml | 2 +- server/pom.xml | 2 +- store/pom.xml | 4 ++-- store/store-core/pom.xml | 2 +- trs/client/client-source-mqtt/pom.xml | 2 +- trs/client/pom.xml | 2 +- trs/client/trs-client/pom.xml | 2 +- trs/server/pom.xml | 4 ++-- validation/pom.xml | 4 ++-- 34 files changed, 53 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c10faf20..ac6c43f73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Eclipse Lyo changelog +## [7.0.0-SNAPSHOT] + +### Added + +### Changed + +### Deprecated + +### Removed + +### Fixed + ## [6.0.0] ### Security diff --git a/client/oslc-client-base/pom.xml b/client/oslc-client-base/pom.xml index c6d3c0c39..7cb548bef 100644 --- a/client/oslc-client-base/pom.xml +++ b/client/oslc-client-base/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.Final + 7.0.0-SNAPSHOT oslc-client-base - 6.0.0.Final + 7.0.0-SNAPSHOT Lyo :: Client :: Base diff --git a/client/oslc-client/pom.xml b/client/oslc-client/pom.xml index 7337f98e7..ab5f353a8 100644 --- a/client/oslc-client/pom.xml +++ b/client/oslc-client/pom.xml @@ -6,12 +6,12 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.Final + 7.0.0-SNAPSHOT ../pom.xml oslc-client - 6.0.0.Final + 7.0.0-SNAPSHOT Lyo :: Client :: OSLC JAX-RS 2.0 (new) Eclipse Lyo OSLC Java client based on OSLC4J and JAX-RS 2.0 diff --git a/client/oslc-java-client-resources/pom.xml b/client/oslc-java-client-resources/pom.xml index a9dc2bce1..a976ef321 100644 --- a/client/oslc-java-client-resources/pom.xml +++ b/client/oslc-java-client-resources/pom.xml @@ -6,11 +6,11 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.Final + 7.0.0-SNAPSHOT oslc-java-client-resources - 6.0.0.Final + 7.0.0-SNAPSHOT Lyo :: Client :: Resources (legacy) diff --git a/client/pom.xml b/client/pom.xml index 677becf0e..a3d2add5d 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,13 +6,13 @@ org.eclipse.lyo.clients clients-parent - 6.0.0.Final + 7.0.0-SNAPSHOT pom Lyo :: Client :: _Parent org.eclipse.lyo lyo-parent - 6.0.0.Final + 7.0.0-SNAPSHOT ../pom.xml diff --git a/core/lyo-core-model/pom.xml b/core/lyo-core-model/pom.xml index ac064e78a..683cdb1c4 100644 --- a/core/lyo-core-model/pom.xml +++ b/core/lyo-core-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml Lyo :: Core :: OSLC Core model diff --git a/core/lyo-core-settings/pom.xml b/core/lyo-core-settings/pom.xml index 211d9635b..af63fcb9d 100644 --- a/core/lyo-core-settings/pom.xml +++ b/core/lyo-core-settings/pom.xml @@ -5,7 +5,7 @@ oslc4j-core-build org.eclipse.lyo.oslc4j.core - 6.0.0.Final + 7.0.0-SNAPSHOT ../oslc4j-core-build 4.0.0 diff --git a/core/oslc-query/pom.xml b/core/oslc-query/pom.xml index 7c9bfa599..d5b0d910e 100644 --- a/core/oslc-query/pom.xml +++ b/core/oslc-query/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml diff --git a/core/oslc-trs/pom.xml b/core/oslc-trs/pom.xml index dda80c38a..084c99c89 100644 --- a/core/oslc-trs/pom.xml +++ b/core/oslc-trs/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml diff --git a/core/oslc4j-core-build/pom.xml b/core/oslc4j-core-build/pom.xml index 8e339807d..604f23376 100644 --- a/core/oslc4j-core-build/pom.xml +++ b/core/oslc4j-core-build/pom.xml @@ -8,7 +8,7 @@ org.eclipse.lyo lyo-parent - 6.0.0.Final + 7.0.0-SNAPSHOT ../../pom.xml diff --git a/core/oslc4j-core-wink/pom.xml b/core/oslc4j-core-wink/pom.xml index 940fccb32..e9ca31a69 100644 --- a/core/oslc4j-core-wink/pom.xml +++ b/core/oslc4j-core-wink/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-core-wink diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml index 4699bbd04..b7f1aea56 100644 --- a/core/oslc4j-core/pom.xml +++ b/core/oslc4j-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-core diff --git a/core/oslc4j-jena-provider/pom.xml b/core/oslc4j-jena-provider/pom.xml index 18557023e..a752371d3 100644 --- a/core/oslc4j-jena-provider/pom.xml +++ b/core/oslc4j-jena-provider/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-jena-provider diff --git a/core/oslc4j-json4j-provider/pom.xml b/core/oslc4j-json4j-provider/pom.xml index fa1c683f8..19e74042f 100644 --- a/core/oslc4j-json4j-provider/pom.xml +++ b/core/oslc4j-json4j-provider/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml oslc4j-json4j-provider diff --git a/core/oslc4j-utils/pom.xml b/core/oslc4j-utils/pom.xml index 4bc48248d..ef2ba97dd 100644 --- a/core/oslc4j-utils/pom.xml +++ b/core/oslc4j-utils/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml Lyo :: Core :: Utilities diff --git a/core/shacl/pom.xml b/core/shacl/pom.xml index 5dc6e3374..3b7659914 100644 --- a/core/shacl/pom.xml +++ b/core/shacl/pom.xml @@ -5,7 +5,7 @@ org.eclipse.lyo.oslc4j.core oslc4j-core-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../oslc4j-core-build/pom.xml diff --git a/domains/oslc-domains/pom.xml b/domains/oslc-domains/pom.xml index de8e41087..f2434b04f 100644 --- a/domains/oslc-domains/pom.xml +++ b/domains/oslc-domains/pom.xml @@ -10,14 +10,14 @@ org.eclipse.lyo lyo-parent - 6.0.0.Final + 7.0.0-SNAPSHOT ../../pom.xml org.eclipse.lyo oslc-domains - 6.0.0.Final + 7.0.0-SNAPSHOT jar Lyo :: Domains diff --git a/pom.xml b/pom.xml index e2a751484..903020d18 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.eclipse.lyo lyo-parent - 6.0.0.Final + 7.0.0-SNAPSHOT pom Lyo :: _Parent diff --git a/server/net.oauth.core-oauth-consumer-jakarta/pom.xml b/server/net.oauth.core-oauth-consumer-jakarta/pom.xml index be43d817c..09637f27d 100644 --- a/server/net.oauth.core-oauth-consumer-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-consumer-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml b/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml index fd29454c4..15835887d 100644 --- a/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-httpclient4-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-jakarta/pom.xml b/server/net.oauth.core-oauth-jakarta/pom.xml index 07b6a0836..ebf2c37e5 100644 --- a/server/net.oauth.core-oauth-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/net.oauth.core-oauth-provider-jakarta/pom.xml b/server/net.oauth.core-oauth-provider-jakarta/pom.xml index 1efd0e359..997d36829 100644 --- a/server/net.oauth.core-oauth-provider-jakarta/pom.xml +++ b/server/net.oauth.core-oauth-provider-jakarta/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-consumer-store/pom.xml b/server/oauth-consumer-store/pom.xml index e788ee05a..00552474f 100644 --- a/server/oauth-consumer-store/pom.xml +++ b/server/oauth-consumer-store/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-core/pom.xml b/server/oauth-core/pom.xml index d2983ce48..c401463f8 100644 --- a/server/oauth-core/pom.xml +++ b/server/oauth-core/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oauth-webapp/pom.xml b/server/oauth-webapp/pom.xml index 714421245..ec24d976d 100644 --- a/server/oauth-webapp/pom.xml +++ b/server/oauth-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/oslc-ui-model/pom.xml b/server/oslc-ui-model/pom.xml index 68a93efea..1205915c4 100644 --- a/server/oslc-ui-model/pom.xml +++ b/server/oslc-ui-model/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.oslc4j.server lyo-server-build - 6.0.0.Final + 7.0.0-SNAPSHOT ../pom.xml org.eclipse.lyo.server diff --git a/server/pom.xml b/server/pom.xml index b40891373..d97408451 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0.Final + 7.0.0-SNAPSHOT ../pom.xml diff --git a/store/pom.xml b/store/pom.xml index 29fc11cb4..d724ff2b7 100644 --- a/store/pom.xml +++ b/store/pom.xml @@ -6,14 +6,14 @@ org.eclipse.lyo.store store-parent - 6.0.0.Final + 7.0.0-SNAPSHOT pom Lyo :: Store :: _Parent org.eclipse.lyo lyo-parent - 6.0.0.Final + 7.0.0-SNAPSHOT diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml index 512e91ff8..af77b294d 100644 --- a/store/store-core/pom.xml +++ b/store/store-core/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lyo.store store-parent - 6.0.0.Final + 7.0.0-SNAPSHOT ../pom.xml diff --git a/trs/client/client-source-mqtt/pom.xml b/trs/client/client-source-mqtt/pom.xml index d3be4bc3e..1e04e7ed1 100644 --- a/trs/client/client-source-mqtt/pom.xml +++ b/trs/client/client-source-mqtt/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0.Final + 7.0.0-SNAPSHOT ../pom.xml diff --git a/trs/client/pom.xml b/trs/client/pom.xml index b1d41064a..a2ef1f2a1 100644 --- a/trs/client/pom.xml +++ b/trs/client/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lyo lyo-parent - 6.0.0.Final + 7.0.0-SNAPSHOT ../../pom.xml diff --git a/trs/client/trs-client/pom.xml b/trs/client/trs-client/pom.xml index 3c1405ce7..c4bbe0a90 100644 --- a/trs/client/trs-client/pom.xml +++ b/trs/client/trs-client/pom.xml @@ -6,7 +6,7 @@ org.eclipse.lyo.trs trs-parent - 6.0.0.Final + 7.0.0-SNAPSHOT ../pom.xml diff --git a/trs/server/pom.xml b/trs/server/pom.xml index c459b390c..5fc7261be 100644 --- a/trs/server/pom.xml +++ b/trs/server/pom.xml @@ -20,13 +20,13 @@ 4.0.0 org.eclipse.lyo.trs trs-server - 6.0.0.Final + 7.0.0-SNAPSHOT Lyo :: TRS :: Server org.eclipse.lyo lyo-parent - 6.0.0.Final + 7.0.0-SNAPSHOT ../../pom.xml diff --git a/validation/pom.xml b/validation/pom.xml index 59a971f30..2a9474be3 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -3,13 +3,13 @@ 4.0.0 lyo-validation - 6.0.0.Final + 7.0.0-SNAPSHOT Lyo :: Validation org.eclipse.lyo lyo-parent - 6.0.0.Final + 7.0.0-SNAPSHOT ../pom.xml From 2e76532c0b9c0979468f36ca4d824375ddc603b6 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Tue, 1 Oct 2024 18:12:20 +0200 Subject: [PATCH 098/126] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a7675b70a..edb1ac357 100644 --- 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/) From f4b84caca50eec8b5cbd2c3f7bdc05a7ccbc1dcd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 00:01:00 +0200 Subject: [PATCH 099/126] chore: Bump org.junit:junit-bom from 5.10.3 to 5.11.2 (#626) Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.10.3 to 5.11.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.11.2) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 903020d18..2a9941b44 100644 --- a/pom.xml +++ b/pom.xml @@ -373,7 +373,7 @@ org.junit junit-bom - 5.10.3 + 5.11.2 pom import From bb9ad5b34e7f1fa67aa99e3b67109855e90a5f71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 00:01:23 +0200 Subject: [PATCH 100/126] chore: Bump commons-io:commons-io from 2.16.1 to 2.17.0 (#614) Bumps commons-io:commons-io from 2.16.1 to 2.17.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2a9941b44..a1068be98 100644 --- a/pom.xml +++ b/pom.xml @@ -418,7 +418,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 From 2c265a2cae33c617e4ee681095d280ab80dbe027 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sat, 5 Oct 2024 17:43:26 +0200 Subject: [PATCH 101/126] Update dependabot.yml --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4adb3600f..180aa2d05 100644 --- 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 From fd16252e98d8a87464edf6852655a86bd826b310 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sat, 5 Oct 2024 18:34:55 +0200 Subject: [PATCH 102/126] docs: update README project matrix Signed-off-by: Andrew Berezovskyi --- README.md | 8 +++--- tools/readme-matrix/downstream-projects.yml | 28 +++++++++++---------- tools/readme-matrix/update-readme.sh | 16 ++++++------ 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index edb1ac357..122837c4e 100644 --- a/README.md +++ b/README.md @@ -66,11 +66,11 @@ See under [validation/README](validation/README.md). | Repo | Version | Status | PRs | Activity | | ---- | ------- | ------ | --- | -------- | -| [oslc-op/refimpl](https://github.com/oslc-op/refimpl) | ![](https://img.shields.io/badge/Lyo-6.0.0.CR-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--S-E77728) | 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-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) | | [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) | | [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) | diff --git a/tools/readme-matrix/downstream-projects.yml b/tools/readme-matrix/downstream-projects.yml index c7cddcf1a..a75719dd4 100644 --- a/tools/readme-matrix/downstream-projects.yml +++ b/tools/readme-matrix/downstream-projects.yml @@ -2,21 +2,23 @@ versions: # shields.io requires '-' to be escaped thru '--' snapshot: - "6.0.0.CR" - - "6.0.0--S" + - "7.0.0--S" stable: - - "5.1.1" + - "6.0.0" milestone-warn: - "5.1.0a" - "5.0.1.CR" obsolete-snapshot: + - "6.0.0--S" - "5.2.0--S" - "5.1.0--S" - "5.0.0--S" - "4.1.0--S" - "4.0.0--S" obsolete-recent: - - "5.1.0" + - "5.1.1" obsolete-old: + - "5.1.0" - "5.0.0" obsolete-danger: - "4.1.0" @@ -31,13 +33,22 @@ versions: projects: - slug: "oslc-op/refimpl" link: "https://github.com/oslc-op/refimpl" - version: "6.0.0.CR" + version: "6.0.0" ci_badge: "https://github.com/oslc-op/refimpl/actions/workflows/maven.yml/badge.svg" pr_badge: "https://img.shields.io/github/issues-pr/oslc-op/refimpl?label=PR" pr_link: "https://github.com/oslc-op/refimpl/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/oslc-op/refimpl/Type:%20Bug?label=bugs" issues_link: "https://github.com/oslc-op/refimpl/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc" activity_badge: "https://img.shields.io/github/last-commit/oslc-op/refimpl" + - slug: "lyo-samples/lyo-client-samples" + link: "https://github.com/OSLC/lyo-samples" + version: "6.0.0" + ci_badge: "https://github.com/OSLC/lyo-samples/actions/workflows/maven.yml/badge.svg" + pr_badge: "https://img.shields.io/github/issues-pr/OSLC/lyo-samples?label=PR" + pr_link: "https://github.com/OSLC/lyo-samples/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" + issues_badge: "https://img.shields.io/github/issues/OSLC/lyo-samples/bug?label=bugs" + issues_link: "https://github.com/OSLC/lyo-samples/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc" + activity_badge: "https://img.shields.io/github/last-commit/OSLC/lyo-samples" - slug: "danlz/lyo-in-spring-boot" link: "https://github.com/danlz/lyo-in-spring-boot" version: "6.0.0--S" @@ -64,15 +75,6 @@ projects: issues_badge: "https://img.shields.io/github/issues/OSLC/lyo-adaptor-sample-modelling/bug?label=bugs" issues_link: "https://github.com/OSLC/lyo-adaptor-sample-modelling/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc" activity_badge: "https://img.shields.io/github/last-commit/OSLC/lyo-adaptor-sample-modelling" - - slug: "lyo-samples/lyo-client-samples" - link: "https://github.com/OSLC/lyo-samples" - version: "5.2.0--S" - ci_badge: "https://github.com/OSLC/lyo-samples/actions/workflows/maven.yml/badge.svg" - pr_badge: "https://img.shields.io/github/issues-pr/OSLC/lyo-samples?label=PR" - pr_link: "https://github.com/OSLC/lyo-samples/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" - issues_badge: "https://img.shields.io/github/issues/OSLC/lyo-samples/bug?label=bugs" - issues_link: "https://github.com/OSLC/lyo-samples/issues?q=is%3Aopen+label%3Abug+sort%3Aupdated-desc" - activity_badge: "https://img.shields.io/github/last-commit/OSLC/lyo-samples" - slug: "lyo-samples/client-oauth-discovery-dui" link: "https://github.com/OSLC/lyo-samples" version: "4.0.0" diff --git a/tools/readme-matrix/update-readme.sh b/tools/readme-matrix/update-readme.sh index 31bae4bcf..eb50ff958 100755 --- a/tools/readme-matrix/update-readme.sh +++ b/tools/readme-matrix/update-readme.sh @@ -9,13 +9,13 @@ SCRIPT_DIR=$(dirname "${SCRIPT_PATH}") trap "rm ${SCRIPT_DIR}/tmp.md" err exit SIGINT SIGTERM -if ! [ -x "$(command -v pip-run)" ]; then - if [ -x "$(command -v pipx)" ]; then - pipx install pip-run - else - python3 -m pip install pip-run - fi -fi +# if ! [ -x "$(command -v pip-run)" ]; then +# if [ -x "$(command -v pipx)" ]; then +# pipx install pip-run +# else +# python3 -m pip install pip-run +# fi +# fi if ! [ -x "$(command -v sponge)" ]; then brew install sponge || sudo apt install moreutils || sudo zypper in moreutils @@ -24,7 +24,7 @@ fi pushd "${SCRIPT_DIR}" -./readme-matrix-generator.py downstream-projects.yml > tmp.md +pipx run ./readme-matrix-generator.py downstream-projects.yml > tmp.md # https://unix.stackexchange.com/a/737087/6317 sed -e '//e cat tmp.md' -e '//,//{//!d}' ../../README.md | sponge ../../README.md From c99ffbdec03a4c09b1effe98c13f9f1b4928308f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:42:03 +0200 Subject: [PATCH 103/126] chore: Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.2.5 to 3.5.1 (#629) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- store/store-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml index af77b294d..0f408f61a 100644 --- a/store/store-core/pom.xml +++ b/store/store-core/pom.xml @@ -139,7 +139,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.2.5 + 3.5.1 From 5b16f0a9b7c4c170601730e9dbb7ad79f4d53bbc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:42:13 +0200 Subject: [PATCH 104/126] chore: Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.5 to 3.5.1 (#628) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a1068be98..26cf262f0 100644 --- a/pom.xml +++ b/pom.xml @@ -476,7 +476,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.5 + 3.5.1 From 6be047c9338c660825bf7296e0f931a3babb4af4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:42:25 +0200 Subject: [PATCH 105/126] chore: Bump org.mockito:mockito-core from 5.12.0 to 5.14.1 (#623) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 26cf262f0..7179448ef 100644 --- a/pom.xml +++ b/pom.xml @@ -361,7 +361,7 @@ org.mockito mockito-core - 5.12.0 + 5.14.1 test From 91b7f73d9af511e0d9dc63a6d36a8601dc18975f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:42:39 +0200 Subject: [PATCH 106/126] chore: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.8.0 to 3.10.1 (#624) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7179448ef..79428483b 100644 --- a/pom.xml +++ b/pom.xml @@ -451,7 +451,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.8.0 + 3.10.1 all,-accessibility,-html,-missing From 41c083856e3eb5ccaf7495779cc0b5c9e35fd7f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:42:52 +0200 Subject: [PATCH 107/126] chore: Bump org.cyclonedx:cyclonedx-maven-plugin from 2.7.9 to 2.8.2 (#619) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 79428483b..35952e8a8 100644 --- a/pom.xml +++ b/pom.xml @@ -642,7 +642,7 @@ org.cyclonedx cyclonedx-maven-plugin - 2.7.9 + 2.8.2 1.4 library From 42c5820cd935b0c4dec1a8119ca7803848316865 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:44:38 +0200 Subject: [PATCH 108/126] chore: Bump v.jersey from 3.1.6 to 3.1.8 (#578) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 35952e8a8..454a33833 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 1.9.24 1.9.20 - 3.1.6 + 3.1.8 3.1.0 4.8.0 From 9b4de5164530989ae7d7c64e732ce49008adc43f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:45:03 +0200 Subject: [PATCH 109/126] chore: Bump org.apache.maven.plugins:maven-site-plugin from 3.12.1 to 3.20.0 (#588) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 454a33833..8b8f411ba 100644 --- a/pom.xml +++ b/pom.xml @@ -491,7 +491,7 @@ org.apache.maven.plugins maven-site-plugin - 3.12.1 + 3.20.0 org.apache.maven.plugins From 0e02bf7072e0959d4ee026afefb391b5f424dfb0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:45:15 +0200 Subject: [PATCH 110/126] chore: Bump org.apache.maven.plugins:maven-install-plugin from 3.1.2 to 3.1.3 (#589) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8b8f411ba..1ea515ef3 100644 --- a/pom.xml +++ b/pom.xml @@ -588,7 +588,7 @@ org.apache.maven.plugins maven-install-plugin - 3.1.2 + 3.1.3 org.apache.maven.plugins From 40d1ff114f4d0501e6388b8d54417d3d1f48db58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:45:28 +0200 Subject: [PATCH 111/126] chore: Bump org.codehaus.mojo:versions-maven-plugin from 2.16.2 to 2.17.1 (#570) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1ea515ef3..a7af7f514 100644 --- a/pom.xml +++ b/pom.xml @@ -602,7 +602,7 @@ org.codehaus.mojo versions-maven-plugin - 2.16.2 + 2.17.1 false From 613d3461eecd38cb0cee86d7b8b3e577817106f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:45:48 +0200 Subject: [PATCH 112/126] chore: Bump org.apache.maven.plugins:maven-deploy-plugin from 3.1.2 to 3.1.3 (#591) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a7af7f514..e9823f953 100644 --- a/pom.xml +++ b/pom.xml @@ -583,7 +583,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.2 + 3.1.3 org.apache.maven.plugins From f2eec23e61fa306a8446ea8ad84eeb7d2f14d58a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:46:09 +0200 Subject: [PATCH 113/126] chore: Bump io.github.classgraph:classgraph from 4.8.174 to 4.8.177 (#625) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- core/oslc4j-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml index b7f1aea56..d28abad62 100644 --- a/core/oslc4j-core/pom.xml +++ b/core/oslc4j-core/pom.xml @@ -27,7 +27,7 @@ io.github.classgraph classgraph - 4.8.174 + 4.8.177 jakarta.ws.rs From 978423ab2d909ffa3bdd6e02afcb85688ca10a33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:46:27 +0200 Subject: [PATCH 114/126] chore: Bump org.apache.commons:commons-lang3 from 3.15.0 to 3.17.0 (#602) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e9823f953..d4807d038 100644 --- a/pom.xml +++ b/pom.xml @@ -353,7 +353,7 @@ org.apache.commons commons-lang3 - 3.15.0 + 3.17.0 From 0d7c560153ba3d1a4911c3e1470b04084d81b5c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:47:11 +0200 Subject: [PATCH 115/126] chore: Bump v.slf4j from 2.0.13 to 2.0.16 (#583) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d4807d038..e6e72933d 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 4.8.0 2.17.2 4.5.14 - 2.0.13 + 2.0.16 33.2.1-jre From afb47c6fb9c5935a54f9db56d2448952cdfaf528 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:47:22 +0200 Subject: [PATCH 116/126] chore: Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2 (#558) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e6e72933d..7c33a7afe 100644 --- a/pom.xml +++ b/pom.xml @@ -593,7 +593,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.1 + 3.4.2 From 0ece1df4762988c0b1fc67cc1d5c472102271c94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:47:41 +0200 Subject: [PATCH 117/126] chore: Bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.4 to 3.2.7 (#620) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c33a7afe..e2f6738af 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.4 + 3.2.7 sign-artifacts From e02022a3845fa6ba76791f5375138a170709b91c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:48:52 +0200 Subject: [PATCH 118/126] chore: Bump v.kotlin from 1.9.24 to 2.0.20 (#595) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e2f6738af..c290d0618 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ ${project.version} - 1.9.24 + 2.0.20 1.9.20 3.1.8 From c44aa330672ed193bb931979b770dc3f24deb808 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:49:05 +0200 Subject: [PATCH 119/126] chore: Bump com.fasterxml.jackson:jackson-bom from 2.17.2 to 2.18.0 (#627) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c290d0618..57d69e494 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 3.1.0 4.8.0 - 2.17.2 + 2.18.0 4.5.14 2.0.16 From 5094cbf36ea8729b7050c44af4424dff63747d35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:49:19 +0200 Subject: [PATCH 120/126] chore: Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.2 to 3.4.0 (#557) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 57d69e494..d630d864f 100644 --- a/pom.xml +++ b/pom.xml @@ -578,7 +578,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.3.2 + 3.4.0 org.apache.maven.plugins From 14325ef62e85fea46dab6fc6b7665369d13dc002 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:50:12 +0200 Subject: [PATCH 121/126] chore: Bump com.google.guava:guava from 33.2.1-jre to 33.3.1-jre (#617) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d630d864f..cbb90ced0 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.5.14 2.0.16 - 33.2.1-jre + 33.3.1-jre From f313467f593df9e757597aa0e144a8302d37e4d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:50:21 +0200 Subject: [PATCH 122/126] chore: Bump org.apache.maven.plugins:maven-project-info-reports-plugin from 3.5.0 to 3.7.0 (#594) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cbb90ced0..d0d57c89e 100644 --- a/pom.xml +++ b/pom.xml @@ -496,7 +496,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.5.0 + 3.7.0 org.apache.maven.plugins From 53158d87884e61d1b9b0425597f98c15df309007 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Tue, 8 Oct 2024 19:02:12 +0200 Subject: [PATCH 123/126] Revert "chore: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.8.0 to 3.10.1 (#624)" This reverts commit 91b7f73d9af511e0d9dc63a6d36a8601dc18975f. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d0d57c89e..0d1e5bbf3 100644 --- a/pom.xml +++ b/pom.xml @@ -451,7 +451,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.1 + 3.8.0 all,-accessibility,-html,-missing From 053552baf6520cfb022c49753bf7d84ba0c498c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 21:59:10 +0200 Subject: [PATCH 124/126] chore: Bump v.jersey from 3.1.8 to 3.1.9 (#630) Bumps `v.jersey` from 3.1.8 to 3.1.9. Updates `org.glassfish.jersey.core:jersey-client` from 3.1.8 to 3.1.9 Updates `org.glassfish.jersey.containers:jersey-container-servlet` from 3.1.8 to 3.1.9 Updates `org.glassfish.jersey.core:jersey-server` from 3.1.8 to 3.1.9 Updates `org.glassfish.jersey.core:jersey-common` from 3.1.8 to 3.1.9 Updates `org.glassfish.jersey.inject:jersey-hk2` from 3.1.8 to 3.1.9 Updates `org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2` from 3.1.8 to 3.1.9 Updates `org.glassfish.jersey.test-framework:jersey-test-framework-core` from 3.1.8 to 3.1.9 Updates `org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty` from 3.1.8 to 3.1.9 --- updated-dependencies: - dependency-name: org.glassfish.jersey.core:jersey-client dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.glassfish.jersey.containers:jersey-container-servlet dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.glassfish.jersey.core:jersey-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.glassfish.jersey.core:jersey-common dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.glassfish.jersey.inject:jersey-hk2 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.glassfish.jersey.test-framework:jersey-test-framework-core dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0d1e5bbf3..40d22f51b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 2.0.20 1.9.20 - 3.1.8 + 3.1.9 3.1.0 4.8.0 From 201890f1f1cc9a17a1fcdd5c33b7b592f1597d47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 21:59:28 +0200 Subject: [PATCH 125/126] chore: Bump org.cyclonedx:cyclonedx-maven-plugin from 2.8.2 to 2.9.0 (#631) Bumps [org.cyclonedx:cyclonedx-maven-plugin](https://github.com/CycloneDX/cyclonedx-maven-plugin) from 2.8.2 to 2.9.0. - [Release notes](https://github.com/CycloneDX/cyclonedx-maven-plugin/releases) - [Commits](https://github.com/CycloneDX/cyclonedx-maven-plugin/compare/cyclonedx-maven-plugin-2.8.2...cyclonedx-maven-plugin-2.9.0) --- updated-dependencies: - dependency-name: org.cyclonedx:cyclonedx-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40d22f51b..c17790710 100644 --- a/pom.xml +++ b/pom.xml @@ -642,7 +642,7 @@ org.cyclonedx cyclonedx-maven-plugin - 2.8.2 + 2.9.0 1.4 library From f331b622a1f41ba0f41a2d83e4f00d90723fec0e Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Wed, 9 Oct 2024 22:18:19 +0200 Subject: [PATCH 126/126] docs: Spring Boot example from danlz updated to 6.0.0.Final Signed-off-by: Andrew Berezovskyi --- README.md | 2 +- tools/readme-matrix/downstream-projects.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 122837c4e..23f3c7424 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ See under [validation/README](validation/README.md). | ---- | ------- | ------ | --- | -------- | | [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--S-E77728) | 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) | +| [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/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) | diff --git a/tools/readme-matrix/downstream-projects.yml b/tools/readme-matrix/downstream-projects.yml index a75719dd4..3e2c3d177 100644 --- a/tools/readme-matrix/downstream-projects.yml +++ b/tools/readme-matrix/downstream-projects.yml @@ -51,7 +51,8 @@ projects: activity_badge: "https://img.shields.io/github/last-commit/OSLC/lyo-samples" - slug: "danlz/lyo-in-spring-boot" link: "https://github.com/danlz/lyo-in-spring-boot" - version: "6.0.0--S" + version: "6.0.0" + ci_badge: "https://github.com/danlz/lyo-in-spring-boot/actions/workflows/maven.yml/badge.svg" pr_badge: "https://img.shields.io/github/issues-pr/danlz/lyo-in-spring-boot?label=PR" pr_link: "https://github.com/danlz/lyo-in-spring-boot/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc" issues_badge: "https://img.shields.io/github/issues/danlz/lyo-in-spring-boot/Type:%20Bug?label=bugs"