Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing merge issue

This commit is contained in:
Joakim Erdfelt 2018-04-25 16:30:47 -05:00
parent 47586c5449
commit 0ea704a29a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
View File

@ -1285,7 +1285,7 @@ public class StartArgs
}
}
// to override default http://central.maven.org/maven2/
// to override default https://central.maven.org/maven2/
if (key.equals("maven.repo.uri"))
{
this.mavenBaseUri = value;

8
jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java
View File

@ -95,7 +95,7 @@ public class MavenLocalRepoFileInitializerTest
assertThat("coords.classifier",coords.classifier,nullValue());
assertThat("coords.toCentralURI", coords.toCentralURI().toASCIIString(),
is("http://central.maven.org/maven2/org/eclipse/jetty/jetty-start/9.3.x/jetty-start-9.3.x.jar"));
is("https://central.maven.org/maven2/org/eclipse/jetty/jetty-start/9.3.x/jetty-start-9.3.x.jar"));
}
@Test
@ -113,7 +113,7 @@ public class MavenLocalRepoFileInitializerTest
assertThat("coords.classifier",coords.classifier,nullValue());
assertThat("coords.toCentralURI", coords.toCentralURI().toASCIIString(),
is("http://central.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.3.x/jetty-distribution-9.3.x.zip"));
is("https://central.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.3.x/jetty-distribution-9.3.x.zip"));
}
@Test
@ -131,7 +131,7 @@ public class MavenLocalRepoFileInitializerTest
assertThat("coords.classifier",coords.classifier,is("tests"));
assertThat("coords.toCentralURI", coords.toCentralURI().toASCIIString(),
is("http://central.maven.org/maven2/org/eclipse/jetty/jetty-http/9.3.x/jetty-http-9.3.x-tests.jar"));
is("https://central.maven.org/maven2/org/eclipse/jetty/jetty-http/9.3.x/jetty-http-9.3.x-tests.jar"));
}
@Test
@ -149,7 +149,7 @@ public class MavenLocalRepoFileInitializerTest
assertThat("coords.classifier",coords.classifier,is("tests"));
assertThat("coords.toCentralURI", coords.toCentralURI().toASCIIString(),
is("http://central.maven.org/maven2/org/eclipse/jetty/jetty-http/9.3.x/jetty-http-9.3.x-tests.jar"));
is("https://central.maven.org/maven2/org/eclipse/jetty/jetty-http/9.3.x/jetty-http-9.3.x-tests.jar"));
}
@Test