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

Fix typo (#2480) 

* fix typo for #2403

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* default url to download artifacts must be https per default #2472

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* use dot rather than dashes

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* use central.maven.org as default

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
This commit is contained in:
Olivier Lamy 2018-04-26 06:20:01 +10:00 committed by GitHub
parent 0a4d62c91d
commit 47586c5449
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 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

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

16
jetty-start/src/main/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializer.java
View File

@ -56,7 +56,7 @@ public class MavenLocalRepoFileInitializer extends FileInitializer
public String version;
public String type;
public String classifier;
private String mavenBaseUri = "http://central.maven.org/maven2/";
private String mavenRepoUri = "https://central.maven.org/maven2/";
public String toPath()
{
@ -76,13 +76,13 @@ public class MavenLocalRepoFileInitializer extends FileInitializer
public URI toCentralURI()
{
return URI.create(mavenBaseUri + toPath());
return URI.create( mavenRepoUri + toPath());
}
}
private Path localRepositoryDir;
private final boolean readonly;
private String mavenBaseUri;
private String mavenRepoUri;
public MavenLocalRepoFileInitializer(BaseHome baseHome)
{
@ -96,12 +96,12 @@ public class MavenLocalRepoFileInitializer extends FileInitializer
this.readonly = readonly;
}
public MavenLocalRepoFileInitializer(BaseHome baseHome, Path localRepoDir, boolean readonly, String mavenBaseUri )
public MavenLocalRepoFileInitializer(BaseHome baseHome, Path localRepoDir, boolean readonly, String mavenRepoUri )
{
super(baseHome,"maven");
this.localRepositoryDir = localRepoDir;
this.readonly = readonly;
this.mavenBaseUri = mavenBaseUri;
this.mavenRepoUri = mavenRepoUri;
}
@Override
@ -195,12 +195,12 @@ public class MavenLocalRepoFileInitializer extends FileInitializer
coords.version = parts[2];
coords.type = "jar";
coords.classifier = null;
if (this.mavenBaseUri != null)
if (this.mavenRepoUri != null)
{
coords.mavenBaseUri = this.mavenBaseUri;
coords.mavenRepoUri = this.mavenRepoUri;
} else
{
coords.mavenBaseUri = System.getProperty( "maven-base-uri", coords.mavenBaseUri );
coords.mavenRepoUri = System.getProperty( "maven.repo.uri", coords.mavenRepoUri );
}
if (parts.length >= 4)

2
jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
View File

@ -217,7 +217,7 @@ Properties:
Jetty server has stopped. If not specified, the stopper will wait
indefinitely. Use in conjunction with the --stop option.
maven-base-uri=[url] default http://central.maven.org/maven2/.
maven.repo.uri=[url] default http://central.maven.org/maven2/.
The url to use to download Maven dependencies.