Skip to content

Commit

Permalink
Merge pull request #8 from ideas-into-software/jakarta-servlet-6-x
Browse files Browse the repository at this point in the history
Upgrade to Jakarta Servlet API 6.x, and more
  • Loading branch information
juergen-albert committed Aug 23, 2023
2 parents 0b1c1a8 + 3ed128d commit 7ce0376
Show file tree
Hide file tree
Showing 38 changed files with 1,171 additions and 872 deletions.
37 changes: 21 additions & 16 deletions cnf/ext/central.maven
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,11 @@ org.slf4j:slf4j-jcl:1.7.36

commons-logging:commons-logging:1.2

org.osgi:osgi.annotation:7.0.0
org.osgi:osgi.cmpn:7.0.0
org.osgi:osgi.core:7.0.0
org.osgi:org.osgi.util.pushstream:1.0.0
org.osgi:org.osgi.util.function:1.1.0
org.osgi:org.osgi.util.promise:1.1.0
org.osgi:org.osgi.util.converter:1.0.1
org.osgi:org.osgi.service.component:1.5.1
org.osgi:org.osgi.service.component.annotations:1.5.1

com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.9.7
com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider:2.9.7
com.fasterxml.jackson.jaxrs:jackson-jaxrs-yaml-provider:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-properties:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.7
com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.7
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.9.7
com.fasterxml.jackson.core:jackson-core:2.9.7
Expand All @@ -36,17 +28,30 @@ com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.7

org.bndtools:org.bndtools.templates.osgi:5.3.0

org.eclipse.platform:org.eclipse.osgi:3.13.100
org.eclipse.platform:org.eclipse.osgi:3.18.400

biz.aQute:biz.aQute.gogo.commands.provider:1.7.0
biz.aQute:biz.aQute.gogo.commands.provider:1.10.0

org.jline:jline-builtins:3.17.1
org.jline:jline-reader:3.17.1
org.jline:jline-terminal:3.17.1

jakarta.json:jakarta.json-api:2.1.1

org.eclipse.jetty:jetty-client:9.4.12.v20180830
org.eclipse.jetty:jetty-http:9.4.12.v20180830
org.eclipse.jetty:jetty-io:9.4.12.v20180830
org.eclipse.jetty:jetty-util:9.4.12.v20180830
org.eclipse.jetty:jetty-client:12.0.0.beta4
org.eclipse.jetty:jetty-alpn-client:12.0.0.beta4
org.eclipse.jetty:jetty-http:12.0.0.beta4
org.eclipse.jetty:jetty-io:12.0.0.beta4
org.eclipse.jetty:jetty-util:12.0.0.beta4

org.yaml:snakeyaml:1.23

# PLEASE NOTE: until 'SNAPSHOT' artifacts listed below are officially released, build and install those into your local Maven repository from
# https://github.com/ideas-into-software/commons-fileupload/tree/osgi-enhancements branch
org.apache.commons:commons-fileupload2-core:2.0.0-M3-SNAPSHOT
org.apache.commons:commons-fileupload2-jakarta-servlet6:2.0.0-M3-SNAPSHOT

commons-io:commons-io:2.13.0

org.eclipse.parsson:parsson:1.1.4
org.eclipse.parsson:jakarta.json:1.1.2
17 changes: 9 additions & 8 deletions cnf/ext/project.maven
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,19 @@ com.fasterxml.jackson.core:jackson-core:2.14.2
com.fasterxml.jackson.core:jackson-databind:2.14.2
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.2

com.graphql-java:graphql-java:20.2
com.graphql-java:graphql-java:19.5
com.graphql-java:java-dataloader:3.2.0

# included from local repo - downgraded to Jakarta Servlet API 5.x
#com.graphql-java-kickstart:graphql-java-servlet:15.0.0
#com.graphql-java-kickstart:graphql-java-kickstart:15.0.0
com.graphql-java-kickstart:graphql-java-servlet:15.0.0
com.graphql-java-kickstart:graphql-java-kickstart:15.0.0

com.graphql-java:graphql-java-extended-scalars:20.0
com.graphql-java:graphql-java-extended-scalars:19.1

jakarta.servlet:jakarta.servlet-api:5.0.0
jakarta.websocket:jakarta.websocket-api:2.1.0
jakarta.websocket:jakarta.websocket-client-api:2.1.0
io.github.graphql-java:graphql-java-annotations:9.1

jakarta.servlet:jakarta.servlet-api:6.0.0
jakarta.websocket:jakarta.websocket-api:2.1.1
jakarta.websocket:jakarta.websocket-client-api:2.1.1

org.reactivestreams:reactive-streams:1.0.4

Expand Down
53 changes: 31 additions & 22 deletions cnf/ext/repo_felix.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
revision = "${dependencies.felix.all}";\
transitive = false

# PLEASE NOTE: until 'SNAPSHOT' artifacts listed below are officially released, build and install those into your local Maven repository from
# https://github.com/DataInMotion/felix-dev/tree/jakarta-servlet-6-x branch

dependencies.felix.all: \
org.apache.felix:org.apache.felix.cm.json:1.0.6,\
org.apache.felix:org.apache.felix.cm.json:2.0.0,\
org.apache.felix:org.apache.felix.configadmin:1.9.8,\
org.apache.felix:org.apache.felix.configadmin.plugin.interpolation:1.1.0,\
org.apache.felix:org.apache.felix.configurator:1.0.8,\
org.apache.felix:org.apache.felix.configadmin.plugin.interpolation:1.2.6,\
org.apache.felix:org.apache.felix.configurator:1.0.18,\
org.apache.felix:org.apache.felix.connect:0.2.0,\
org.apache.felix:org.apache.felix.converter:1.0.18,\
org.apache.felix:org.apache.felix.coordinator:1.0.2,\
Expand All @@ -25,35 +28,41 @@ dependencies.felix.all: \
org.apache.felix:org.apache.felix.gogo.shell:1.1.4,\
org.apache.felix:org.apache.felix.healthcheck.annotation:2.0.0,\
org.apache.felix:org.apache.felix.healthcheck.api:2.0.4,\
org.apache.felix:org.apache.felix.healthcheck.core:2.0.14,\
org.apache.felix:org.apache.felix.healthcheck.core:4.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.healthcheck.generalchecks:3.0.4,\
org.apache.felix:org.apache.felix.healthcheck.webconsoleplugin:2.0.2,\
org.apache.felix:org.apache.felix.http.base:5.0.2,\
org.apache.felix:org.apache.felix.http.bridge:5.0.4,\
org.apache.felix:org.apache.felix.http.jetty:5.0.4,\
org.apache.felix:org.apache.felix.http.proxy:4.0.0,\
org.apache.felix:org.apache.felix.http.servlet-api:2.1.0,\
org.apache.felix:org.apache.felix.http.sslfilter:2.0.0,\
org.apache.felix:org.apache.felix.http.whiteboard:4.0.0,\
org.apache.felix:org.apache.felix.inventory:1.1.0,\
org.apache.felix:org.apache.felix.healthcheck.webconsoleplugin:4.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.http.base:6.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.http.bridge:6.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.http.jetty:6.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.http.proxy:6.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.http.servlet-api:4.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.http.sslfilter:4.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.inventory:3.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.jaas:1.0.2,\
org.apache.felix:org.apache.felix.log:1.2.6,\
org.apache.felix:org.apache.felix.log:1.3.0,\
org.apache.felix:org.apache.felix.log.extension:1.0.0,\
org.apache.felix:org.apache.felix.logback:1.0.6,\
org.apache.felix:org.apache.felix.metatype:1.2.4,\
org.apache.felix:org.apache.felix.prefs:1.1.0,\
org.apache.felix:org.apache.felix.resolver:2.0.4,\
org.apache.felix:org.apache.felix.rootcause:0.2.0,\
org.apache.felix:org.apache.felix.scr:2.2.6,\
org.apache.felix:org.apache.felix.shell:1.4.3,\
org.apache.felix:org.apache.felix.systemready:0.6.0,\
org.apache.felix:org.apache.felix.useradmin:1.0.4,\
org.apache.felix:org.apache.felix.useradmin.filestore:1.0.2,\
org.apache.felix:org.apache.felix.useradmin.mongodb:1.0.1,\
org.apache.felix:org.apache.felix.webconsole:4.8.8,\
org.apache.felix:org.apache.felix.webconsole.plugins.ds:2.2.0,\
org.apache.felix:org.apache.felix.webconsole.plugins.event:1.1.8,\
org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:1.0.10,\
org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin:1.0.4,\
org.apache.felix:org.apache.felix.webconsole.plugins.scriptconsole:1.0.2,\
org.apache.felix:org.apache.felix.webconsole.plugins.subsystems:0.1.0,\
org.apache.felix:org.apache.felix.webconsole.plugins.useradmin:1.0.2
org.apache.felix:org.apache.felix.webconsole:6.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.webconsole.plugins.deppack:3.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.webconsole.plugins.ds:4.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.webconsole.plugins.event:3.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.webconsole.plugins.gogo:2.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:3.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.webconsole.plugins.metatype:2.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.webconsole.plugins.obr:3.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin:3.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.webconsole.plugins.scriptconsole:3.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.webconsole.plugins.shell:3.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.webconsole.plugins.subsystems:2.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.webconsole.plugins.upnp:3.0.0-SNAPSHOT,\
org.apache.felix:org.apache.felix.webconsole.plugins.useradmin:3.0.0-SNAPSHOT
86 changes: 86 additions & 0 deletions cnf/ext/repo_osgiR8.bnd
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
-plugin.repo.OSGiSpecR8: \
aQute.bnd.repository.maven.pom.provider.BndPomRepository;\
releaseUrl = "https://repo.maven.apache.org/maven2/";\
snapshotUrl = "https://oss.sonatype.org/content/repositories/snapshots/";\
name = "OSGi Spec R8 Dependencies";\
revision = "${dependencies.osgi.r8.all}";\
transitive = false

# PLEASE NOTE: until 'org.osgi:org.osgi.service.servlet:3.0.0-SNAPSHOT' artifact is officially released, build and install it into your local Maven repository from
# https://github.com/ideas-into-software/osgi/tree/requirements/597 branch

dependencies.osgi.r8.all: \
org.osgi:osgi.core:8.0.0,\
org.osgi:osgi.annotation:8.1.0,\
org.osgi:org.osgi.annotation.bundle:2.0.0,\
org.osgi:org.osgi.annotation.versioning:1.1.2,\
org.osgi:org.osgi.framework:1.10.0,\
org.osgi:org.osgi.dto:1.1.1,\
org.osgi:org.osgi.jmx:1.1.0,\
org.osgi:org.osgi.namespace.contract:1.0.0,\
org.osgi:org.osgi.namespace.extender:1.0.1,\
org.osgi:org.osgi.namespace.implementation:1.0.0,\
org.osgi:org.osgi.namespace.service:1.0.0,\
org.osgi:org.osgi.namespace.unresolvable:1.0.0,\
org.osgi:org.osgi.resource:1.0.1,\
org.osgi:org.osgi.service.application:1.1.0,\
org.osgi:org.osgi.service.async:1.0.0,\
org.osgi:org.osgi.service.blueprint:1.0.2,\
org.osgi:org.osgi.service.clusterinfo:1.0.0,\
org.osgi:org.osgi.service.cdi:1.0.1,\
org.osgi:org.osgi.service.cm:1.6.1,\
org.osgi:org.osgi.service.component:1.5.1,\
org.osgi:org.osgi.service.component.annotations:1.5.1,\
org.osgi:org.osgi.service.condition:1.0.0,\
org.osgi:org.osgi.service.condpermadmin:1.1.2,\
org.osgi:org.osgi.service.configurator:1.0.1,\
org.osgi:org.osgi.service.coordinator:1.0.2,\
org.osgi:org.osgi.service.dal:1.0.2,\
org.osgi:org.osgi.service.dal.functions:1.0.1,\
org.osgi:org.osgi.service.deploymentadmin:1.1.0,\
org.osgi:org.osgi.service.device:1.1.1,\
org.osgi:org.osgi.service.dmt:2.0.2,\
org.osgi:org.osgi.service.enocean:1.0.1,\
org.osgi:org.osgi.service.event:1.4.1,\
org.osgi:org.osgi.service.http:1.2.2,\
org.osgi:org.osgi.service.http.whiteboard:1.1.1,\
org.osgi:org.osgi.service.io:1.0.0,\
org.osgi:org.osgi.service.jaxrs:1.0.1,\
org.osgi:org.osgi.service.jdbc:1.1.0,\
org.osgi:org.osgi.service.jndi:1.0.1,\
org.osgi:org.osgi.service.jpa:1.1.1,\
org.osgi:org.osgi.service.log:1.5.0,\
org.osgi:org.osgi.service.metatype:1.4.1,\
org.osgi:org.osgi.service.metatype.annotations:1.4.1,\
org.osgi:org.osgi.service.monitor:1.0.0,\
org.osgi:org.osgi.service.networkadapter:1.0.1,\
org.osgi:org.osgi.service.packageadmin:1.2.1,\
org.osgi:org.osgi.service.permissionadmin:1.2.1,\
org.osgi:org.osgi.service.prefs:1.1.2,\
org.osgi:org.osgi.service.provisioning:1.2.0,\
org.osgi:org.osgi.service.remoteserviceadmin:1.1.0,\
org.osgi:org.osgi.service.repository:1.1.0,\
org.osgi:org.osgi.service.resolver:1.1.1,\
org.osgi:org.osgi.service.resourcemonitoring:1.0.1,\
org.osgi:org.osgi.service.rest:1.0.0,\
org.osgi:org.osgi.service.serial:1.0.1,\
org.osgi:org.osgi.service.serviceloader:1.0.0,\
org.osgi:org.osgi.service.servlet:3.0.0-SNAPSHOT,\
org.osgi:org.osgi.service.startlevel:1.1.1,\
org.osgi:org.osgi.service.subsystem:1.1.0,\
org.osgi:org.osgi.service.tr069todmt:1.0.2,\
org.osgi:org.osgi.service.transaction.control:1.0.0,\
org.osgi:org.osgi.service.upnp:1.2.1,\
org.osgi:org.osgi.service.url:1.0.1,\
org.osgi:org.osgi.service.usbinfo:1.0.1,\
org.osgi:org.osgi.service.useradmin:1.1.1,\
org.osgi:org.osgi.service.wireadmin:1.0.2,\
org.osgi:org.osgi.service.zigbee:1.0.1,\
org.osgi:org.osgi.util.converter:1.0.9,\
org.osgi:org.osgi.util.function:1.2.0,\
org.osgi:org.osgi.util.measurement:1.0.2,\
org.osgi:org.osgi.util.position:1.0.1,\
org.osgi:org.osgi.util.promise:1.3.0,\
org.osgi:org.osgi.util.pushstream:1.1.0,\
org.osgi:org.osgi.util.tracker:1.5.4,\
org.osgi:org.osgi.util.xml:1.0.2
Binary file not shown.
Binary file not shown.

0 comments on commit 7ce0376

Please sign in to comment.