From aae7e5c3b901487295750d66a860356f6ecd21ed Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 7 Dec 2023 12:21:35 +0100 Subject: [PATCH] Update to Eclipse 4.30 --- .../aarch64/org.argeo.tp.sys/com.sun.jna.bnd | 3 --- .../org.argeo.tp.sys/jna/com.sun.jna.bnd} | 2 +- .../jna/com.sun.jna.platform.bnd | 2 ++ .../aarch64/org.argeo.tp.sys/jna/common.bnd | 2 ++ .../x86_64/org.argeo.tp.sys/com.sun.jna.bnd | 3 --- .../org.argeo.tp.sys/jna/com.sun.jna.bnd | 2 ++ .../jna/com.sun.jna.platform.bnd | 2 ++ .../x86_64/org.argeo.tp.sys/jna/common.bnd | 2 ++ .../x86_64/org.argeo.tp.sys/com.sun.jna.bnd | 3 --- .../org.argeo.tp.sys/jna/com.sun.jna.bnd | 2 ++ .../jna/com.sun.jna.platform.bnd | 2 ++ .../x86_64/org.argeo.tp.sys/jna/common.bnd | 2 ++ .../x86_64/org.argeo.tp.sys/com.sun.jna.bnd | 3 --- .../org.argeo.tp.sys/jna/com.sun.jna.bnd | 2 ++ .../jna/com.sun.jna.platform.bnd | 2 ++ .../x86_64/org.argeo.tp.sys/jna/common.bnd | 2 ++ .../org.argeo.tp.httpd/jakarta.servlet.bnd | 3 +++ .../org.argeo.tp.httpd/jakarta.websocket.bnd | 3 +++ .../org.argeo.tp.httpd/javax.websocket.bnd | 2 +- .../jetty-websocket/merge.bnd | 26 +++++++++---------- repackage/org.argeo.tp.httpd/jetty/common.bnd | 2 +- .../jetty/org.eclipse.jetty.ee8.nested.bnd | 2 ++ .../jetty/org.eclipse.jetty.ee8.security.bnd | 2 ++ .../org.eclipse.jetty.ee8.server.bnd.disabled | 2 ++ .../jetty/org.eclipse.jetty.ee8.servlet.bnd | 2 ++ .../jetty/org.eclipse.jetty.http2.client.bnd | 2 +- .../jetty/org.eclipse.jetty.http2.common.bnd | 2 +- .../jetty/org.eclipse.jetty.http2.hpack.bnd | 2 +- .../jetty/org.eclipse.jetty.http2.server.bnd | 2 +- .../jetty/org.eclipse.jetty.servlet.bnd | 2 -- .../jetty/org.eclipse.jetty.servlets.bnd | 2 -- .../jetty/org.eclipse.jetty.session.bnd | 2 ++ .../flying-saucer/common.bnd | 2 -- .../flying-saucer/org.xhtmlrenderer.core.bnd | 1 - .../org.xhtmlrenderer.openpdf.bnd | 1 - .../org.xhtmlrenderer.swt.bnd.disabled | 4 --- .../org.argeo.tp.sys/com.sun.jna.platform.bnd | 3 --- .../eclipse-rap/includes.properties | 4 +-- .../eclipse-rap/includes.properties | 1 - .../eclipse-rcp/includes.properties | 4 +-- .../eclipse-nebula/excludes.properties | 2 -- .../eclipse-nebula/includes.properties | 2 -- repackage/uris.properties | 8 +++--- sdk/argeo-build | 2 +- 44 files changed, 67 insertions(+), 61 deletions(-) delete mode 100644 repackage/lib/linux/aarch64/org.argeo.tp.sys/com.sun.jna.bnd rename repackage/{swt/rcp/org.argeo.tp.swt/eclipse-nebula/common.bnd => lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.bnd} (51%) create mode 100644 repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd create mode 100644 repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd delete mode 100644 repackage/lib/linux/x86_64/org.argeo.tp.sys/com.sun.jna.bnd create mode 100644 repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd create mode 100644 repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd create mode 100644 repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd delete mode 100644 repackage/lib/macosx/x86_64/org.argeo.tp.sys/com.sun.jna.bnd create mode 100644 repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd create mode 100644 repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd create mode 100644 repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd delete mode 100644 repackage/lib/win32/x86_64/org.argeo.tp.sys/com.sun.jna.bnd create mode 100644 repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd create mode 100644 repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd create mode 100644 repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd create mode 100644 repackage/org.argeo.tp.httpd/jakarta.servlet.bnd create mode 100644 repackage/org.argeo.tp.httpd/jakarta.websocket.bnd create mode 100644 repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.nested.bnd create mode 100644 repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.security.bnd create mode 100644 repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.server.bnd.disabled create mode 100644 repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.servlet.bnd delete mode 100644 repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlet.bnd delete mode 100644 repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlets.bnd create mode 100644 repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.session.bnd delete mode 100644 repackage/org.argeo.tp.publish/flying-saucer/common.bnd delete mode 100644 repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.core.bnd delete mode 100644 repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.openpdf.bnd delete mode 100644 repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled delete mode 100644 repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd delete mode 100644 repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/excludes.properties delete mode 100644 repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/includes.properties diff --git a/repackage/lib/linux/aarch64/org.argeo.tp.sys/com.sun.jna.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/com.sun.jna.bnd deleted file mode 100644 index f5c1507..0000000 --- a/repackage/lib/linux/aarch64/org.argeo.tp.sys/com.sun.jna.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 -Argeo-Origin-M2: net.java.dev.jna:jna:5.13.0 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/common.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.bnd similarity index 51% rename from repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/common.bnd rename to repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.bnd index 743e1d3..9d0402c 100644 --- a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/common.bnd +++ b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-2.0 +Argeo-Origin-M2: net.java.dev.jna:jna Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd new file mode 100644 index 0000000..11a8eb3 --- /dev/null +++ b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: net.java.dev.jna:jna-platform +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd new file mode 100644 index 0000000..4379476 --- /dev/null +++ b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: :5.13.0 +SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 diff --git a/repackage/lib/linux/x86_64/org.argeo.tp.sys/com.sun.jna.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/com.sun.jna.bnd deleted file mode 100644 index f5c1507..0000000 --- a/repackage/lib/linux/x86_64/org.argeo.tp.sys/com.sun.jna.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 -Argeo-Origin-M2: net.java.dev.jna:jna:5.13.0 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd new file mode 100644 index 0000000..9d0402c --- /dev/null +++ b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: net.java.dev.jna:jna +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd new file mode 100644 index 0000000..11a8eb3 --- /dev/null +++ b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: net.java.dev.jna:jna-platform +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd new file mode 100644 index 0000000..4379476 --- /dev/null +++ b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: :5.13.0 +SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/com.sun.jna.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/com.sun.jna.bnd deleted file mode 100644 index f5c1507..0000000 --- a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/com.sun.jna.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 -Argeo-Origin-M2: net.java.dev.jna:jna:5.13.0 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd new file mode 100644 index 0000000..9d0402c --- /dev/null +++ b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: net.java.dev.jna:jna +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd new file mode 100644 index 0000000..11a8eb3 --- /dev/null +++ b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: net.java.dev.jna:jna-platform +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd new file mode 100644 index 0000000..4379476 --- /dev/null +++ b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: :5.13.0 +SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 diff --git a/repackage/lib/win32/x86_64/org.argeo.tp.sys/com.sun.jna.bnd b/repackage/lib/win32/x86_64/org.argeo.tp.sys/com.sun.jna.bnd deleted file mode 100644 index f5c1507..0000000 --- a/repackage/lib/win32/x86_64/org.argeo.tp.sys/com.sun.jna.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 -Argeo-Origin-M2: net.java.dev.jna:jna:5.13.0 -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd new file mode 100644 index 0000000..9d0402c --- /dev/null +++ b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: net.java.dev.jna:jna +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd new file mode 100644 index 0000000..11a8eb3 --- /dev/null +++ b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: net.java.dev.jna:jna-platform +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd new file mode 100644 index 0000000..4379476 --- /dev/null +++ b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: :5.13.0 +SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 diff --git a/repackage/org.argeo.tp.httpd/jakarta.servlet.bnd b/repackage/org.argeo.tp.httpd/jakarta.servlet.bnd new file mode 100644 index 0000000..c7611bd --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jakarta.servlet.bnd @@ -0,0 +1,3 @@ +SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0 +Argeo-Origin-M2: jakarta.servlet:jakarta.servlet-api:5.0.0 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jakarta.websocket.bnd b/repackage/org.argeo.tp.httpd/jakarta.websocket.bnd new file mode 100644 index 0000000..bdd5633 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jakarta.websocket.bnd @@ -0,0 +1,3 @@ +SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0 +Argeo-Origin-M2: jakarta.websocket:jakarta.websocket-api:2.0.0 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/javax.websocket.bnd b/repackage/org.argeo.tp.httpd/javax.websocket.bnd index 66904f6..33979a3 100644 --- a/repackage/org.argeo.tp.httpd/javax.websocket.bnd +++ b/repackage/org.argeo.tp.httpd/javax.websocket.bnd @@ -1,3 +1,3 @@ SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.1 -Argeo-Origin-M2: javax.websocket:javax.websocket-api:1.1 +Argeo-Origin-M2: jakarta.websocket:jakarta.websocket-api:1.1.2 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd index cd46982..9b0ac9c 100644 --- a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd +++ b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd @@ -1,22 +1,22 @@ Bundle-SymbolicName: org.eclipse.jetty.websocket SPDX-License-Identifier: Apache-2.0 OR EPL-2.0 -Argeo-Origin-M2: :10.0.16 +Argeo-Origin-M2: :12.0.4 Argeo-Origin-M2-Merge: \ -org.eclipse.jetty.websocket:websocket-core-client, \ -org.eclipse.jetty.websocket:websocket-core-common, \ -org.eclipse.jetty.websocket:websocket-core-server, \ -org.eclipse.jetty.websocket:websocket-jetty-api, \ -org.eclipse.jetty.websocket:websocket-jetty-client, \ -org.eclipse.jetty.websocket:websocket-jetty-common, \ -org.eclipse.jetty.websocket:websocket-jetty-server,\ -org.eclipse.jetty.websocket:websocket-javax-client, \ -org.eclipse.jetty.websocket:websocket-javax-common, \ -org.eclipse.jetty.websocket:websocket-javax-server,\ -org.eclipse.jetty.websocket:websocket-servlet, \ +org.eclipse.jetty.websocket:jetty-websocket-core-client, \ +org.eclipse.jetty.websocket:jetty-websocket-core-common, \ +org.eclipse.jetty.websocket:jetty-websocket-core-server, \ +org.eclipse.jetty.websocket:jetty-websocket-jetty-api, \ +org.eclipse.jetty.websocket:jetty-websocket-jetty-client, \ +org.eclipse.jetty.websocket:jetty-websocket-jetty-common, \ +org.eclipse.jetty.websocket:jetty-websocket-jetty-server,\ +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-servlet, \ Export-Package: org.eclipse.jetty.* Import-Package: \ !java.*, \ -org.eclipse.jetty.webapp;resolution:="optional", \ +org.eclipse.jetty.ee8.webapp;resolution:="optional", \ * \ No newline at end of file diff --git a/repackage/org.argeo.tp.httpd/jetty/common.bnd b/repackage/org.argeo.tp.httpd/jetty/common.bnd index a648fcb..262ef7f 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: :10.0.16 +Argeo-Origin-M2: :12.0.4 diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.nested.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.nested.bnd new file mode 100644 index 0000000..fdf3d4c --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.nested.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.ee8:jetty-ee8-nested +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.security.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.security.bnd new file mode 100644 index 0000000..8ce0706 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.security.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.ee8:jetty-ee8-security +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.server.bnd.disabled b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.server.bnd.disabled new file mode 100644 index 0000000..05e48ec --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.server.bnd.disabled @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.ee8:jetty-ee8-server +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.servlet.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.servlet.bnd new file mode 100644 index 0000000..22b1b78 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.servlet.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty.ee8:jetty-ee8-servlet +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.bnd index 89b7b2c..a57bba3 100644 --- a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.bnd +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.bnd @@ -1,2 +1,2 @@ -Argeo-Origin-M2: org.eclipse.jetty.http2:http2-client +Argeo-Origin-M2: org.eclipse.jetty.http2:jetty-http2-client Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.common.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.common.bnd index f106b39..7336a0d 100644 --- a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.common.bnd +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.common.bnd @@ -1,2 +1,2 @@ -Argeo-Origin-M2: org.eclipse.jetty.http2:http2-common +Argeo-Origin-M2: org.eclipse.jetty.http2:jetty-http2-common Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.hpack.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.hpack.bnd index 75298f0..a94db98 100644 --- a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.hpack.bnd +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.hpack.bnd @@ -1,2 +1,2 @@ -Argeo-Origin-M2: org.eclipse.jetty.http2:http2-hpack +Argeo-Origin-M2: org.eclipse.jetty.http2:jetty-http2-hpack Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.server.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.server.bnd index c62e1ed..88f9a53 100644 --- a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.server.bnd +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.server.bnd @@ -1,2 +1,2 @@ -Argeo-Origin-M2: org.eclipse.jetty.http2:http2-server +Argeo-Origin-M2: org.eclipse.jetty.http2:jetty-http2-server Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlet.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlet.bnd deleted file mode 100644 index 4bcefbc..0000000 --- a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlet.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Argeo-Origin-M2: org.eclipse.jetty:jetty-servlet -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlets.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlets.bnd deleted file mode 100644 index daafe91..0000000 --- a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlets.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Argeo-Origin-M2: org.eclipse.jetty:jetty-servlets -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.session.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.session.bnd new file mode 100644 index 0000000..06c7dc0 --- /dev/null +++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.session.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: org.eclipse.jetty:jetty-session +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.publish/flying-saucer/common.bnd b/repackage/org.argeo.tp.publish/flying-saucer/common.bnd deleted file mode 100644 index b1dce98..0000000 --- a/repackage/org.argeo.tp.publish/flying-saucer/common.bnd +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-License-Identifier: LGPL-3.0-only -Argeo-Origin-M2: :9.3.1 \ No newline at end of file diff --git a/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.core.bnd b/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.core.bnd deleted file mode 100644 index d4a0510..0000000 --- a/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.core.bnd +++ /dev/null @@ -1 +0,0 @@ -Argeo-Origin-M2: org.xhtmlrenderer:flying-saucer-core diff --git a/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.openpdf.bnd b/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.openpdf.bnd deleted file mode 100644 index ace9050..0000000 --- a/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.openpdf.bnd +++ /dev/null @@ -1 +0,0 @@ -Argeo-Origin-M2: org.xhtmlrenderer:flying-saucer-pdf-openpdf diff --git a/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled b/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled deleted file mode 100644 index 6b89d64..0000000 --- a/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled +++ /dev/null @@ -1,4 +0,0 @@ -SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-swt -Import-Package:\ -org.eclipse.swt.printing;resolution:="optional",\ -* \ No newline at end of file diff --git a/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd b/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd deleted file mode 100644 index bf2e305..0000000 --- a/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0 -Argeo-Origin-M2: net.java.dev.jna:jna-platform:5.13.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 0e09a50..7d7a00b 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 @@ -1,5 +1,5 @@ -plugins/jakarta.inject*.jar= -plugins/jakarta.annotation*.jar= +plugins/jakarta.inject.jakarta.inject-api_2*.jar= +plugins/jakarta.annotation-api_2*.jar= plugins/org.eclipse.e4*.jar= plugins/org.eclipse.emf*.jar= plugins/org.eclipse.rap.e4_*.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 149a56f..adc73a6 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,4 +7,3 @@ 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= -plugins/org.eclipse.rap.nebula.*.jar= diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties index 97dd14f..b087e23 100644 --- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties +++ b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties @@ -1,5 +1,5 @@ -plugins/jakarta.inject*.jar= -plugins/jakarta.annotation*.jar= +plugins/jakarta.inject.jakarta.inject-api_2*.jar= +plugins/jakarta.annotation-api_2*.jar= plugins/org.eclipse.text_*.jar= plugins/org.eclipse.core*.jar= plugins/org.eclipse.e4.*.jar= diff --git a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/excludes.properties b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/excludes.properties deleted file mode 100644 index 5574815..0000000 --- a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/excludes.properties +++ /dev/null @@ -1,2 +0,0 @@ -plugins/org.eclipse.nebula.widgets.grid.example*.jar= -plugins/org.eclipse.nebula.widgets.grid.css*.jar= diff --git a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/includes.properties b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/includes.properties deleted file mode 100644 index 09ea542..0000000 --- a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/includes.properties +++ /dev/null @@ -1,2 +0,0 @@ -plugins/org.eclipse.nebula.widgets.grid*.jar= -plugins/org.eclipse.nebula.widgets.richtext*.jar= diff --git a/repackage/uris.properties b/repackage/uris.properties index b99bc54..6d71e1d 100644 --- a/repackage/uris.properties +++ b/repackage/uris.properties @@ -1,5 +1,5 @@ -eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.29-202309031000/equinox-SDK-4.29.zip -eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.29-202309031000/org.eclipse.platform.source-4.29.zip -eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.26/e4/rap-e4-3.26.0-R-20230906-1232.zip +eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.30-202312010110/equinox-SDK-4.30.zip +eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.30-202312010110/org.eclipse.platform.source-4.30.zip +eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.27/e4/rap-e4-3.27.0-R-20231205-1650.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 \ No newline at end of file diff --git a/sdk/argeo-build b/sdk/argeo-build index 955c266..c680842 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit 955c2667d48eed38665e24e00c9d82bfd38f419d +Subproject commit c6808422dd2f159dbf17d6bf3e3cdfb49c54a6f8 -- 2.30.2