From: Mathieu Baudier Date: Mon, 16 Sep 2024 11:01:52 +0000 (+0200) Subject: Update to Eclipse 4.33 / RAP 4.0 + switch to jakarta.servlet X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=12964bcfcaac44fddf6b475748e0a738a712a2e0;p=gpl%2Fargeo-tp.git Update to Eclipse 4.33 / RAP 4.0 + switch to jakarta.servlet --- diff --git a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd index 03a6c8a..dbf6239 100644 --- a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd +++ b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd @@ -1,6 +1,6 @@ Bundle-SymbolicName: org.eclipse.jetty.websocket SPDX-License-Identifier: Apache-2.0 OR EPL-2.0 -Argeo-Origin-M2: :12.0.10 +Argeo-Origin-M2: :12.0.13 # TODO split ee8 and ee10 ? Argeo-Origin-M2-Merge: \ org.eclipse.jetty.websocket:jetty-websocket-core-client, \ @@ -17,12 +17,11 @@ org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-client, \ org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-common, \ org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-server,\ org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-jetty-server, \ - -#org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet, \ -#org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client, \ -#org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common, \ -#org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server,\ -#org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server, \ +org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet, \ +org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client, \ +org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common, \ +org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server,\ +org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server, \ Export-Package: org.eclipse.jetty.* diff --git a/repackage/org.argeo.tp.httpd/jetty/common.bnd b/repackage/org.argeo.tp.httpd/jetty/common.bnd index 096adf1..f0e92db 100644 --- a/repackage/org.argeo.tp.httpd/jetty/common.bnd +++ b/repackage/org.argeo.tp.httpd/jetty/common.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 OR EPL-2.0 -Argeo-Origin-M2: :12.0.10 +Argeo-Origin-M2: :12.0.13 diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd new file mode 100644 index 0000000..bf2d413 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.ee10:jetty-ee10-servlet +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd.future b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd.future deleted file mode 100644 index bf2d413..0000000 --- a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd.future +++ /dev/null @@ -1,2 +0,0 @@ -Argeo-Origin-M2: org.eclipse.jetty.ee10:jetty-ee10-servlet -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp/org.h2.bnd b/repackage/org.argeo.tp/org.h2.bnd index 10df674..1901a3a 100644 --- a/repackage/org.argeo.tp/org.h2.bnd +++ b/repackage/org.argeo.tp/org.h2.bnd @@ -6,6 +6,7 @@ Argeo-Origin-M2: com.h2database:h2:2.2.224 Import-Package:\ jakarta.*;resolution:=optional,\ +java.lang.instrument.*;resolution:=optional,\ org.apache.lucene.*;resolution:=optional,\ org.codehaus.groovy.*;resolution:=optional,\ org.osgi.*;resolution:=optional,\ diff --git a/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties b/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties index 4aaa947..9a0b15e 100644 --- a/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties +++ b/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties @@ -3,10 +3,10 @@ plugins/org.eclipse.equinox.cm*.jar= plugins/org.eclipse.equinox.ds*.jar= plugins/org.eclipse.equinox.metatype*.jar= plugins/org.eclipse.equinox.event*.jar= -plugins/org.eclipse.equinox.http.jetty*.jar= -plugins/org.eclipse.equinox.http.registry*.jar= -plugins/org.eclipse.equinox.http.servlet*.jar= -plugins/org.eclipse.equinox.http.servletbridge*.jar= +#plugins/org.eclipse.equinox.http.jetty*.jar= +#plugins/org.eclipse.equinox.http.registry*.jar= +#plugins/org.eclipse.equinox.http.servlet*.jar= +#plugins/org.eclipse.equinox.http.servletbridge*.jar= plugins/org.eclipse.equinox.preferences*.jar= plugins/org.eclipse.equinox.registry*.jar= plugins/org.eclipse.equinox.servletbridge*.jar= diff --git a/repackage/osgi/equinox/org.argeo.tp.eclipse/org.osgi.service.servlet.bnd b/repackage/osgi/equinox/org.argeo.tp.eclipse/org.osgi.service.servlet.bnd new file mode 100644 index 0000000..559cbe3 --- /dev/null +++ b/repackage/osgi/equinox/org.argeo.tp.eclipse/org.osgi.service.servlet.bnd @@ -0,0 +1,3 @@ +SPDX-License-Identifier: EPL-2.0 +Argeo-Origin-M2: org.osgi:org.osgi.service.servlet:2.0.0 +#Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties b/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties index 7d7a00b..03a38d4 100644 --- a/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties +++ b/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties @@ -12,3 +12,8 @@ plugins/org.eclipse.rap.ui.forms*.jar= plugins/org.eclipse.help*.jar= plugins/com.ibm.icu*.jar= plugins/org.eclipse.rap.jface.databinding*.jar= +# New with Eclipse RAP 4.0 +plugins/org.eclipse.rap.servletbridge*.jar= +plugins/org.eclipse.rap.http.registry*.jar= +plugins/org.eclipse.rap.http.servletbridge*.jar= +plugins/org.apache.commons.commons-beanutils*.jar= diff --git a/repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/includes.properties b/repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/includes.properties index adc73a6..2829771 100644 --- a/repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/includes.properties +++ b/repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/includes.properties @@ -7,3 +7,8 @@ plugins/org.eclipse.rap.fileupload*.jar= plugins/org.eclipse.rap.filedialog*.jar= plugins/org.eclipse.rap.jface_*.jar= plugins/org.eclipse.rap.jface.source_*.jar= +# New with Eclipse RAP 4.0 +plugins/org.eclipse.rap.http.servlet_*.jar= +plugins/org.eclipse.rap.http.servlet.source_*.jar= +plugins/org.eclipse.rap.http.jetty*.jar= +plugins/org.apache.commons.commons-fileupload2*.jar= diff --git a/repackage/uris.properties b/repackage/uris.properties index 7c360a3..497c275 100644 --- a/repackage/uris.properties +++ b/repackage/uris.properties @@ -1,5 +1,5 @@ -eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.32-202406010610/equinox-SDK-4.32.zip -eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.32-202406010610/org.eclipse.platform.source-4.32.zip -eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.29/e4/rap-e4-3.29.0-R-20240605-1615.zip +eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.33-202409030240/equinox-SDK-4.33.zip +eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.33-202409030240/org.eclipse.platform.source-4.33.zip +eclipse-rap=http://www.eclipse.org/downloads/rt/rap/4.0/e4/rap-e4-4.0.0-R-20240904-0717.zip # Nebula does not seem to provide archives anymore, 3.1.0 is available only as an update site -#eclipse-nebula=http://www.eclipse.org/downloads/nebula/releases/3.0.0/repository-nebula-3.0.0.zip \ No newline at end of file +#eclipse-nebula=http://www.eclipse.org/downloads/nebula/releases/3.0.0/repository-nebula-3.0.0.zip