Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for issue with Swagger Jakarta dependencies' OSGi metadata, and more #7

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix for issue with Swagger Jakarta dependencies' OSGi metadata, and more #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8207166
Fix for issue with Swagger Jakarta dependencies' OSGi metadata, and more
ideas-into-software Aug 27, 2023
ad6720f
Merge branch 'main' into swagger-jakarta
ideas-into-software Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gradle/buildOutputCleanup/cache.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Mon May 30 17:55:09 CEST 2022
#Thu Aug 17 22:19:12 CEST 2023
gradle.version=7.4.2
27 changes: 25 additions & 2 deletions cnf/ext/project.maven
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ commons-fileupload:commons-fileupload:1.4

commons-io:commons-io:2.6

# Swagger OpenAPI
# Swagger OpenAPI (Java Servlet) - to be removed once code is migrated to Jakarta
io.swagger.core.v3:swagger-annotations:2.1.0
io.swagger.core.v3:swagger-jaxrs2:2.1.0
io.swagger.core.v3:swagger-models:2.1.0
Expand All @@ -32,6 +32,29 @@ org.apache.commons:commons-lang3:3.7
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.2
io.github.classgraph:classgraph:4.6.32

# Swagger OpenAPI (Jakarta Servlet) - included from local repository for now
#io.swagger.core.v3:swagger-annotations-jakarta:2.2.16.SNAPSHOT
#io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.16.SNAPSHOT
#io.swagger.core.v3:swagger-models-jakarta:2.2.16.SNAPSHOT
#io.swagger.core.v3:swagger-integration-jakarta:2.2.16.SNAPSHOT
#io.swagger.core.v3:swagger-core-jakarta:2.2.16.SNAPSHOT

io.github.classgraph:classgraph:4.8.154
jakarta.xml.bind:jakarta.xml.bind-api:3.0.0
org.apache.commons:commons-lang3:3.13.0
org.yaml:snakeyaml:2.1

jakarta.validation:jakarta.validation-api:2.0.2
jakarta.validation:jakarta.validation-api:3.0.2
com.fasterxml.jackson.core:jackson-annotations:2.15.1
com.fasterxml.jackson.core:jackson-core:2.15.1
com.fasterxml.jackson.core:jackson-databind:2.15.1
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.1
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.1
com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:2.15.1
com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:2.15.1
com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.15.1

# Felix Deps
org.apache.felix:org.apache.felix.configurator:1.0.8
org.apache.felix:org.apache.felix.connect:0.2.0
Expand All @@ -51,7 +74,7 @@ org.apache.felix:org.apache.felix.healthcheck.webconsoleplugin:2.0.2
org.apache.felix:org.apache.felix.http.base:4.1.2
org.apache.felix:org.apache.felix.http.bridge:4.1.2
org.apache.felix:org.apache.felix.http.jetty:4.2.0
org.apache.felix:org.apache.felix.http.servlet-api:1.1.2
org.apache.felix:org.apache.felix.http.servlet-api:2.1.0
org.apache.felix:org.apache.felix.http.sslfilter:1.2.6
org.apache.felix:org.apache.felix.http.whiteboard:4.0.0
org.apache.felix:org.apache.felix.inventory:1.0.6
Expand Down
1,726 changes: 1,404 additions & 322 deletions cnf/local/index.xml
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added ....v3.swagger-annotations.jakarta/io.swagger.core.v3.swagger-annotations.jakarta-2.2.16.jar
View file
Open in desktop
Binary file not shown.
Binary file added ...o.swagger.core.v3.swagger-core.jakarta/io.swagger.core.v3.swagger-core.jakarta-2.2.16.jar
View file
Open in desktop
Binary file not shown.
Binary file added ....v3.swagger-integration.jakarta/io.swagger.core.v3.swagger-integration.jakarta-2.2.16.jar
View file
Open in desktop
Binary file not shown.
Binary file added ...er-v2.jakarta/io.swagger.core.v3.swagger-jaxrs2-servlet-initializer-v2.jakarta-2.2.16.jar
View file
Open in desktop
Binary file not shown.
Binary file added ...agger.core.v3.swagger-jaxrs2.jakarta/io.swagger.core.v3.swagger-jaxrs2.jakarta-2.2.16.jar
View file
Open in desktop
Binary file not shown.
Binary file added ...agger.core.v3.swagger-models.jakarta/io.swagger.core.v3.swagger-models.jakarta-2.2.16.jar
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions de.jena.mdo.emf.openapi/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
-library: enable-emf

-buildpath: \
io.swagger.core.v3.swagger-models
-buildpath: io.swagger.core.v3.swagger-models.jakarta
60 changes: 29 additions & 31 deletions de.jena.mdo.runtime/de.jena.mdo.runtime_base.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,24 +55,16 @@
-runproperties.base: \
org.osgi.service.http.port=-1,\
felix.cm.config.plugins=org.apache.felix.configadmin.plugin.interpolation

-runbundles: \
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.13.2,2.13.3)',\
com.sun.activation.javax.activation;version='[1.2.0,1.2.1)',\
de.dim.eclipse.core.runtime;version='[3.14.0,3.14.1)',\
de.dim.eclipse.osgi;version='[3.12.50,3.12.51)',\
de.dim.equinox.common;version='[3.9.0,3.9.1)',\
io.github.classgraph.classgraph;version='[4.6.32,4.6.33)',\
io.swagger.core.v3.swagger-annotations;version='[2.1.0,2.1.1)',\
io.swagger.core.v3.swagger-core;version='[2.1.0,2.1.1)',\
io.swagger.core.v3.swagger-integration;version='[2.1.0,2.1.1)',\
io.swagger.core.v3.swagger-jaxrs2;version='[2.1.0,2.1.1)',\
io.swagger.core.v3.swagger-models;version='[2.1.0,2.1.1)',\
jakarta.annotation-api;version='[1.3.5,1.3.6)',\
jakarta.validation.jakarta.validation-api;version='[2.0.2,2.0.3)',\
jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
javassist;version='[3.27.0,3.27.1)',\
javax.validation.api;version='[1.1.0,1.1.1)',\
lpg.runtime.java;version='[2.0.17,2.0.18)',\
org.apache.commons.commons-fileupload;version='[1.4.0,1.4.1)',\
org.apache.commons.io;version='[2.6.0,2.6.1)',\
Expand All @@ -81,7 +73,6 @@
org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\
org.apache.felix.gogo.shell;version='[1.1.4,1.1.5)',\
org.apache.felix.http.jetty;version='[4.2.0,4.2.1)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.apache.felix.inventory;version='[1.0.6,1.0.7)',\
org.apache.felix.metatype;version='[1.2.4,1.2.5)',\
org.apache.felix.webconsole;version='[4.6.0,4.6.1)',\
Expand All @@ -100,6 +91,7 @@
org.eclipse.ocl.common;version='[1.8.400,1.8.401)',\
org.eclipse.ocl.ecore;version='[3.14.0,3.14.1)',\
org.gecko.core.pool;version='[1.1.0,1.1.1)',\
org.gecko.emf.json;version='[1.4.1,1.4.2)',\
org.gecko.emf.rest;version='[1.4.1,1.4.2)',\
org.gecko.qvt.osgi.api;version='[4.1.1,4.1.2)',\
org.gecko.qvt.osgi.component;version='[1.0.6,1.0.7)',\
Expand All @@ -111,15 +103,13 @@
org.glassfish.hk2.utils;version='[2.6.1,2.6.2)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
org.osgi.util.pushstream;version='[1.0.1,1.0.2)',\
org.yaml.snakeyaml;version='[1.30.0,1.30.1)',\
slf4j.api;version='[1.7.25,1.7.26)',\
slf4j.simple;version='[1.7.25,1.7.26)',\
org.gecko.emf.pushstreams;version='[1.1.1,1.1.2)',\
org.gecko.emf.repository.api;version='[9.2.2,9.2.3)',\
org.gecko.emf.collections;version='[2.1.1,2.1.2)',\
org.gecko.emf.repository.mongo;version='[3.1.0,3.1.1)',\
org.mongodb.mongo-java-driver;version='[3.9.1,3.9.2)',\
de.jena.mdo.model;version=snapshot,\
de.jena.mdo.keycloak;version=snapshot,\
de.jena.mdo.keycloak.api;version=snapshot,\
de.jena.mdo.data.importer;version=snapshot,\
Expand Down Expand Up @@ -170,21 +160,13 @@
de.jena.mdo.geo.util;version=snapshot,\
de.jena.mdo.tree.model;version=snapshot,\
de.jena.mdo.example.tree.model;version=snapshot,\
jakarta.activation-api;version='[1.2.1,1.2.2)',\
org.osgi.service.component;version='[1.5.0,1.5.1)',\
org.osgi.service.http;version='[1.2.1,1.2.2)',\
org.gecko.emf.mongo.component;version='[6.0.6,6.0.7)',\
org.gecko.emf.mongo.pushstream;version='[6.0.6,6.0.7)',\
org.gecko.mongo.osgi.component;version='[6.0.6,6.0.7)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.14.2,2.14.3)',\
com.fasterxml.jackson.core.jackson-core;version='[2.14.2,2.14.3)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.14.2,2.14.3)',\
com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.13.2,2.13.3)',\
org.apache.commons.commons-codec;version='[1.15.0,1.15.1)',\
org.apache.commons.logging;version='[1.2.0,1.2.1)',\
org.apache.httpcomponents.httpclient;version='[4.5.14,4.5.15)',\
org.apache.httpcomponents.httpcore;version='[4.4.16,4.4.17)',\
org.gecko.emf.osgi.api;version='[4.1.1,4.1.2)',\
org.keycloak.keycloak-authz-client;version='[20.0.3,20.0.4)',\
org.keycloak.keycloak-common;version='[20.0.3,20.0.4)',\
org.keycloak.keycloak-core;version='[20.0.3,20.0.4)',\
Expand All @@ -207,22 +189,38 @@
org.gecko.emf.util.documentation.generators.markdown;version='[1.0.0,1.0.1)',\
org.gecko.emf.util.documentation.generators.markdown.component;version='[1.0.0,1.0.1)',\
org.gecko.emf.util.documentation.generators.plantuml;version='[1.0.0,1.0.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.4,1.3.5)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.osgi.service.http.whiteboard;version='[1.1.0,1.1.1)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.15.1,2.15.2)',\
com.fasterxml.jackson.core.jackson-core;version='[2.15.1,2.15.2)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.15.1,2.15.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.15.1,2.15.2)',\
com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.15.1,2.15.2)',\
io.github.classgraph.classgraph;version='[4.8.154,4.8.155)',\
io.swagger.core.v3.swagger-annotations.jakarta;version='[2.2.16,2.2.17)',\
io.swagger.core.v3.swagger-core.jakarta;version='[2.2.16,2.2.17)',\
io.swagger.core.v3.swagger-integration.jakarta;version='[2.2.16,2.2.17)',\
io.swagger.core.v3.swagger-jaxrs2.jakarta;version='[2.2.16,2.2.17)',\
io.swagger.core.v3.swagger-models.jakarta;version='[2.2.16,2.2.17)',\
jakarta.activation-api;version='[2.1.0,2.1.1)',\
jakarta.validation.jakarta.validation-api;version='[3.0.2,3.0.3)',\
jakarta.ws.rs-api;version='[3.1.0,3.1.1)',\
jakarta.xml.bind-api;version='[3.0.0,3.0.1)',\
org.apache.commons.lang3;version='[3.13.0,3.13.1)',\
org.apache.felix.http.servlet-api;version='[2.1.0,2.1.1)',\
org.yaml.snakeyaml;version='[2.1.0,2.1.1)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-properties;version='[2.14.2,2.14.3)',\
com.github.miachm.sods;version='[1.6.2,1.6.3)',\
de.jena.mdo.mediatypes.api;version=snapshot,\
de.jena.mdo.mediatypes.impl;version=snapshot,\
de.jena.mdo.model;version=snapshot,\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.4,1.3.5)',\
org.apache.commons.commons-text;version='[1.10.0,1.10.1)',\
org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.emf.common;version='[2.28.0,2.28.1)',\
org.eclipse.emf.ecore;version='[2.33.0,2.33.1)',\
org.eclipse.emf.ecore.xmi;version='[2.18.0,2.18.1)',\
org.gecko.emf.osgi.component;version='[5.0.0,5.0.1)',\
org.gecko.emf.osgi.model.info;version='[5.0.0,5.0.1)',\
org.gecko.emf.ods;version='[1.0.1,1.0.2)',\
org.gecko.emf.exporter;version='[1.0.1,1.0.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-properties;version='[2.14.2,2.14.3)',\
org.gecko.emf.json;version='[1.4.1,1.4.2)',\
org.gecko.emf.exporter.ods;version='[1.0.2,1.0.3)',\
de.jena.mdo.mediatypes.api;version=snapshot,\
de.jena.mdo.mediatypes.impl;version=snapshot
org.gecko.emf.ods;version='[1.0.1,1.0.2)',\
org.gecko.emf.osgi.component;version='[5.0.0,5.0.1)',\
org.gecko.emf.osgi.model.info;version='[5.0.0,5.0.1)',\
org.osgi.service.component;version='[1.5.0,1.5.1)'
14 changes: 7 additions & 7 deletions de.jena.mdo.tree.model/src/de/jena/mdo/model/dbtree/DBTree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public interface DBTree extends EObject {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- begin-model-doc -->
* Register Hauptdaten: Baumh�he
* Register Hauptdaten: Baumhöhe
* <!-- end-model-doc -->
* @return the value of the '<em>Height</em>' attribute.
* @see #setHeight(String)
Expand Down Expand Up @@ -360,7 +360,7 @@ public interface DBTree extends EObject {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- begin-model-doc -->
* Gattung/Art: vollst�ndige Bezeichnung (lat.+deu.)
* Gattung/Art: vollständige Bezeichnung (lat.+deu.)
* <!-- end-model-doc -->
* @return the value of the '<em>Genre Detail</em>' attribute.
* @see #setGenreDetail(String)
Expand All @@ -385,7 +385,7 @@ public interface DBTree extends EObject {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- begin-model-doc -->
* Wenn ein Baum gef�llt wurde,wird hier das Ausf�hrungsdatumder Ma�nahme angezeigt
* Wenn ein Baum gefällt wurde,wird hier das Ausführungsdatumder Maßnahme angezeigt
* <!-- end-model-doc -->
* @return the value of the '<em>Cut Date</em>' attribute.
* @see #setCutDate(Date)
Expand Down Expand Up @@ -435,7 +435,7 @@ public interface DBTree extends EObject {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- begin-model-doc -->
* GIS-ID f�r interaktive GIS-Kopplung
* GIS-ID für interaktive GIS-Kopplung
* <!-- end-model-doc -->
* @return the value of the '<em>Gis Id</em>' attribute.
* @see #setGisId(String)
Expand Down Expand Up @@ -485,7 +485,7 @@ public interface DBTree extends EObject {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- begin-model-doc -->
* Register Hauptdaten: Vitalit�t des Baumes
* Register Hauptdaten: Vitalität des Baumes
* <!-- end-model-doc -->
* @return the value of the '<em>Vitality</em>' attribute.
* @see #setVitality(int)
Expand All @@ -510,7 +510,7 @@ public interface DBTree extends EObject {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- begin-model-doc -->
* k�nnen feste Touren f�r widerkehrende Aufgaben hinterlegt werden (gie�en, Kontrollen...)
* können feste Touren für widerkehrende Aufgaben hinterlegt werden (gießen, Kontrollen...)
* <!-- end-model-doc -->
* @return the value of the '<em>Tour</em>' attribute.
* @see #setTour(String)
Expand All @@ -535,7 +535,7 @@ public interface DBTree extends EObject {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- begin-model-doc -->
* r�umlich einen Pflegebereich (Stadtteil) zugeordnet
* räumlich einen Pflegebereich (Stadtteil) zugeordnet
* <!-- end-model-doc -->
* @return the value of the '<em>Department</em>' attribute.
* @see #setDepartment(String)
Expand Down