Merge pull request #1852 from eclipse/cd_xtext_core_issue_1851

[eclipse/xtext-core#1851] test disabling more repos to avoid maven-default-http-blocker warnings
This commit is contained in:
Christian Dietrich 2022-03-08 06:10:36 +01:00 committed by GitHub
commit 267523cc9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 581 additions and 9 deletions

View file

@ -225,7 +225,7 @@ public class WizardConfigurationTest {
config.setPreferredBuildSystem(BuildSystem.GRADLE);
config.getUiProject().setEnabled(true);
config.setXtextVersion(new XtextVersion("2.9.0"));
String snapshotsRepo = "repositories/snapshots";
String snapshotsRepo = "<id>sonatype-snapshots</id>";
assertFalse(config.getParentProject().pom().getContent().contains(snapshotsRepo));
assertFalse(config.getParentProject().buildGradle().getContent().contains(snapshotsRepo));
String releaseUpdateSite = "xtext/updates/releases/2.9.0";

View file

@ -324,6 +324,32 @@
<enabled>false</enabled>
</snapshots>
</repository>
<!-- This must be disabled explicitly, otherwise it is enabled by https://github.com/mojohaus/mojo-parent
which is taken from exec-maven-plugin from at least version 1.6.0 -->
<repository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<!-- This is enabled by /org/sonatype/oss/oss-parent/7 used as parent by
org/xtext/antlr-generator/3.2.1 -->
<repository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@ -337,6 +363,28 @@
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</pluginRepository>
<pluginRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<profiles>
<profile>

View file

@ -280,6 +280,32 @@
<enabled>false</enabled>
</snapshots>
</repository>
<!-- This must be disabled explicitly, otherwise it is enabled by https://github.com/mojohaus/mojo-parent
which is taken from exec-maven-plugin from at least version 1.6.0 -->
<repository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<!-- This is enabled by /org/sonatype/oss/oss-parent/7 used as parent by
org/xtext/antlr-generator/3.2.1 -->
<repository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@ -293,6 +319,28 @@
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</pluginRepository>
<pluginRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<profiles>
<profile>

View file

@ -280,6 +280,32 @@
<enabled>false</enabled>
</snapshots>
</repository>
<!-- This must be disabled explicitly, otherwise it is enabled by https://github.com/mojohaus/mojo-parent
which is taken from exec-maven-plugin from at least version 1.6.0 -->
<repository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<!-- This is enabled by /org/sonatype/oss/oss-parent/7 used as parent by
org/xtext/antlr-generator/3.2.1 -->
<repository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@ -293,6 +319,28 @@
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</pluginRepository>
<pluginRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<profiles>
<profile>

View file

@ -283,6 +283,32 @@
<enabled>false</enabled>
</snapshots>
</repository>
<!-- This must be disabled explicitly, otherwise it is enabled by https://github.com/mojohaus/mojo-parent
which is taken from exec-maven-plugin from at least version 1.6.0 -->
<repository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<!-- This is enabled by /org/sonatype/oss/oss-parent/7 used as parent by
org/xtext/antlr-generator/3.2.1 -->
<repository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@ -296,6 +322,28 @@
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</pluginRepository>
<pluginRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<profiles>
<profile>

View file

@ -283,6 +283,32 @@
<enabled>false</enabled>
</snapshots>
</repository>
<!-- This must be disabled explicitly, otherwise it is enabled by https://github.com/mojohaus/mojo-parent
which is taken from exec-maven-plugin from at least version 1.6.0 -->
<repository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<!-- This is enabled by /org/sonatype/oss/oss-parent/7 used as parent by
org/xtext/antlr-generator/3.2.1 -->
<repository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@ -296,6 +322,28 @@
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</pluginRepository>
<pluginRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<profiles>
<profile>

View file

@ -326,6 +326,32 @@
<enabled>false</enabled>
</snapshots>
</repository>
<!-- This must be disabled explicitly, otherwise it is enabled by https://github.com/mojohaus/mojo-parent
which is taken from exec-maven-plugin from at least version 1.6.0 -->
<repository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<!-- This is enabled by /org/sonatype/oss/oss-parent/7 used as parent by
org/xtext/antlr-generator/3.2.1 -->
<repository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@ -339,6 +365,28 @@
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</pluginRepository>
<pluginRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<profiles>
<profile>

View file

@ -547,12 +547,44 @@ class ParentProjectDescriptor extends ProjectDescriptor {
<enabled>false</enabled>
</snapshots>
</repository>
«IF config.needsTychoBuild»
<!-- This must be disabled explicitly, otherwise it is enabled by https://github.com/mojohaus/mojo-parent
which is taken from exec-maven-plugin from at least version 1.6.0 -->
<repository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<!-- This is enabled by /org/sonatype/oss/oss-parent/7 used as parent by
org/xtext/antlr-generator/3.2.1 -->
<repository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
«ENDIF»
«IF config.xtextVersion.isSnapshot»
<repository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
«ENDIF»
</repositories>
@ -568,12 +600,40 @@ class ParentProjectDescriptor extends ProjectDescriptor {
<enabled>false</enabled>
</snapshots>
</pluginRepository>
«IF config.needsTychoBuild»
<pluginRepository>
<id>ossrh-snapshots</id>
<name>ossrh-snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</pluginRepository>
<pluginRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
«ENDIF»
«IF config.xtextVersion.isSnapshot»
<pluginRepository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
«ENDIF»
«IF config.needsTychoBuild && tychoVersion.endsWith("-SNAPSHOT")»

View file

@ -1806,6 +1806,109 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append("\t");
_builder.append("</repository>");
_builder.newLine();
{
boolean _needsTychoBuild_6 = this.getConfig().needsTychoBuild();
if (_needsTychoBuild_6) {
_builder.append("\t");
_builder.append("<!-- This must be disabled explicitly, otherwise it is enabled by https://github.com/mojohaus/mojo-parent ");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("which is taken from exec-maven-plugin from at least version 1.6.0 -->");
_builder.newLine();
_builder.append("\t");
_builder.append("<repository>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<id>ossrh-snapshots</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<name>ossrh-snapshots</name>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<releases>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t");
_builder.append("<enabled>false</enabled>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("</releases>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<snapshots>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t");
_builder.append("<enabled>false</enabled>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("</snapshots>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<url>http://oss.sonatype.org/content/repositories/snapshots</url>");
_builder.newLine();
_builder.append("\t");
_builder.append("</repository>");
_builder.newLine();
_builder.append("\t");
_builder.append("<!-- This is enabled by /org/sonatype/oss/oss-parent/7 used as parent by ");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("org/xtext/antlr-generator/3.2.1 -->");
_builder.newLine();
_builder.append("\t");
_builder.append("<repository>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<id>sonatype-nexus-snapshots</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<name>Sonatype Nexus Snapshots</name>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<url>https://oss.sonatype.org/content/repositories/snapshots</url>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<releases>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t");
_builder.append("<enabled>false</enabled>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("</releases>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<snapshots>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t");
_builder.append("<enabled>false</enabled>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("</snapshots>");
_builder.newLine();
_builder.append("\t");
_builder.append("</repository>");
_builder.newLine();
}
}
{
boolean _isSnapshot = this.getConfig().getXtextVersion().isSnapshot();
if (_isSnapshot) {
@ -1822,11 +1925,27 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<releases><enabled>false</enabled></releases>");
_builder.append("<releases>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t");
_builder.append("<enabled>false</enabled>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<snapshots><enabled>true</enabled></snapshots>");
_builder.append("</releases>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<snapshots>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t");
_builder.append("<enabled>true</enabled>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("</snapshots>");
_builder.newLine();
_builder.append("\t");
_builder.append("</repository>");
@ -1870,6 +1989,95 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append("\t");
_builder.append("</pluginRepository>");
_builder.newLine();
{
boolean _needsTychoBuild_7 = this.getConfig().needsTychoBuild();
if (_needsTychoBuild_7) {
_builder.append("\t");
_builder.append("<pluginRepository>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<id>ossrh-snapshots</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<name>ossrh-snapshots</name>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<releases>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t");
_builder.append("<enabled>false</enabled>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("</releases>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<snapshots>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t");
_builder.append("<enabled>false</enabled>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("</snapshots>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<url>http://oss.sonatype.org/content/repositories/snapshots</url>");
_builder.newLine();
_builder.append("\t");
_builder.append("</pluginRepository>");
_builder.newLine();
_builder.append("\t");
_builder.append("<pluginRepository>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<id>sonatype-nexus-snapshots</id>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<name>Sonatype Nexus Snapshots</name>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<url>https://oss.sonatype.org/content/repositories/snapshots</url>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<releases>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t");
_builder.append("<enabled>false</enabled>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("</releases>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<snapshots>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t");
_builder.append("<enabled>false</enabled>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("</snapshots>");
_builder.newLine();
_builder.append("\t");
_builder.append("</pluginRepository>");
_builder.newLine();
}
}
{
boolean _isSnapshot_1 = this.getConfig().getXtextVersion().isSnapshot();
if (_isSnapshot_1) {
@ -1886,11 +2094,27 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<releases><enabled>false</enabled></releases>");
_builder.append("<releases>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t");
_builder.append("<enabled>false</enabled>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<snapshots><enabled>true</enabled></snapshots>");
_builder.append("</releases>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("<snapshots>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t");
_builder.append("<enabled>true</enabled>");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
_builder.append("</snapshots>");
_builder.newLine();
_builder.append("\t");
_builder.append("</pluginRepository>");