Fix multi-platform build.
Change-Id: Icba2feba98ad0ce8a12d6c6acead11e1a37fd245
diff --git a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/ValidationTest.java b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/ValidationTest.java
index 03c2e39..245bda9 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/ValidationTest.java
+++ b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/ValidationTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2021 Obeo.
+ * Copyright (c) 2015, 2022 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,8 +23,6 @@
import org.eclipse.acceleo.query.ast.Conditional;
import org.eclipse.acceleo.query.ast.Expression;
import org.eclipse.acceleo.query.ast.Lambda;
-import org.eclipse.acceleo.query.ast.Let;
-import org.eclipse.acceleo.query.parser.AstValidator;
import org.eclipse.acceleo.query.runtime.IQueryEnvironment;
import org.eclipse.acceleo.query.runtime.IService;
import org.eclipse.acceleo.query.runtime.IValidationMessage;
@@ -33,7 +31,6 @@
import org.eclipse.acceleo.query.runtime.ServiceUtils;
import org.eclipse.acceleo.query.runtime.ValidationMessageLevel;
import org.eclipse.acceleo.query.runtime.impl.QueryValidationEngine;
-import org.eclipse.acceleo.query.runtime.impl.ValidationServices;
import org.eclipse.acceleo.query.tests.anydsl.AnydslPackage;
import org.eclipse.acceleo.query.tests.services.EObjectServices;
import org.eclipse.acceleo.query.tests.services.ReceiverServices;
@@ -51,7 +48,6 @@
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -201,9 +197,8 @@
assertEquals(1, possibleTypes.size());
final IType type = possibleTypes.iterator().next();
assertTrue(type instanceof SequenceType);
- assertTrue(((SequenceType)type).getCollectionType() instanceof NothingType);
- assertEquals("Feature notExisting not found in EClass EClass", ((NothingType)((SequenceType)type)
- .getCollectionType()).getMessage());
+ assertNothingType("Feature notExisting not found in EClass EClass", ((SequenceType)type)
+ .getCollectionType());
assertEquals(1, validationResult.getMessages().size());
assertValidationMessage(validationResult.getMessages().get(0), ValidationMessageLevel.INFO,
@@ -221,9 +216,8 @@
assertEquals(1, possibleTypes.size());
final IType type = possibleTypes.iterator().next();
assertTrue(type instanceof SetType);
- assertTrue(((SetType)type).getCollectionType() instanceof NothingType);
- assertEquals("Feature notExisting not found in EClass EClass", ((NothingType)((SetType)type)
- .getCollectionType()).getMessage());
+ assertNothingType("Feature notExisting not found in EClass EClass", ((SetType)type)
+ .getCollectionType());
assertEquals(1, validationResult.getMessages().size());
assertValidationMessage(validationResult.getMessages().get(0), ValidationMessageLevel.INFO,
@@ -241,10 +235,9 @@
assertEquals(1, possibleTypes.size());
final IType type = possibleTypes.iterator().next();
assertTrue(type instanceof SequenceType);
- assertTrue(((SequenceType)type).getCollectionType() instanceof NothingType);
- assertEquals(
+ assertNothingType(
"Nothing will be left after calling oclAsType:\nEClassifier=EClass is not compatible with type EClassifierLiteral=EPackage",
- ((NothingType)((SequenceType)type).getCollectionType()).getMessage());
+ ((SequenceType)type).getCollectionType());
assertEquals(1, validationResult.getMessages().size());
assertValidationMessage(validationResult.getMessages().get(0), ValidationMessageLevel.INFO,
@@ -263,10 +256,9 @@
assertEquals(1, possibleTypes.size());
final IType type = possibleTypes.iterator().next();
assertTrue(type instanceof SequenceType);
- assertTrue(((SequenceType)type).getCollectionType() instanceof NothingType);
- assertEquals(
+ assertNothingType(
"Nothing will be left after calling oclAsType:\nEClassifier=EClass is not compatible with type EClassifierLiteral=EPackage",
- ((NothingType)((SequenceType)type).getCollectionType()).getMessage());
+ ((SequenceType)type).getCollectionType());
assertEquals(1, validationResult.getMessages().size());
assertValidationMessage(validationResult.getMessages().get(0), ValidationMessageLevel.INFO,
@@ -290,10 +282,9 @@
assertEquals(1, possibleTypes.size());
final IType type = possibleTypes.iterator().next();
assertTrue(type instanceof SequenceType);
- assertTrue(((SequenceType)type).getCollectionType() instanceof NothingType);
- assertEquals(
+ assertNothingType(
"Feature notExisting not found in EClass EClass\nFeature notExisting not found in EClass EPackage",
- ((NothingType)((SequenceType)type).getCollectionType()).getMessage());
+ ((SequenceType)type).getCollectionType());
assertEquals(1, validationResult.getMessages().size());
assertValidationMessage(validationResult.getMessages().get(0), ValidationMessageLevel.INFO,
@@ -317,10 +308,9 @@
assertEquals(1, possibleTypes.size());
final IType type = possibleTypes.iterator().next();
assertTrue(type instanceof SetType);
- assertTrue(((SetType)type).getCollectionType() instanceof NothingType);
- assertEquals(
+ assertNothingType(
"Feature notExisting not found in EClass EClass\nFeature notExisting not found in EClass EPackage",
- ((NothingType)((SetType)type).getCollectionType()).getMessage());
+ ((SetType)type).getCollectionType());
assertEquals(1, validationResult.getMessages().size());
assertValidationMessage(validationResult.getMessages().get(0), ValidationMessageLevel.INFO,
@@ -350,9 +340,8 @@
.getCollectionType()).getType());
type = it.next();
assertTrue(type instanceof SequenceType);
- assertTrue(((SequenceType)type).getCollectionType() instanceof NothingType);
- assertEquals("Feature eClassifiers not found in EClass EClass", ((NothingType)((SequenceType)type)
- .getCollectionType()).getMessage());
+ assertNothingType("Feature eClassifiers not found in EClass EClass", ((SequenceType)type)
+ .getCollectionType());
assertEquals(1, validationResult.getMessages().size());
assertValidationMessage(validationResult.getMessages().get(0), ValidationMessageLevel.INFO,
@@ -381,9 +370,8 @@
.getCollectionType()).getType());
type = it.next();
assertTrue(type instanceof SetType);
- assertTrue(((SetType)type).getCollectionType() instanceof NothingType);
- assertEquals("Feature eClassifiers not found in EClass EClass", ((NothingType)((SetType)type)
- .getCollectionType()).getMessage());
+ assertNothingType("Feature eClassifiers not found in EClass EClass", ((SetType)type)
+ .getCollectionType());
assertEquals(1, validationResult.getMessages().size());
assertValidationMessage(validationResult.getMessages().get(0), ValidationMessageLevel.INFO,
@@ -710,9 +698,8 @@
final Iterator<IType> it = possibleTypes.iterator();
IType possibleType = it.next();
assertTrue(possibleType instanceof SetType);
- assertTrue(((SetType)possibleType).getCollectionType() instanceof NothingType);
- assertEquals("Empty OrderedSet defined in extension", ((NothingType)((SetType)possibleType)
- .getCollectionType()).getMessage());
+ assertNothingType("Empty OrderedSet defined in extension", ((SetType)possibleType)
+ .getCollectionType());
}
@Test
@@ -745,9 +732,8 @@
final Iterator<IType> it = possibleTypes.iterator();
IType possibleType = it.next();
assertTrue(possibleType instanceof SequenceType);
- assertTrue(((SequenceType)possibleType).getCollectionType() instanceof NothingType);
- assertEquals("Empty Sequence defined in extension", ((NothingType)((SequenceType)possibleType)
- .getCollectionType()).getMessage());
+ assertNothingType("Empty Sequence defined in extension", ((SequenceType)possibleType)
+ .getCollectionType());
}
@Test
@@ -996,64 +982,6 @@
}
@Test
- public void testLetBindingCompatibleTypeSequenceType() {
- final IValidationResult validationResult = engine.validate(
- "let newVar : Sequence(ecore::EClass) = Sequence{self} in newVar", variableTypes);
-
- final Expression ast = validationResult.getAstResult().getAst();
- final Set<IType> possibleTypes = validationResult.getPossibleTypes(ast);
-
- assertEquals(1, possibleTypes.size());
- Iterator<IType> it = possibleTypes.iterator();
- IType possibleType = it.next();
- assertTrue(possibleType instanceof SequenceType);
- IType collectionType = ((SequenceType)possibleType).getCollectionType();
- assertTrue(collectionType instanceof EClassifierType);
- assertEquals(EcorePackage.eINSTANCE.getEClass(), ((EClassifierType)collectionType).getType());
- assertEquals(0, validationResult.getMessages().size());
-
- final AstValidator validator = new AstValidator(new ValidationServices(queryEnvironment));
- final Set<IType> bindingPossibleTypes = validator.getDeclarationTypes(queryEnvironment,
- validationResult.getPossibleTypes(((Let)ast).getBindings().get(0).getType()));
- it = bindingPossibleTypes.iterator();
- possibleType = it.next();
- assertTrue(possibleType instanceof SequenceType);
- collectionType = ((SequenceType)possibleType).getCollectionType();
- assertTrue(collectionType instanceof EClassifierType);
- assertFalse(collectionType instanceof EClassifierLiteralType);
- assertEquals(EcorePackage.eINSTANCE.getEClass(), ((EClassifierType)collectionType).getType());
- }
-
- @Test
- public void testLetBindingCompatibleTypeSetType() {
- final IValidationResult validationResult = engine.validate(
- "let newVar : OrderedSet(ecore::EClass) = OrderedSet{self} in newVar", variableTypes);
-
- final Expression ast = validationResult.getAstResult().getAst();
- final Set<IType> possibleTypes = validationResult.getPossibleTypes(ast);
-
- assertEquals(1, possibleTypes.size());
- Iterator<IType> it = possibleTypes.iterator();
- IType possibleType = it.next();
- assertTrue(possibleType instanceof SetType);
- IType collectionType = ((SetType)possibleType).getCollectionType();
- assertTrue(collectionType instanceof EClassifierType);
- assertEquals(EcorePackage.eINSTANCE.getEClass(), ((EClassifierType)collectionType).getType());
- assertEquals(0, validationResult.getMessages().size());
-
- final AstValidator validator = new AstValidator(new ValidationServices(queryEnvironment));
- final Set<IType> bindingPossibleTypes = validator.getDeclarationTypes(queryEnvironment,
- validationResult.getPossibleTypes(((Let)ast).getBindings().get(0).getType()));
- it = bindingPossibleTypes.iterator();
- possibleType = it.next();
- assertTrue(possibleType instanceof SetType);
- collectionType = ((SetType)possibleType).getCollectionType();
- assertTrue(collectionType instanceof EClassifierType);
- assertFalse(collectionType instanceof EClassifierLiteralType);
- assertEquals(EcorePackage.eINSTANCE.getEClass(), ((EClassifierType)collectionType).getType());
- }
-
- @Test
public void testLetBindingIncompatibleType() {
final IValidationResult validationResult = engine.validate(
"let newVar : ecore::EPackage = self in newVar", variableTypes);
@@ -1537,15 +1465,18 @@
final Iterator<IType> it = possibleTypes.iterator();
IType possibleType = it.next();
assertEquals(1, possibleTypes.size());
- assertTrue(possibleType instanceof NothingType);
- assertEquals(
- "Nothing will be left after calling oclAsType:\nEClassifier=EPackage is not compatible with type EClassifierLiteral=EInt\nEClassifier=EAnnotation is not compatible with type EClassifierLiteral=EInt",
- ((NothingType)possibleType).getMessage());
+
+ assertNothingType("Nothing will be left after calling oclAsType:\n"
+ + "EClassifier=EPackage is not compatible with type EClassifierLiteral=EInt\n"
+ + "EClassifier=EAnnotation is not compatible with type EClassifierLiteral=EInt",
+ possibleType);
assertEquals(1, validationResult.getMessages().size());
assertValidationMessage(validationResult.getMessages().get(0), ValidationMessageLevel.ERROR,
- "Nothing will be left after calling oclAsType:\nEClassifier=EPackage is not compatible with type EClassifierLiteral=EInt\nEClassifier=EAnnotation is not compatible with type EClassifierLiteral=EInt",
- 17, 40);
+ "Nothing will be left after calling oclAsType:\n"
+ + "EClassifier=EPackage is not compatible with type EClassifierLiteral=EInt\n"
+ + "EClassifier=EAnnotation is not compatible with type EClassifierLiteral=EInt", 17,
+ 40);
}
@Test
@@ -1690,7 +1621,7 @@
ValidationMessageLevel expectedLevel, String expectedMessage, int expectedStartPosition,
int expectedEndPosition) {
assertEquals(expectedLevel, message.getLevel());
- assertEquals(expectedMessage, message.getMessage());
+ assertEquals(expectedMessage, unifiedLines(message.getMessage()));
assertEquals(expectedStartPosition, message.getStartPosition());
assertEquals(expectedEndPosition, message.getEndPosition());
}
@@ -1714,4 +1645,32 @@
}
return nothings;
}
+
+ /**
+ * Asserts that a provided type is Nothing Type with expected message.
+ *
+ * @param expectedMessage
+ * to assert
+ * @param evaluated
+ * element to test
+ */
+ public static void assertNothingType(String expectedMessage, IType evaluated) {
+ assertTrue(evaluated instanceof NothingType);
+ assertEquals("Unexpected NothingType message", expectedMessage, unifiedLines(((NothingType)evaluated)
+ .getMessage()));
+ }
+
+ /**
+ * Clean message from specific line separator, always using '\n'.
+ *
+ * @param text
+ * to clean
+ * @return cleaned text
+ */
+ public static String unifiedLines(String text) {
+ if (text == null || text.length() == 0) {
+ return null;
+ }
+ return text.replace(System.lineSeparator(), "\n");
+ }
}
diff --git a/releng/org.eclipse.acceleo.targetplatforms/2022-06/acceleo-2022-06.target b/releng/org.eclipse.acceleo.targetplatforms/2022-06/acceleo-2022-06.target
index eefa0e9..30b33f7 100644
--- a/releng/org.eclipse.acceleo.targetplatforms/2022-06/acceleo-2022-06.target
+++ b/releng/org.eclipse.acceleo.targetplatforms/2022-06/acceleo-2022-06.target
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Acceleo 2022-06 Target Platform" sequenceNumber="1662967976">
- <locations>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
- <unit id="org.junit" version="4.13.2.v20211018-1956"/>
- <unit id="org.antlr.runtime" version="4.7.2.v20200218-0804"/>
- <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
- <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
- <repository location="http://download.eclipse.org/cbi/updates/license"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.lsp4j" version="0.0.0"/>
- <unit id="org.eclipse.lsp4j.debug" version="0.0.0"/>
- <unit id="org.eclipse.lsp4j.jsonrpc" version="0.0.0"/>
- <unit id="org.eclipse.lsp4j.jsonrpc.debug" version="0.0.0"/>
- <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
- <unit id="org.eclipse.lsp4e" version="0.0.0"/>
- <unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
- <unit id="a.jre.javase" version="0.0.0"/>
- <unit id="config.a.jre.javase" version="0.0.0"/>
- <repository location="http://download.eclipse.org/lsp4e/releases/0.16.0/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.mylyn.wikitext.markdown" version="0.0.0"/>
- <repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.36/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.rcptt.platform.feature.group" version="0.0.0"/>
- <unit id="org.antlr.runtime" version="0.0.0"/>
- <repository location="http://download.eclipse.org/rcptt/release/2.5.1/repository"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
- <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.core.runtime" version="0.0.0"/>
- <unit id="org.eclipse.ui" version="0.0.0"/>
- <unit id="org.eclipse.ui.views.log" version="0.0.0"/>
- <unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.jface" version="0.0.0"/>
- <unit id="org.eclipse.tm4e.core" version="0.0.0"/>
- <unit id="org.eclipse.tm4e.ui" version="0.0.0"/>
- <unit id="org.eclipse.tm4e.languageconfiguration" version="0.0.0"/>
- <repository location="http://download.eclipse.org/releases/2020-09"/>
- </location>
- </locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Acceleo 2022-06 Target Platform" sequenceNumber="1663147762">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
+ <unit id="org.junit" version="4.13.2.v20211018-1956"/>
+ <unit id="org.antlr.runtime" version="4.7.2.v20200218-0804"/>
+ <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+ <repository location="https://download.eclipse.org/cbi/updates/license"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.lsp4j" version="0.0.0"/>
+ <unit id="org.eclipse.lsp4j.debug" version="0.0.0"/>
+ <unit id="org.eclipse.lsp4j.jsonrpc" version="0.0.0"/>
+ <unit id="org.eclipse.lsp4j.jsonrpc.debug" version="0.0.0"/>
+ <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
+ <unit id="org.eclipse.lsp4e" version="0.0.0"/>
+ <unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
+ <unit id="a.jre.javase" version="0.0.0"/>
+ <unit id="config.a.jre.javase" version="0.0.0"/>
+ <repository location="https://download.eclipse.org/lsp4e/releases/0.16.0/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.mylyn.wikitext.markdown" version="0.0.0"/>
+ <repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.36/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.rcptt.platform.feature.group" version="0.0.0"/>
+ <unit id="org.antlr.runtime" version="0.0.0"/>
+ <repository location="https://download.eclipse.org/rcptt/release/2.5.1/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
+ <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.core.runtime" version="0.0.0"/>
+ <unit id="org.eclipse.ui" version="0.0.0"/>
+ <unit id="org.eclipse.ui.views.log" version="0.0.0"/>
+ <unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.jface" version="0.0.0"/>
+ <unit id="org.eclipse.tm4e.core" version="0.0.0"/>
+ <unit id="org.eclipse.tm4e.ui" version="0.0.0"/>
+ <unit id="org.eclipse.tm4e.languageconfiguration" version="0.0.0"/>
+ <repository location="https://download.eclipse.org/releases/2020-09"/>
+ </location>
+ </locations>
+</target>
diff --git a/releng/org.eclipse.acceleo.targetplatforms/2022-06/acceleo-2022-06.tpd b/releng/org.eclipse.acceleo.targetplatforms/2022-06/acceleo-2022-06.tpd
index 4667203..03a92c4 100644
--- a/releng/org.eclipse.acceleo.targetplatforms/2022-06/acceleo-2022-06.tpd
+++ b/releng/org.eclipse.acceleo.targetplatforms/2022-06/acceleo-2022-06.tpd
@@ -7,7 +7,7 @@
with source requirements
-location "http://download.eclipse.org/releases/2020-09" {
+location "https://download.eclipse.org/releases/2020-09" {
org.eclipse.platform.sdk lazy
org.eclipse.equinox.core.feature.feature.group lazy
org.eclipse.equinox.executable.feature.group lazy
diff --git a/releng/org.eclipse.acceleo.targetplatforms/common/license.tpd b/releng/org.eclipse.acceleo.targetplatforms/common/license.tpd
index 01d1980..7533633 100644
--- a/releng/org.eclipse.acceleo.targetplatforms/common/license.tpd
+++ b/releng/org.eclipse.acceleo.targetplatforms/common/license.tpd
@@ -2,6 +2,6 @@
with source, requirements
-location "http://download.eclipse.org/cbi/updates/license" {
+location "https://download.eclipse.org/cbi/updates/license" {
org.eclipse.license.feature.group [1.0.1,1.1.0)
}
\ No newline at end of file
diff --git a/releng/org.eclipse.acceleo.targetplatforms/common/lsp.tpd b/releng/org.eclipse.acceleo.targetplatforms/common/lsp.tpd
index b5eb8fe..0d16502 100644
--- a/releng/org.eclipse.acceleo.targetplatforms/common/lsp.tpd
+++ b/releng/org.eclipse.acceleo.targetplatforms/common/lsp.tpd
@@ -4,7 +4,7 @@
with source, requirements
-location "http://download.eclipse.org/lsp4e/releases/0.16.0/" {
+location "https://download.eclipse.org/lsp4e/releases/0.16.0/" {
org.eclipse.lsp4j lazy
org.eclipse.lsp4j.debug lazy
org.eclipse.lsp4j.jsonrpc lazy
diff --git a/releng/org.eclipse.acceleo.targetplatforms/common/rcptt.tpd b/releng/org.eclipse.acceleo.targetplatforms/common/rcptt.tpd
index a3ded31..cc0a856 100644
--- a/releng/org.eclipse.acceleo.targetplatforms/common/rcptt.tpd
+++ b/releng/org.eclipse.acceleo.targetplatforms/common/rcptt.tpd
@@ -2,7 +2,7 @@
with source, requirements
-location "http://download.eclipse.org/rcptt/release/2.5.1/repository" {
+location "https://download.eclipse.org/rcptt/release/2.5.1/repository" {
org.eclipse.rcptt.platform.feature.group lazy
org.antlr.runtime lazy
}
\ No newline at end of file
