Skip to content

Commit

Permalink
Add most of the missing EE10 component API bundles
Browse files Browse the repository at this point in the history
- Add missing api bundles except for a few which don't use the ones from
jakarta group.
- Update the version for the EE9 API bundles so it doesn't pull in the
EE10 API artifacts
- Update the jakarta version properties for the transformer to be right
for EE9, EE10 and the EE9/EE10 file.
- Update servlet and json b to their final API version
- Change to export servlet APIs as 6.0 instead of 5.0.
- Update buildpath and import statements to work with the new API
versions.
  • Loading branch information
jhanders34 committed Jun 24, 2022
1 parent 777da91 commit 4e413de
Show file tree
Hide file tree
Showing 70 changed files with 1,326 additions and 232 deletions.
65 changes: 65 additions & 0 deletions dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -696,16 +696,31 @@
<artifactId>jakarta.authentication-api</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.authentication</groupId>
<artifactId>jakarta.authentication-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.authorization</groupId>
<artifactId>jakarta.authorization-api</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.authorization</groupId>
<artifactId>jakarta.authorization-api</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.batch</groupId>
<artifactId>jakarta.batch-api</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.batch</groupId>
<artifactId>jakarta.batch-api</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
Expand Down Expand Up @@ -766,6 +781,11 @@
<artifactId>jakarta.json.bind-api</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
Expand All @@ -786,6 +806,11 @@
<artifactId>jakarta.mail-api</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
Expand All @@ -801,11 +826,21 @@
<artifactId>jakarta.resource-api</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.resource</groupId>
<artifactId>jakarta.resource-api</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.security.enterprise</groupId>
<artifactId>jakarta.security.enterprise-api</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.security.enterprise</groupId>
<artifactId>jakarta.security.enterprise-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
Expand All @@ -821,6 +856,11 @@
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
Expand All @@ -841,11 +881,26 @@
<artifactId>jakarta.websocket-api</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
Expand All @@ -861,11 +916,21 @@
<artifactId>jakarta.xml.soap-api</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.xml.soap</groupId>
<artifactId>jakarta.xml.soap-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
Expand Down
13 changes: 13 additions & 0 deletions dev/cnf/oss_dependencies.maven
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,11 @@ jakarta.activation:jakarta.activation-api:2.1.0-RC1
jakarta.annotation:jakarta.annotation-api:2.0.0
jakarta.annotation:jakarta.annotation-api:2.1.0
jakarta.authentication:jakarta.authentication-api:2.0.0
jakarta.authentication:jakarta.authentication-api:3.0.0
jakarta.authorization:jakarta.authorization-api:2.0.0
jakarta.authorization:jakarta.authorization-api:2.1.0
jakarta.batch:jakarta.batch-api:2.0.0
jakarta.batch:jakarta.batch-api:2.1.0
jakarta.ejb:jakarta.ejb-api:4.0.0
jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api:2.0.0
jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api:3.0.0
Expand All @@ -149,26 +152,36 @@ jakarta.interceptor:jakarta.interceptor-api:2.1.0
jakarta.jms:jakarta.jms-api:3.0.0
jakarta.jms:jakarta.jms-api:3.1.0
jakarta.json.bind:jakarta.json.bind-api:2.0.0
jakarta.json.bind:jakarta.json.bind-api:3.0.0
jakarta.json:jakarta.json-api:2.0.0
jakarta.json:jakarta.json-api:2.1.0
jakarta.jws:jakarta.jws-api:3.0.0
jakarta.mail:jakarta.mail-api:2.0.0
jakarta.mail:jakarta.mail-api:2.1.0
jakarta.persistence:jakarta.persistence-api:3.0.0
jakarta.persistence:jakarta.persistence-api:3.1.0
jakarta.resource:jakarta.resource-api:2.0.0
jakarta.resource:jakarta.resource-api:2.1.0
jakarta.security.enterprise:jakarta.security.enterprise-api:2.0.0
jakarta.security.enterprise:jakarta.security.enterprise-api:3.0.0
jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:2.0.0
jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.0.0
jakarta.servlet:jakarta.servlet-api:5.0.0
jakarta.servlet:jakarta.servlet-api:6.0.0
jakarta.transaction:jakarta.transaction-api:1.3.3
jakarta.transaction:jakarta.transaction-api:2.0.0
jakarta.validation:jakarta.validation-api:3.0.0
jakarta.websocket:jakarta.websocket-api:2.0.0
jakarta.websocket:jakarta.websocket-api:2.1.0
jakarta.websocket:jakarta.websocket-client-api:2.1.0
jakarta.ws.rs:jakarta.ws.rs-api:3.0.0
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0
jakarta.xml.bind:jakarta.xml.bind-api:3.0.1
jakarta.xml.bind:jakarta.xml.bind-api:4.0.0
jakarta.xml.soap:jakarta.xml.soap-api:2.0.0
jakarta.xml.soap:jakarta.xml.soap-api:3.0.0
jakarta.xml.ws:jakarta.xml.ws-api:3.0.0
jakarta.xml.ws:jakarta.xml.ws-api:4.0.0
javax.cache:cache-api:1.1.0
javax.ejb:javax.ejb-api:3.2
javax.enterprise:cdi-api:2.0.SP1
Expand Down
2 changes: 0 additions & 2 deletions dev/cnf/oss_ibm.maven
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.jpa:2.6.10.WAS-370741
com.ibm.ws.org.objenesis:objenesis:1.0
com.ibm.ws:geronimo-validation:1.1
com.ibm.ws:nekohtml:1.9.18
io.openliberty.jakarta.json.bind:jakarta.json.bind-api:3.0.0
io.openliberty.jakarta.servlet:jakarta.servlet-api:6.0.0.20220119
io.openliberty.org.eclipse.persistence:org.eclipse.persistence.core:4.0.0.70bac7a
io.openliberty.org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:4.0.0.70bac7a
io.openliberty.org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:4.0.0.70bac7a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ singleton=true
-features=\
com.ibm.websphere.appserver.eeCompatible-10.0
-bundles=\
io.openliberty.jakarta.authentication.2.0; location:=dev/api/spec/; mavenCoordinates="jakarta.authentication:jakarta.authentication-api:2.0.0"
io.openliberty.jakarta.authentication.3.0; location:=dev/api/spec/; mavenCoordinates="jakarta.authentication:jakarta.authentication-api:3.0.0"
kind=noship
edition=full

Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ singleton=true
-features=\
com.ibm.websphere.appserver.eeCompatible-10.0
-bundles=\
io.openliberty.jakarta.authorization.2.0; location:=dev/api/spec/; mavenCoordinates="jakarta.authorization:jakarta.authorization-api:2.0.0"
io.openliberty.jakarta.authorization.2.1; location:=dev/api/spec/; mavenCoordinates="jakarta.authorization:jakarta.authorization-api:2.1.0"
kind=noship
edition=full
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
symbolicName=io.openliberty.jakarta.connectors-2.1
singleton=true
-features=com.ibm.websphere.appserver.eeCompatible-10.0
-bundles=io.openliberty.jakarta.connectors.2.0; apiJar=false; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.resource:jakarta.resource-api:2.0.0"
-bundles=io.openliberty.jakarta.connectors.2.1; apiJar=false; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.resource:jakarta.resource-api:2.1.0"
kind=noship
edition=full
WLP-Activation-Type: parallel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ IBM-Process-Types: client, \
-features=com.ibm.websphere.appserver.eeCompatible-10.0, \
io.openliberty.jakarta.activation-2.1
-bundles=\
io.openliberty.jakarta.mail.2.0;location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.mail:jakarta.mail-api:2.0.0",\
io.openliberty.jakarta.mail.2.1;location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.mail:jakarta.mail-api:2.1.0",\
io.openliberty.com.sun.mail.jakarta.mail.2.0
kind=noship
edition=full
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Subsystem-Name: Jakarta RESTful Web Services 3.1
io.openliberty.jakarta.activation-2.1
-bundles=\
io.openliberty.jaxrs30; location:="dev/api/ibm/,lib/", \
io.openliberty.jakarta.restfulWS.3.0;location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.ws.rs:jakarta.ws.rs-api:3.0.0"
io.openliberty.jakarta.restfulWS.3.1;location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.ws.rs:jakarta.ws.rs-api:3.1.0"
-files=\
dev/api/ibm/javadoc/io.openliberty.jaxrs30_1.0-javadoc.zip
kind=noship
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ singleton=true
-features=\
com.ibm.websphere.appserver.eeCompatible-10.0
-bundles=\
io.openliberty.jakarta.security.2.0; location:=dev/api/spec/; mavenCoordinates="jakarta.security.enterprise:jakarta.security.enterprise-api:2.0.0"
io.openliberty.jakarta.security.3.0; location:=dev/api/spec/; mavenCoordinates="jakarta.security.enterprise:jakarta.security.enterprise-api:3.0.0"
kind=noship
edition=full

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
symbolicName=io.openliberty.jakarta.websocket-2.1
singleton=true
-features=com.ibm.websphere.appserver.eeCompatible-10.0
-bundles=io.openliberty.jakarta.websocket.2.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.websocket:jakarta.websocket-api:2.0.0"
-bundles=io.openliberty.jakarta.websocket.2.1; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.websocket:jakarta.websocket-api:2.1.0"
kind=noship
edition=full
WLP-Activation-Type: parallel
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Subsystem-Name: Jakarta XML Bindings 4.0
com.ibm.websphere.appserver.classloading-1.0, \
io.openliberty.jakarta.activation-2.1
-bundles=\
io.openliberty.jakarta.xmlBinding.3.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.xml.bind:jakarta.xml.bind-api:3.0.1", \
io.openliberty.jakarta.xmlBinding.4.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.xml.bind:jakarta.xml.bind-api:4.0.0", \
io.openliberty.org.glassfish.hk2.osgi-resource-locator
kind=noship
edition=full
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ singleton=true
-features=io.openliberty.jakarta.xmlBinding-4.0; apiJar=false, \
com.ibm.websphere.appserver.eeCompatible-10.0
-bundles=\
io.openliberty.jakarta.xmlWS.3.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.xml.ws:jakarta.xml.ws-api:3.0.0",\
io.openliberty.jakarta.soap.2.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.xml.soap:jakarta.xml.soap-api:2.0.0",\
io.openliberty.jakarta.jws.3.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.jws:jakarta.jws-api:3.0.0"
io.openliberty.jakarta.xmlWS.4.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.xml.ws:jakarta.xml.ws-api:4.0.0",\
io.openliberty.jakarta.soap.3.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.xml.soap:jakarta.xml.soap-api:3.0.0"
kind=noship
edition=full
WLP-Activation-Type: parallel
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ Subsystem-Name: Jakarta Batch 2.1
com.ibm.ws.security.credentials, \
com.ibm.websphere.security, \
com.ibm.jbatch.container.jakarta, \
io.openliberty.jakarta.batch.2.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.batch:jakarta.batch-api:2.0.0"

io.openliberty.jakarta.batch.2.1; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.batch:jakarta.batch-api:2.1.0"
kind=noship
edition=full
WLP-Activation-Type: parallel
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ visibility=public
singleton=true
IBM-App-ForceRestart: install, \
uninstall
IBM-API-Package: jakarta.websocket; version="2.0"; type="spec", \
jakarta.websocket.server; version="2.0"; type="spec", \
IBM-API-Package: jakarta.websocket; version="2.1"; type="spec", \
jakarta.websocket.server; version="2.1"; type="spec", \
com.ibm.websphere.wsoc; type="ibm-api"
IBM-ShortName: websocket-2.1
Subsystem-Name: Jakarta WebSocket 2.1
Expand Down
2 changes: 1 addition & 1 deletion dev/io.openliberty.cdi.4.0.internal.web/bnd.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ WS-TraceGroup: JCDI

-buildpath: \
io.openliberty.org.jboss.weld5;version=latest,\
io.openliberty.jakarta.servlet.5.0;version=latest,\
io.openliberty.jakarta.servlet.6.0;version=latest,\
io.openliberty.jakarta.expressionLanguage.5.0;version=latest,\
com.ibm.ws.org.osgi.annotation.versioning;version=latest,\
com.ibm.websphere.appserver.spi.logging;version=latest,\
Expand Down
4 changes: 2 additions & 2 deletions dev/io.openliberty.jakarta.authentication.2.0/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#*******************************************************************************
# Copyright (c) 2020 IBM Corporation and others.
# Copyright (c) 2020, 2022 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
Expand All @@ -24,5 +24,5 @@ instrument.disabled: true
publish.wlp.jar.suffix: dev/api/spec

-buildpath: \
jakarta.authentication:jakarta.authentication-api;version=2.0.0, \
jakarta.authentication:jakarta.authentication-api;version="[2.0.0,2.1.0)", \
com.ibm.ws.org.osgi.annotation.versioning;version=latest
4 changes: 2 additions & 2 deletions dev/io.openliberty.jakarta.authorization.2.0/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#*******************************************************************************
# Copyright (c) 2020 IBM Corporation and others.
# Copyright (c) 2020, 2022 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
Expand All @@ -21,4 +21,4 @@ instrument.disabled: true
publish.wlp.jar.suffix: dev/api/spec

-buildpath: \
jakarta.authorization:jakarta.authorization-api;version=2.0.0
jakarta.authorization:jakarta.authorization-api;version="[2.0.0,2.1.0)"
4 changes: 2 additions & 2 deletions dev/io.openliberty.jakarta.batch.2.0/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#*******************************************************************************
# Copyright (c) 2020 IBM Corporation and others.
# Copyright (c) 2020, 2022 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
Expand Down Expand Up @@ -42,6 +42,6 @@ instrument.disabled: true
publish.wlp.jar.suffix: dev/api/spec

-buildpath: \
jakarta.batch:jakarta.batch-api;version=2.0.0,\
jakarta.batch:jakarta.batch-api;version="[2.0.0,2.1.0)",\
com.ibm.websphere.org.osgi.core;version=latest

7 changes: 7 additions & 0 deletions dev/io.openliberty.jakarta.batch.2.1/.checkstyle
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
<fileset name="all" enabled="true" check-config-name="Javadoc" local="false">
<file-match-pattern match-pattern="." include-pattern="true"/>
</fileset>
</fileset-config>
7 changes: 7 additions & 0 deletions dev/io.openliberty.jakarta.batch.2.1/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="output" path="bin"/>
</classpath>
23 changes: 23 additions & 0 deletions dev/io.openliberty.jakarta.batch.2.1/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>io.openliberty.jakarta.batch.2.1</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>bndtools.core.bndbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>bndtools.core.bndnature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
compileErrorAction=build
eclipse.preferences.version=1
Loading

0 comments on commit 4e413de

Please sign in to comment.