From 2fbb42119e83e6b6d04bad3c673ce28d0d7a4e8e Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Wed, 12 Jun 2024 13:47:10 -0400
Subject: [PATCH] p2 composites for CDT 11.6 and CDT-LSP 2.0 (#823)

---
 releng/download/releases/11.6/compositeArtifacts.xml | 12 ++++++++++++
 releng/download/releases/11.6/compositeContent.xml   | 12 ++++++++++++
 .../releases/cdt-lsp-2.0/compositeArtifacts.xml      | 12 ++++++++++++
 .../releases/cdt-lsp-2.0/compositeContent.xml        | 12 ++++++++++++
 .../releases/cdt-lsp-latest/compositeArtifacts.xml   |  4 ++--
 .../releases/cdt-lsp-latest/compositeContent.xml     |  4 ++--
 .../download/releases/latest/compositeArtifacts.xml  |  4 ++--
 releng/download/releases/latest/compositeContent.xml |  4 ++--
 releng/scripts/promote-files-to-download.sh          |  2 ++
 9 files changed, 58 insertions(+), 8 deletions(-)
 create mode 100644 releng/download/releases/11.6/compositeArtifacts.xml
 create mode 100644 releng/download/releases/11.6/compositeContent.xml
 create mode 100644 releng/download/releases/cdt-lsp-2.0/compositeArtifacts.xml
 create mode 100644 releng/download/releases/cdt-lsp-2.0/compositeContent.xml

diff --git a/releng/download/releases/11.6/compositeArtifacts.xml b/releng/download/releases/11.6/compositeArtifacts.xml
new file mode 100644
index 00000000000..04e99553478
--- /dev/null
+++ b/releng/download/releases/11.6/compositeArtifacts.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='CDT 11.6 Update Site'
+    type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+  <properties size='1'>
+    <!-- timestamp made with date +%s%3N -->
+    <property name='p2.timestamp' value='1718214203864'/>
+  </properties>
+  <children size='1'>
+    <child location='cdt-11.6.0'/>
+  </children>
+</repository>
diff --git a/releng/download/releases/11.6/compositeContent.xml b/releng/download/releases/11.6/compositeContent.xml
new file mode 100644
index 00000000000..1acd9f41626
--- /dev/null
+++ b/releng/download/releases/11.6/compositeContent.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='CDT 11.6 Update Site'
+    type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+  <properties size='1'>
+    <!-- timestamp made with date +%s%3N -->
+    <property name='p2.timestamp' value='1718214203864'/>
+  </properties>
+  <children size='1'>
+    <child location='cdt-11.6.0'/>
+  </children>
+</repository>
diff --git a/releng/download/releases/cdt-lsp-2.0/compositeArtifacts.xml b/releng/download/releases/cdt-lsp-2.0/compositeArtifacts.xml
new file mode 100644
index 00000000000..7f88bea8f7c
--- /dev/null
+++ b/releng/download/releases/cdt-lsp-2.0/compositeArtifacts.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='CDT LSP 2.0 Update Site'
+    type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+  <properties size='1'>
+    <!-- timestamp made with date +%s%3N -->
+    <property name='p2.timestamp' value='1718214203864'/>
+  </properties>
+  <children size='1'>
+    <child location='cdt-lsp-2.0.0'/>
+  </children>
+</repository>
diff --git a/releng/download/releases/cdt-lsp-2.0/compositeContent.xml b/releng/download/releases/cdt-lsp-2.0/compositeContent.xml
new file mode 100644
index 00000000000..55736d85864
--- /dev/null
+++ b/releng/download/releases/cdt-lsp-2.0/compositeContent.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='CDT LSP 2.0 Update Site'
+    type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+  <properties size='1'>
+    <!-- timestamp made with date +%s%3N -->
+    <property name='p2.timestamp' value='1718214203864'/>
+  </properties>
+  <children size='1'>
+    <child location='cdt-lsp-2.0.0'/>
+  </children>
+</repository>
diff --git a/releng/download/releases/cdt-lsp-latest/compositeArtifacts.xml b/releng/download/releases/cdt-lsp-latest/compositeArtifacts.xml
index 7a7e3ff59bc..722a7e84177 100644
--- a/releng/download/releases/cdt-lsp-latest/compositeArtifacts.xml
+++ b/releng/download/releases/cdt-lsp-latest/compositeArtifacts.xml
@@ -4,9 +4,9 @@
     type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
   <properties size='1'>
     <!-- timestamp made with date +%s%3N -->
-    <property name='p2.timestamp' value='1708507323000'/>
+    <property name='p2.timestamp' value='1718214203864'/>
   </properties>
   <children size='1'>
-    <child location='../cdt-lsp-1.1'/>
+    <child location='../cdt-lsp-2.0'/>
   </children>
 </repository>
diff --git a/releng/download/releases/cdt-lsp-latest/compositeContent.xml b/releng/download/releases/cdt-lsp-latest/compositeContent.xml
index 338e10b66cd..432ffba0255 100644
--- a/releng/download/releases/cdt-lsp-latest/compositeContent.xml
+++ b/releng/download/releases/cdt-lsp-latest/compositeContent.xml
@@ -4,9 +4,9 @@
     type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
   <properties size='1'>
     <!-- timestamp made with date +%s%3N -->
-    <property name='p2.timestamp' value='1708507323000'/>
+    <property name='p2.timestamp' value='1718214203864'/>
   </properties>
   <children size='1'>
-    <child location='../cdt-lsp-1.1'/>
+    <child location='../cdt-lsp-2.0'/>
   </children>
 </repository>
diff --git a/releng/download/releases/latest/compositeArtifacts.xml b/releng/download/releases/latest/compositeArtifacts.xml
index 6e3317bcbd6..303ca754070 100644
--- a/releng/download/releases/latest/compositeArtifacts.xml
+++ b/releng/download/releases/latest/compositeArtifacts.xml
@@ -4,9 +4,9 @@
     type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
   <properties size='1'>
     <!-- timestamp made with date +%s%3N -->
-    <property name='p2.timestamp' value='1710088907902'/>
+    <property name='p2.timestamp' value='1718214203864'/>
   </properties>
   <children size='1'>
-    <child location='../11.5'/>
+    <child location='../11.6'/>
   </children>
 </repository>
diff --git a/releng/download/releases/latest/compositeContent.xml b/releng/download/releases/latest/compositeContent.xml
index 3a7ec6bfef1..8562e9e084a 100644
--- a/releng/download/releases/latest/compositeContent.xml
+++ b/releng/download/releases/latest/compositeContent.xml
@@ -4,9 +4,9 @@
     type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
   <properties size='1'>
     <!-- timestamp made with date +%s%3N -->
-    <property name='p2.timestamp' value='1710088907902'/>
+    <property name='p2.timestamp' value='1718214203864'/>
   </properties>
   <children size='1'>
-    <child location='../11.5'/>
+    <child location='../11.6'/>
   </children>
 </repository>
diff --git a/releng/scripts/promote-files-to-download.sh b/releng/scripts/promote-files-to-download.sh
index da4055787bc..ef1a88cfbff 100755
--- a/releng/scripts/promote-files-to-download.sh
+++ b/releng/scripts/promote-files-to-download.sh
@@ -27,11 +27,13 @@ $ECHO $SCP ./releng/download/releases/11.2/* "${SSHUSER}:${DOWNLOAD}/releases/11
 $ECHO $SCP ./releng/download/releases/11.3/* "${SSHUSER}:${DOWNLOAD}/releases/11.3/"
 $ECHO $SCP ./releng/download/releases/11.4/* "${SSHUSER}:${DOWNLOAD}/releases/11.4/"
 $ECHO $SCP ./releng/download/releases/11.5/* "${SSHUSER}:${DOWNLOAD}/releases/11.5/"
+$ECHO $SCP ./releng/download/releases/11.6/* "${SSHUSER}:${DOWNLOAD}/releases/11.6/"
 
 $ECHO $SSH mkdir -p "${DOWNLOAD}/releases/cdt-lsp-latest/"
 $ECHO $SCP ./releng/download/releases/cdt-lsp-latest/* "${SSHUSER}:${DOWNLOAD}/releases/cdt-lsp-latest/"
 $ECHO $SCP ./releng/download/releases/cdt-lsp-1.0/* "${SSHUSER}:${DOWNLOAD}/releases/cdt-lsp-1.0/"
 $ECHO $SCP ./releng/download/releases/cdt-lsp-1.1/* "${SSHUSER}:${DOWNLOAD}/releases/cdt-lsp-1.1/"
+$ECHO $SCP ./releng/download/releases/cdt-lsp-2.0/* "${SSHUSER}:${DOWNLOAD}/releases/cdt-lsp-2.0/"
 
 # Issue #235 - some of the old archived releases had bad composites. For those
 # ones we started maintaining the files here as it was the easiest way to edit