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.

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

Jakartaee build integration #11177

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions dev/cnf/build.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ instrument.ffdc: true
instrument.taskInjection: false
-buildpath.instrument: ${if;${instrument.disabled};;com.ibm.ws.ras.instrument\\;version=latest}

jakartaeeMe: false

# Don't upload sources or javadoc unless bundle overrides
-maven-release: ${if;${driver;gradle};remote;local}, sources;path=NONE, javadoc;path=NONE
-groupid: ${if;${test.project};test;dev}
Expand Down
5 changes: 5 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 @@ -561,6 +561,11 @@
<artifactId>smallrye-reactive-streams-operators</artifactId>
<version>1.0.10</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0-M1</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
Expand Down
1 change: 1 addition & 0 deletions dev/cnf/oss_dependencies.maven
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ io.reactivex.rxjava2:rxjava:2.2.13
io.smallrye.reactive:smallrye-reactive-converter-api:1.0.10
io.smallrye.reactive:smallrye-reactive-messaging-provider:1.0.8
io.smallrye.reactive:smallrye-reactive-streams-operators:1.0.10
jakarta.servlet:jakarta.servlet-api:5.0.0-M1
javax.activation:activation:1.1
javax.annotation:javax.annotation-api:1.2
javax.annotation:javax.annotation-api:1.3.1
Expand Down
4 changes: 4 additions & 0 deletions dev/cnf/oss_ibm.maven
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ com.ibm.ws.commons-collections:commons-collections:3.2.1
com.ibm.ws:geronimo-validation:1.1
com.ibm.ws.internal.prereq.java:java.rtSunKrb5:1.8.0
com.ibm.ws.internal.prereq.java:java.ibmjgssprovider:1.8.0
com.ibm.ws:jakartaee-transformer:0.0.2
biz.aQute.bnd:biz.aQute.bndlib:4.3.1
commons-cli:commons-cli:1.4
org.slf4j:slf4j-simple:1.7.29
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is supposed to be in alphabetical order

com.ibm.ws.javax.j2ee:connector:1.6
com.ibm.ws.javax.j2ee:el:2.2
com.ibm.ws.javax.j2ee:jaxrpc:1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-include= ~${workspace}/cnf/resources/bnd/feature.props
symbolicName=com.ibm.websphere.appserver.jakarta.servlet-5.0
singleton=true
-bundles=com.ibm.websphere.jakarta.servlet.5.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.servlet:jakarta.servlet-api:5.0.0"
kind=noship
edition=core
WLP-Activation-Type: parallel
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
-include= ~${workspace}/cnf/resources/bnd/feature.props
symbolicName=com.ibm.websphere.appserver.servlet-5.0
visibility=public
singleton=true
IBM-App-ForceRestart: install, uninstall
IBM-ShortName: servlet-5.0
IBM-API-Package: jakarta.servlet.annotation; type="spec", \
jakarta.servlet.descriptor; type="spec", \
jakarta.servlet.resources; type="spec", \
jakarta.servlet.http; type="spec", \
jakarta.servlet; type="spec", \
com.ibm.websphere.servlet.session; type="ibm-api", \
com.ibm.wsspi.servlet.session; type="ibm-api", \
com.ibm.websphere.servlet.error; type="ibm-api", \
com.ibm.websphere.servlet.container; type="ibm-api", \
com.ibm.websphere.servlet.context; type="ibm-api", \
com.ibm.websphere.servlet.event; type="ibm-api", \
com.ibm.websphere.webcontainer; type="ibm-api", \
com.ibm.wsspi.webcontainer; type="internal", \
com.ibm.wsspi.webcontainer.annotation; type="internal"
IBM-SPI-Package: com.ibm.wsspi.webcontainer, \
com.ibm.wsspi.webcontainer.collaborator, \
com.ibm.wsspi.webcontainer.extension, \
com.ibm.wsspi.webcontainer.filter, \
com.ibm.wsspi.webcontainer.metadata, \
com.ibm.wsspi.webcontainer.osgi.extension, \
com.ibm.wsspi.webcontainer.servlet, \
com.ibm.wsspi.webcontainer.webapp, \
com.ibm.websphere.servlet.filter, \
com.ibm.websphere.servlet.response, \
com.ibm.ws.webcontainer.extension, \
com.ibm.websphere.servlet.request, \
com.ibm.ws.webcontainer.spiadapter.collaborator, \
com.ibm.websphere.webcontainer.async
Subsystem-Category: JavaEE8Application
-features=com.ibm.websphere.appserver.injection-1.0, \
com.ibm.websphere.appserver.artifact-1.0, \
com.ibm.websphere.appserver.containerServices-1.0, \
com.ibm.websphere.appserver.javaeedd-1.0, \
com.ibm.websphere.appserver.classloading-1.0, \
com.ibm.websphere.appserver.appmanager-1.0, \
com.ibm.websphere.appserver.javaeePlatform-8.0, \
com.ibm.websphere.appserver.anno-1.0, \
com.ibm.websphere.appserver.javax.annotation-1.3, \
com.ibm.websphere.appserver.httptransport-1.0, \
com.ibm.websphere.appserver.jakarta.servlet-5.0, \
com.ibm.websphere.appserver.requestProbes-1.0, \
com.ibm.websphere.appserver.javaeeCompatible-8.0, \
com.ibm.websphere.appserver.servlet-servletSpi1.0, \
com.ibm.websphere.appserver.javaeeddSchema-1.0
-bundles=com.ibm.ws.app.manager.war, \
com.ibm.ws.managedobject, \
com.ibm.ws.org.apache.commons.io, \
com.ibm.websphere.security, \
com.ibm.ws.org.apache.commons.fileupload.jakarta, \
com.ibm.ws.webcontainer.servlet.4.0.jakarta, \
com.ibm.ws.webcontainer.servlet.4.0.factories.jakarta, \
com.ibm.ws.webcontainer.servlet.3.1.jakarta, \
com.ibm.ws.session.jakarta, \
com.ibm.ws.webcontainer.jakarta, \
com.ibm.ws.webcontainer.cors.jakarta, \
com.ibm.ws.http.plugin.merge, \
com.ibm.ws.webserver.plugin.runtime.jakarta, \
com.ibm.ws.webserver.plugin.runtime.interfaces
-jars=com.ibm.ws.webserver.plugin.utility, \
com.ibm.websphere.appserver.api.servlet; location:=dev/api/ibm/
-files=bin/tools/ws-webserverPluginutil.jar, \
bin/pluginUtility; ibm.executable:=true; ibm.file.encoding:=ebcdic, \
bin/pluginUtility.bat, \
dev/api/ibm/javadoc/com.ibm.websphere.appserver.api.servlet_1.1-javadoc.zip
Subsystem-Name: Java Servlets 5.0
kind=noship
edition=core
WLP-Activation-Type: parallel
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
###############################################################################
# Copyright (c) 2014 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
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
#
#ISMESSAGEFILE FALSE
#NLS_ENCODING=UNICODE
#NLS_MESSAGEFORMAT_NONE
#

description=This feature enables support for HTTP Servlets written to the Java Servlet 4.0 specification. \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be easy to forget to change this version number later!

You can package servlets in Java EE specified WAR or EAR files. If servlet security is required, you \
should also configure an appSecurity feature. Without a security feature, any security \
constraints for the application are ignored.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
###############################################################################
# Copyright (c) 2014 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
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
#
#ISMESSAGEFILE FALSE
#NLS_ENCODING=UNICODE
#NLS_MESSAGEFORMAT_NONE
#

description=Tato funkce umo\u017e\u0148uje podporu pro servlety HTTP zapsan\u00e9 do specifikace produktu Java Servlet 4.0. \
Servlety m\u016f\u017eete zabalit do prost\u0159ed\u00ed Java EE ur\u010den\u00e9ho soubory WAR nebo EAR. \
Je-li zabezpe\u010den\u00ed servletu nezbytn\u00e9, m\u011bli byste rovn\u011b\u017e zkonfigurovat funkci appSecurity. \
Bez funkce zabezpe\u010den\u00ed jsou jak\u00e1koli omezen\u00ed zabezpe\u010den\u00ed pro aplikaci ignorov\u00e1na.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
###############################################################################
# Copyright (c) 2014 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
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
#
#ISMESSAGEFILE FALSE
#NLS_ENCODING=UNICODE
#NLS_MESSAGEFORMAT_NONE
#

description=Dieses Feature erm\u00f6glicht die Unterst\u00fctzung f\u00fcr HTTP-Servlets, die f\u00fcr die Java Servlet 4.0-Spezifikation geschrieben wurden. \
Sie k\u00f6nnen Servlets in WAR- oder EAR-Dateien packen, f\u00fcr die Java EE angegeben ist. \
Wenn die Servletsicherheit erforderlich ist, m\u00fcssen Sie auch ein an appSecurity-Feature konfigurieren. \
Ohne Sicherheitsfeature werden alle Sicherheitsvorgaben f\u00fcr die Anwendung ignoriert.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
###############################################################################
# Copyright (c) 2014 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
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
#
#ISMESSAGEFILE FALSE
#NLS_ENCODING=UNICODE
#NLS_MESSAGEFORMAT_NONE
#

description=Esta caracter\u00edstica habilita el soporte para servlets HTTP escritos para la especificaci\u00f3n Java Servlet 4.0. \
Puede empaquetar servlets en archivos WAR o EAR con especificaci\u00f3n de Java EE. \
Si la seguridad del servlet es necesaria, tambi\u00e9n deber\u00e1 configurar una caracter\u00edstica appSecurity. \
Sin una caracter\u00edstica de seguridad, se ignoran las restricciones de seguridad para la aplicaci\u00f3n.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
###############################################################################
# Copyright (c) 2014 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
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
#
#ISMESSAGEFILE FALSE
#NLS_ENCODING=UNICODE
#NLS_MESSAGEFORMAT_NONE
#

description=Cette fonction permet la prise en charge de servlets HTTP r\u00e9dig\u00e9s d'apr\u00e8s la sp\u00e9cification Java Servlet 4.0. \
Vous pouvez packager les servlets dans des fichiers WAR ou EAR Java EE. \
Si la s\u00e9curit\u00e9 de servlet est requise, vous devez aussi configurer une fonction appSecurity. \
Sans fonction de s\u00e9curit\u00e9, les contraintes de s\u00e9curit\u00e9 pour l'application sont ignor\u00e9es.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
###############################################################################
# Copyright (c) 2014 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
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
#
#ISMESSAGEFILE FALSE
#NLS_ENCODING=UNICODE
#NLS_MESSAGEFORMAT_NONE
#

description=Ez a szolg\u00e1ltat\u00e1s teszi lehet\u0151v\u00e9 a Java Servlet 4.0 specifik\u00e1ci\u00f3ra \u00edrt HTTP szervletek t\u00e1mogat\u00e1s\u00e1t. \
Szervleteket csomagolhat Java EE \u00e1ltal meghat\u00e1rozott WAR vagy EAR f\u00e1jlokba. \
Ha szervlet biztons\u00e1g sz\u00fcks\u00e9ges, akkor konfigur\u00e1lhat egy appSecurity szolg\u00e1ltat\u00e1st is. \
Biztons\u00e1gi szolg\u00e1ltat\u00e1s n\u00e9lk\u00fcl az alkalmaz\u00e1s biztons\u00e1gi megszor\u00edt\u00e1sai figyelmen k\u00edv\u00fcl maradnak.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
###############################################################################
# Copyright (c) 2014 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
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
#
#ISMESSAGEFILE FALSE
#NLS_ENCODING=UNICODE
#NLS_MESSAGEFORMAT_NONE
#

description=Questa funzione abilita il supporto per i servlet HTTP scritto nella specifica Java Servlet 4.0. \
\u00c8 possibile impacchettare i servlet in file WAR o EAR specificati da Java EE. \
Se \u00e8 necessaria la protezione dei servlet occorre configurare anche la funzione appSecurity. \
Senza una funzione di sicurezza qualsiasi vincolo di sicurezza per l'applicazione verr\u00e0 ignorato.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
###############################################################################
# Copyright (c) 2014 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
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
#
#ISMESSAGEFILE FALSE
#NLS_ENCODING=UNICODE
#NLS_MESSAGEFORMAT_NONE
#

description=\u3053\u306e\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u306f\u3001Java \u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 4.0 \u4ed5\u69d8\u306b\u8a18\u8ff0\u3055\u308c\u305f HTTP \u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306e\u30b5\u30dd\u30fc\u30c8\u3092\u6709\u52b9\u306b\u3057\u307e\u3059\u3002\
\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306f\u3001Java EE \u3067\u898f\u5b9a\u3055\u308c\u3066\u3044\u308b WAR \u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306f EAR \u30d5\u30a1\u30a4\u30eb\u306b\u30d1\u30c3\u30b1\u30fc\u30b8\u5316\u3067\u304d\u307e\u3059\u3002 \
\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u304c\u5fc5\u8981\u306a\u5834\u5408\u3001appSecurity \u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u3082\u69cb\u6210\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 \
\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u30fb\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u304c\u542b\u307e\u308c\u3066\u3044\u306a\u3044\u3068\u3001\u305d\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u3059\u3079\u3066\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u5236\u7d04\u304c\u7121\u8996\u3055\u308c\u307e\u3059\u3002
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
###############################################################################
# Copyright (c) 2014 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
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
#
#ISMESSAGEFILE FALSE
#NLS_ENCODING=UNICODE
#NLS_MESSAGEFORMAT_NONE
#

description=\uc774 \uae30\ub2a5\uc744 \ud1b5\ud574 Java Servlet 4.0 \uc2a4\ud399\uc73c\ub85c \uc791\uc131\ub41c HTTP Servlet\uc744 \uc9c0\uc6d0\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \
Java EE \uc9c0\uc815 WAR \ub610\ub294 EAR \ud30c\uc77c\uc5d0 \uc11c\ube14\ub9bf\uc744 \ud328\ud0a4\uc9c0\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \
\uc11c\ube14\ub9bf \ubcf4\uc548\uc774 \ud544\uc694\ud55c \uacbd\uc6b0 appSecurity \uae30\ub2a5\ub3c4 \uad6c\uc131\ud574\uc57c \ud569\ub2c8\ub2e4.\
\ubcf4\uc548 \uae30\ub2a5\uc774 \uc5c6\uc73c\uba74 \uc560\ud50c\ub9ac\ucf00\uc774\uc158\uc5d0 \ub300\ud55c \ubcf4\uc548 \uc81c\ud55c\uc870\uac74\uc774 \ubb34\uc2dc\ub429\ub2c8\ub2e4.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
###############################################################################
# Copyright (c) 2014 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
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
#
#ISMESSAGEFILE FALSE
#NLS_ENCODING=UNICODE
#NLS_MESSAGEFORMAT_NONE
#

description=Ten sk\u0142adnik umo\u017cliwia obs\u0142ug\u0119 serwlet\u00f3w HTTP \
zgodnych ze specyfikacj\u0105 Java Servlet 4.0. \
Serwlety mo\u017cna pakowa\u0107 do plik\u00f3w WAR lub EAR okre\u015blonych w \u015brodowisku Java EE. \
Je\u015bli wymagane s\u0105 zabezpieczenia serwlet\u00f3w, nale\u017cy r\u00f3wnie\u017c skonfigurowa\u0107 sk\u0142adnik zabezpiecze\u0144 aplikacji. \
Je\u015bli brak sk\u0142adnika zabezpiecze\u0144, wszystkie ograniczenia zabezpiecze\u0144 dotycz\u0105ce aplikacji s\u0105 ignorowane.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
###############################################################################
# Copyright (c) 2014 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
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
#
#ISMESSAGEFILE FALSE
#NLS_ENCODING=UNICODE
#NLS_MESSAGEFORMAT_NONE
#

description=Este recurso permite o suporte para Servlets HTTP gravados na especifica\u00e7\u00e3o de Java Servlet 4.0. \
\u00c9 poss\u00edvel empacotar servlets em arquivos WAR ou EAR especificados pelo Java EE. \
Se seguran\u00e7a de servlet for necess\u00e1ria, ser\u00e1 necess\u00e1rio configurar um recurso appSecurity. \
Sem um recurso de seguran\u00e7a, qualquer restri\u00e7\u00e3o de seguran\u00e7a do aplicativo ser\u00e1 ignorada.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
###############################################################################
# Copyright (c) 2014 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
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
#
#ISMESSAGEFILE FALSE
#NLS_ENCODING=UNICODE
#NLS_MESSAGEFORMAT_NONE
#

description=Aceast\u0103 caracteristic\u0103 permite suportul pentru servleturile HTTP scrise \u00een specifica\u0163ia Java Servlet 4.0. \
Pute\u0163i \u00eempacheta servleturile \u00een fi\u015fiere WAR sau EAR conform specifica\u0163iei Java EE. \
Dac\u0103 este necesar\u0103 securitatea servletului, ar trebui de asemenea s\u0103 configura\u0163i o caracteristic\u0103 appSecurity. \
F\u0103r\u0103 o caracteristic\u0103 de securitate, constr\u00e2ngerile de securitate pentru aplica\u0163ie sunt ignorate.
Loading