Merge pull request #3121 from eclipse/cd-requirejs-237

bump requirejs to 2.3.7
eclipse-xtext · Aug 5, 2024 · 87b6681 · 87b6681
2 parents f59271c + a1d6700
commit 87b6681
Show file tree

Hide file tree

Showing 31 changed files with 33 additions and 33 deletions.
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.web/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.web/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 	api "org.eclipse.xtext:org.eclipse.xtext.xbase.web:${xtextVersion}"
 	api "org.eclipse.xtext:org.eclipse.xtext.web.servlet:${xtextVersion}"
 	api "org.eclipse.xtend:org.eclipse.xtend.lib:${xtextVersion}"
-	api "org.webjars:requirejs:2.3.6"
+	api "org.webjars:requirejs:2.3.7"
 	api "org.webjars:jquery:3.6.0"
 	api "org.webjars:ace:1.3.3"
 	providedCompile "org.eclipse.jetty:jetty-annotations:11.0.21"

diff --git a/...pse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle.web/build.gradle b/...pse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle.web/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 	api "org.eclipse.xtext:org.eclipse.xtext.xbase.web:${xtextVersion}"
 	api "org.eclipse.xtext:org.eclipse.xtext.web.servlet:${xtextVersion}"
 	api "org.eclipse.xtend:org.eclipse.xtend.lib:${xtextVersion}"
-	api "org.webjars:requirejs:2.3.6"
+	api "org.webjars:requirejs:2.3.7"
 	api "org.webjars:jquery:3.6.0"
 	api "org.webjars:ace:1.3.3"
 	providedCompile "org.eclipse.jetty:jetty-annotations:11.0.21"

diff --git a/...xt.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.web/pom.xml b/...xt.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.web/pom.xml
@@ -101,7 +101,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>requirejs</artifactId>
-			<version>2.3.6</version>
+			<version>2.3.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>

diff --git a/...testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.web/pom.xml b/...testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.web/pom.xml
@@ -101,7 +101,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>requirejs</artifactId>
-			<version>2.3.6</version>
+			<version>2.3.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>

diff --git a/...ts/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.web/pom.xml b/...ts/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.web/pom.xml
@@ -101,7 +101,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>requirejs</artifactId>
-			<version>2.3.6</version>
+			<version>2.3.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>

diff --git a/...ta/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml b/...ta/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml
@@ -101,7 +101,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>requirejs</artifactId>
-			<version>2.3.6</version>
+			<version>2.3.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>

diff --git a/...ta/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.web/pom.xml b/...ta/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.web/pom.xml
@@ -101,7 +101,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>requirejs</artifactId>
-			<version>2.3.6</version>
+			<version>2.3.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>

diff --git a/...xt.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.web/pom.xml b/...xt.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.web/pom.xml
@@ -91,7 +91,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>requirejs</artifactId>
-			<version>2.3.6</version>
+			<version>2.3.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>

diff --git a/org.eclipse.xtext.web.example.jetty/pom.xml b/org.eclipse.xtext.web.example.jetty/pom.xml
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>requirejs</artifactId>
-			<version>2.3.6</version>
+			<version>2.3.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>

diff --git a/org.eclipse.xtext.web.example.jetty/src/main/webapp/ace-statemachine-resource-multi.html b/org.eclipse.xtext.web.example.jetty/src/main/webapp/ace-statemachine-resource-multi.html
@@ -6,7 +6,7 @@
 	<title>Xtext-Web State Machine Example (Multiple Resources)</title>
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-ace.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("ace-statemachine-resource-multi.html");

diff --git a/org.eclipse.xtext.web.example.jetty/src/main/webapp/ace-statemachine-resource.html b/org.eclipse.xtext.web.example.jetty/src/main/webapp/ace-statemachine-resource.html
@@ -6,7 +6,7 @@
 	<title>Xtext-Web Domainmodel Example</title>
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-ace.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("ace-statemachine-resource.html");

diff --git a/org.eclipse.xtext.web.example.jetty/src/main/webapp/ace-statemachine-stateless.html b/org.eclipse.xtext.web.example.jetty/src/main/webapp/ace-statemachine-stateless.html
@@ -6,7 +6,7 @@
 	<title>Xtext-Web State Machine Example</title>
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-ace.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("ace-statemachine-stateless.html");

diff --git a/org.eclipse.xtext.web.example.jetty/src/main/webapp/ace-statemachine-static-multi.html b/org.eclipse.xtext.web.example.jetty/src/main/webapp/ace-statemachine-static-multi.html
@@ -6,7 +6,7 @@
 	<title>Xtext-Web State Machine Example (Multiple Resources)</title>
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-ace.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("ace-statemachine-static-multi.html");

diff --git a/org.eclipse.xtext.web.example.jetty/src/main/webapp/ace-statemachine-static.html b/org.eclipse.xtext.web.example.jetty/src/main/webapp/ace-statemachine-static.html
@@ -6,7 +6,7 @@
 	<title>Xtext-Web State Machine Example</title>
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-ace.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("ace-statemachine-static.html");

diff --git a/...lipse.xtext.web.example.jetty/src/main/webapp/codemirror-statemachine-resource-multi.html b/...lipse.xtext.web.example.jetty/src/main/webapp/codemirror-statemachine-resource-multi.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" type="text/css" href="webjars/codemirror/5.41.0/addon/hint/show-hint.css" />
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-codemirror.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("codemirror-statemachine-resource-multi.html");

diff --git a/org.eclipse.xtext.web.example.jetty/src/main/webapp/codemirror-statemachine-resource.html b/org.eclipse.xtext.web.example.jetty/src/main/webapp/codemirror-statemachine-resource.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" type="text/css" href="webjars/codemirror/5.41.0/addon/hint/show-hint.css" />
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-codemirror.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("codemirror-statemachine-resource.html");

diff --git a/org.eclipse.xtext.web.example.jetty/src/main/webapp/codemirror-statemachine-stateless.html b/org.eclipse.xtext.web.example.jetty/src/main/webapp/codemirror-statemachine-stateless.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" type="text/css" href="webjars/codemirror/5.41.0/addon/hint/show-hint.css" />
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-codemirror.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("codemirror-statemachine-stateless.html");

diff --git a/...eclipse.xtext.web.example.jetty/src/main/webapp/codemirror-statemachine-static-multi.html b/...eclipse.xtext.web.example.jetty/src/main/webapp/codemirror-statemachine-static-multi.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" type="text/css" href="webjars/codemirror/5.41.0/addon/hint/show-hint.css" />
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-codemirror.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("codemirror-statemachine-static-multi.html");

diff --git a/org.eclipse.xtext.web.example.jetty/src/main/webapp/codemirror-statemachine-static.html b/org.eclipse.xtext.web.example.jetty/src/main/webapp/codemirror-statemachine-static.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" type="text/css" href="webjars/codemirror/5.41.0/addon/hint/show-hint.css" />
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-codemirror.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("codemirror-statemachine-static.html");

diff --git a/org.eclipse.xtext.web.example.jetty/src/main/webapp/orion-entities-resource.html b/org.eclipse.xtext.web.example.jetty/src/main/webapp/orion-entities-resource.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" type="text/css" href="orion/code_edit/built-codeEdit.css" />
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-orion.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("orion-entities-resource.html");

diff --git a/org.eclipse.xtext.web.example.jetty/src/main/webapp/orion-entities-static.html b/org.eclipse.xtext.web.example.jetty/src/main/webapp/orion-entities-static.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" type="text/css" href="orion/code_edit/built-codeEdit.css" />
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-orion.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("orion-entities-static.html");

diff --git a/org.eclipse.xtext.web.example.jetty/src/main/webapp/orion-statemachine-autogenerate.html b/org.eclipse.xtext.web.example.jetty/src/main/webapp/orion-statemachine-autogenerate.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" type="text/css" href="orion/code_edit/built-codeEdit.css" />
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-orion.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("orion-statemachine-autogenerate.html");

diff --git a/org.eclipse.xtext.web.example.jetty/src/main/webapp/orion-statemachine-resource-multi.html b/org.eclipse.xtext.web.example.jetty/src/main/webapp/orion-statemachine-resource-multi.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" type="text/css" href="orion/code_edit/built-codeEdit.css" />
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-orion.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("orion-statemachine-resource-multi.html");

diff --git a/org.eclipse.xtext.web.example.jetty/src/main/webapp/orion-statemachine-resource.html b/org.eclipse.xtext.web.example.jetty/src/main/webapp/orion-statemachine-resource.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" type="text/css" href="orion/code_edit/built-codeEdit.css" />
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-orion.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("orion-statemachine-resource.html");

diff --git a/org.eclipse.xtext.web.example.jetty/src/main/webapp/orion-statemachine-stateless.html b/org.eclipse.xtext.web.example.jetty/src/main/webapp/orion-statemachine-stateless.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" type="text/css" href="orion/code_edit/built-codeEdit.css" />
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-orion.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("orion-statemachine-stateless.html");

diff --git a/org.eclipse.xtext.web.example.jetty/src/main/webapp/orion-statemachine-static-multi.html b/org.eclipse.xtext.web.example.jetty/src/main/webapp/orion-statemachine-static-multi.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" type="text/css" href="orion/code_edit/built-codeEdit.css" />
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-orion.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("orion-statemachine-static-multi.html");

diff --git a/org.eclipse.xtext.web.example.jetty/src/main/webapp/orion-statemachine-static.html b/org.eclipse.xtext.web.example.jetty/src/main/webapp/orion-statemachine-static.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" type="text/css" href="orion/code_edit/built-codeEdit.css" />
 	<link rel="stylesheet" type="text/css" href="xtext/@xtext-version-placeholder@/xtext-orion.css" />
 	<link rel="stylesheet" type="text/css" href="style.css" />
-	<script src="webjars/requirejs/2.3.6/require.min.js"></script>
+	<script src="webjars/requirejs/2.3.7/require.min.js"></script>
 	<script type="text/javascript">
 		var baseUrl = window.location.pathname;
 		var fileIndex = baseUrl.indexOf("orion-statemachine-static.html");

diff --git a/...xt.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.xtend b/...xt.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.xtend
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2020 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2015, 2024 itemis AG (http://www.itemis.eu) and others.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
@@ -47,7 +47,7 @@ class WebIntegrationFragment extends AbstractXtextGeneratorFragment {
 		ORION, ACE, CODEMIRROR
 	}
 
-	static val REQUIREJS_VERSION = '2.3.6'
+	static val REQUIREJS_VERSION = '2.3.7'
 	static val REQUIREJS_TEXT_VERSION = '2.0.15'
 	static val JQUERY_VERSION = '3.6.0'
 	static val ACE_VERSION = '1.3.3'

diff --git a/...ext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.java b/...ext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015, 2020 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2015, 2024 itemis AG (http://www.itemis.eu) and others.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
@@ -61,7 +61,7 @@ public enum Framework {
     CODEMIRROR;
   }
 
-  private static final String REQUIREJS_VERSION = "2.3.6";
+  private static final String REQUIREJS_VERSION = "2.3.7";
 
   private static final String REQUIREJS_TEXT_VERSION = "2.0.15";
 

diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend
@@ -15,7 +15,7 @@ import static org.eclipse.xtext.xtext.wizard.ExternalDependency.*
 @FinalFieldsConstructor
 class WebProjectDescriptor extends ProjectDescriptor {
 
-	static val REQUIREJS_VERSION = '2.3.6'
+	static val REQUIREJS_VERSION = '2.3.7'
 //	static val REQUIREJS_TEXT_VERSION = '2.0.15'
 	static val JQUERY_VERSION = '3.6.0'
 	static val JETTY_VERSION = '11.0.21'

diff --git a/...pse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.java b/...pse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.java
@@ -21,7 +21,7 @@
 @FinalFieldsConstructor
 @SuppressWarnings("all")
 public class WebProjectDescriptor extends ProjectDescriptor {
-  private static final String REQUIREJS_VERSION = "2.3.6";
+  private static final String REQUIREJS_VERSION = "2.3.7";
 
   private static final String JQUERY_VERSION = "3.6.0";