Update to Eclipse 4.30

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 (file)
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/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.bnd
new file mode 100644 (file)
index 0000000..9d0402c
--- /dev/null
+++ b/repackage/lib/linux/aarch64/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/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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 66904f66c90878058bb5819078ac74dec200667a..33979a351567b6fcc5114307ae2e998672e27e48 100644 (file)
--- 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 cd469827d7fc170385f1b24cf7df459e5af9e3cb..9b0ac9cbe28c202923febfd29bd72ea3ed94c5b7 100644 (file)
--- 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 a648fcbac6b992c6395b1fecf967f14705aa84f6..262ef7f1e32cb96d6617421176fef1f81d904170 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 89b7b2cf45e75d2c4b94c62b0cc990d0dee8d0d0..a57bba3412c2ec581266cd85ffdd620a84548be1 100644 (file)
--- 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 f106b397cb1c183b3444d2ca8dbf3df184a430d1..7336a0ddf48a020c733f48d79618060e4480fd6f 100644 (file)
--- 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 75298f02ea384063cc2e8a5bc39cadd2eeee6419..a94db98b3670ff8a676c8660dfdf4498f22806f4 100644 (file)
--- 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 c62e1edac73ee81da5799f3eebd826a7c260a3ff..88f9a533a369cc995f3a775ecf87018a43d1a66d 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 0e09a508f4663c0fcbfc932637e3abe813dce37c..7d7a00b6c4853acab860e24b92dfe8b0e1cfb5b1 100644 (file)
--- 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 149a56f0e9d4dac9fff53c2ace268be08cd64648..adc73a66ee3a6577f3c6e0e5c0dd7b3a14a7187a 100644 (file)
--- 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 97dd14f6457366095791a76dfc9163181c4111ec..b087e23e0bcbd4828d61acc53409aa4673f17855 100644 (file)
--- 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/common.bnd b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/common.bnd
deleted file mode 100644 (file)
index 743e1d3..0000000
--- a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-nebula/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: EPL-2.0
-Argeo-Origin-NoMetadataGeneration: true

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 (file)
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 (file)
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 b99bc54cd4ed49da6439fa123fbe04004392e49e..6d71e1d510a1a9b0847f09d40aefbe1a4d32f569 100644 (file)
--- 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 955c2667d48eed38665e24e00c9d82bfd38f419d..c6808422dd2f159dbf17d6bf3e3cdfb49c54a6f8 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 955c2667d48eed38665e24e00c9d82bfd38f419d
+Subproject commit c6808422dd2f159dbf17d6bf3e3cdfb49c54a6f8