You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/10/14 13:14:19 UTC
[1/3] git commit: Update pom to include ref to repository.apache.org
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 16d47d49e -> a422b9aa3
Update pom to include ref to repository.apache.org
- for enabling snapshots from apache
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/055d87fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/055d87fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/055d87fa
Branch: refs/heads/master
Commit: 055d87facbd04bf6aff6593233858a5b73b96e6a
Parents: 8e4878d
Author: Aled Sage <al...@gmail.com>
Authored: Tue Oct 14 11:39:20 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Oct 14 11:39:32 2014 +0100
----------------------------------------------------------------------
examples/pom.xml | 8 ++++++++
pom.xml | 7 +++++++
usage/archetypes/quickstart/src/brooklyn-sample/pom.xml | 12 ++++++++++++
usage/downstream-parent/pom.xml | 12 ++++++++++++
4 files changed, 39 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055d87fa/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 26d2cd6..777e8f3 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -46,6 +46,14 @@
<releases> <enabled>false</enabled> </releases>
<snapshots> <enabled>true</enabled> </snapshots>
</repository>
+ <!-- enable snapshots from apache -->
+ <repository>
+ <id>apache-nexus-snapshots</id>
+ <name>Apache Nexus Snapshots</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ <releases> <enabled>false</enabled> </releases>
+ <snapshots> <enabled>true</enabled> </snapshots>
+ </repository>
</repositories>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055d87fa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 37b9588..d40a99a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,13 @@
<releases> <enabled>false</enabled> </releases>
<snapshots> <enabled>true</enabled> </snapshots>
</repository>
+ <repository>
+ <id>apache-nexus-snapshots</id>
+ <name>Apache Nexus Snapshots</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ <releases> <enabled>false</enabled> </releases>
+ <snapshots> <enabled>true</enabled> </snapshots>
+ </repository>
</repositories>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055d87fa/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
index 23661dc..e243ba4 100644
--- a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
@@ -99,6 +99,18 @@
<enabled>true</enabled>
</snapshots>
</repository>
+ <!-- enable snapshots from apache -->
+ <repository>
+ <id>apache-nexus-snapshots</id>
+ <name>Apache Nexus Snapshots</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055d87fa/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index 154fad4..9bd08ed 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -111,6 +111,18 @@
<enabled>true</enabled>
</snapshots>
</repository>
+ <!-- enable snapshots from apache -->
+ <repository>
+ <id>apache-nexus-snapshots</id>
+ <name>Apache Nexus Snapshots</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<build>
[3/3] git commit: Merge and close #240
Posted by ri...@apache.org.
Merge and close #240
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a422b9aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a422b9aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a422b9aa
Branch: refs/heads/master
Commit: a422b9aa367f4cdfa9d03ffabc7db6a9b28d9eb1
Parents: 16d47d4 055d87f
Author: Richard Downer <ri...@apache.org>
Authored: Tue Oct 14 12:14:01 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Oct 14 12:14:01 2014 +0100
----------------------------------------------------------------------
docs/dev/tips/release.md | 8 +++--
examples/pom.xml | 8 +++++
pom.xml | 7 ++++
.../entity/brooklynnode/BrooklynNode.java | 8 +++--
.../BrooklynNodeIntegrationTest.java | 2 +-
.../entity/brooklynnode/BrooklynNodeTest.java | 10 +++---
.../quickstart/src/brooklyn-sample/pom.xml | 12 +++++++
usage/dist/src/main/dist/conf/catalog.xml | 4 +--
usage/downstream-parent/pom.xml | 12 +++++++
.../brooklyn/util/maven/MavenRetriever.java | 36 +++++++++++++++-----
.../brooklyn/util/maven/MavenArtifactTest.java | 14 +++++---
11 files changed, 95 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a422b9aa/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java
----------------------------------------------------------------------
[2/3] git commit: Update refs to mvn id org.apache.brooklyn
Posted by ri...@apache.org.
Update refs to mvn id org.apache.brooklyn
- also changes snapshotUrlGenerator to inspect maven id: if it’s
org.apache then return repository.apache.org; otherwise return
oss.sonatype.org
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8e4878d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8e4878d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8e4878d9
Branch: refs/heads/master
Commit: 8e4878d9330c07839fd8d211c91d698b3037ce43
Parents: ad435aa
Author: Aled Sage <al...@gmail.com>
Authored: Tue Oct 14 11:37:05 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Oct 14 11:39:32 2014 +0100
----------------------------------------------------------------------
docs/dev/tips/release.md | 8 +++--
.../entity/brooklynnode/BrooklynNode.java | 8 +++--
.../BrooklynNodeIntegrationTest.java | 2 +-
.../entity/brooklynnode/BrooklynNodeTest.java | 10 +++---
usage/dist/src/main/dist/conf/catalog.xml | 4 +--
.../brooklyn/util/maven/MavenRetriever.java | 36 +++++++++++++++-----
.../brooklyn/util/maven/MavenArtifactTest.java | 14 +++++---
7 files changed, 56 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8e4878d9/docs/dev/tips/release.md
----------------------------------------------------------------------
diff --git a/docs/dev/tips/release.md b/docs/dev/tips/release.md
index fef73fe..1360f46 100644
--- a/docs/dev/tips/release.md
+++ b/docs/dev/tips/release.md
@@ -33,9 +33,11 @@ Brooklyn is published to two locations:
Brooklyn artifacts are generally downloaded from:
-1. [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.brooklyn%22),
-2. [Sonatype](https://oss.sonatype.org/index.html#nexus-search;quick~io.brooklyn),
-3. [GitHub](https://github.com/brooklyncentral/brooklyn).
+1. [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.brooklyn%22),
+ and (http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.brooklyn%22) for pre 0.7.0 versions
+2. [Apache](https://repository.apache.org/index.html#nexus-search;quick~org.apache.brooklyn),
+2. [Sonatype](https://oss.sonatype.org/index.html#nexus-search;quick~io.brooklyn) for pre 0.7.0 versions
+3. [GitHub](https://github.com/apache/incubator-brooklyn).
To publish:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8e4878d9/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java
index fa49be0..dd5b115 100644
--- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java
+++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java
@@ -68,14 +68,16 @@ public interface BrooklynNode extends SoftwareProcess, UsesJava {
@SetFromFlag("distroUploadUrl")
public static final ConfigKey<String> DISTRO_UPLOAD_URL = ConfigKeys.newStringConfigKey(
"brooklynnode.distro.uploadurl", "URL for uploading the brooklyn distro (retrieved locally and pushed to remote install location)", null);
-
+
+ // Note that download URL only supports versions in org.apache.brooklyn, so not 0.6.0 and earlier
+ // (which used maven group io.brooklyn). Aled thinks we can live with that.
@SetFromFlag("downloadUrl")
BasicAttributeSensorAndConfigKey<String> DOWNLOAD_URL = new StringAttributeSensorAndConfigKey(
SoftwareProcess.DOWNLOAD_URL,
"<#if version?contains(\"SNAPSHOT\")>"+
- "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=io.brooklyn&v=${version}&a=brooklyn-dist&c=dist&e=tar.gz" +
+ "https://repository.apache.org/service/local/artifact/maven/redirect?r=snapshots&g=org.apache.brooklyn&v=${version}&a=brooklyn-dist&c=dist&e=tar.gz" +
"<#else>"+
- "http://search.maven.org/remotecontent?filepath=io/brooklyn/brooklyn-dist/${version}/brooklyn-dist-${version}-dist.tar.gz"+
+ "http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/brooklyn-dist/${version}/brooklyn-dist-${version}-dist.tar.gz"+
"</#if>");
@SetFromFlag("subpathInArchive")
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8e4878d9/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java
index 6ebe3b2..4e0f52d 100644
--- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java
+++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java
@@ -93,7 +93,7 @@ import com.google.common.io.Files;
* The following commands may be useful:
* <p>
* <code>
- * cp ~/.m2/repository/io/brooklyn/brooklyn-dist/0.7.0-SNAPSHOT/brooklyn-dist-0.7.0-SNAPSHOT-dist.tar.gz ~/.brooklyn/repository/BrooklynNode/0.7.0-SNAPSHOT/BrooklynNode-0.7.0-SNAPSHOT.tar.gz
+ * cp ~/.m2/repository/org/apache/brooklyn/brooklyn-dist/0.7.0-SNAPSHOT/brooklyn-dist-0.7.0-SNAPSHOT-dist.tar.gz ~/.brooklyn/repository/BrooklynNode/0.7.0-SNAPSHOT/BrooklynNode-0.7.0-SNAPSHOT.tar.gz
* rm -rf /tmp/brooklyn-`whoami`/installs/BrooklynNode*
* </code>
*/
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8e4878d9/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java
index c36adbc..21e3f34 100644
--- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java
+++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java
@@ -58,19 +58,21 @@ public class BrooklynNodeTest {
@Test
public void testGeneratesCorrectSnapshotDownload() throws Exception {
- String version = "0.6.0-SNAPSHOT";
- String expectedUrl = "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=io.brooklyn&v="+version+"&a=brooklyn-dist&c=dist&e=tar.gz";
+ String version = "0.7.0-SNAPSHOT"; // BROOKLYN_VERSION
+ String expectedUrl = "https://repository.apache.org/service/local/artifact/maven/redirect?r=snapshots&g=org.apache.brooklyn&v="+version+"&a=brooklyn-dist&c=dist&e=tar.gz";
runTestGeneratesCorrectDownloadUrl(version, expectedUrl);
}
@Test
public void testGeneratesCorrectReleaseDownload() throws Exception {
- String version = "0.5.0";
- String expectedUrl = "http://search.maven.org/remotecontent?filepath=io/brooklyn/brooklyn-dist/"+version+"/brooklyn-dist-"+version+"-dist.tar.gz";
+ String version = "0.7.0";
+ String expectedUrl = "http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/brooklyn-dist/"+version+"/brooklyn-dist-"+version+"-dist.tar.gz";
runTestGeneratesCorrectDownloadUrl(version, expectedUrl);
}
private void runTestGeneratesCorrectDownloadUrl(String version, String expectedUrl) throws Exception {
+ // TODO Using BrooklynNodeImpl directly, because want to instantiate a BroolynNodeSshDriver.
+ // Really want to make that easier to test, without going through "wrong" code path for creating entity.
BrooklynNodeImpl entity = new BrooklynNodeImpl();
entity.configure(MutableMap.of("version", version));
entity.setParent(app);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8e4878d9/usage/dist/src/main/dist/conf/catalog.xml
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/dist/conf/catalog.xml b/usage/dist/src/main/dist/conf/catalog.xml
index d016849..a433185 100644
--- a/usage/dist/src/main/dist/conf/catalog.xml
+++ b/usage/dist/src/main/dist/conf/catalog.xml
@@ -30,8 +30,8 @@
</template>
<classpath>
- <entry>https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-simple-web-cluster&v=0.7.0-SNAPSHOT&e=jar</entry> <!-- BROOKLYN_VERSION -->
- <entry>https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-global-web-fabric&v=0.7.0-SNAPSHOT&e=jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>https://repository.apache.org/service/local/artifact/maven/redirect?r=releases&g=org.apache.brooklyn.example&a=brooklyn-example-simple-web-cluster&v=0.7.0-SNAPSHOT&e=jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>https://repository.apache.org/service/local/artifact/maven/redirect?r=releases&g=org.apache.brooklyn.example&a=brooklyn-example-global-web-fabric&v=0.7.0-SNAPSHOT&e=jar</entry> <!-- BROOKLYN_VERSION -->
</classpath>
</catalog>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8e4878d9/utils/common/src/main/java/brooklyn/util/maven/MavenRetriever.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/maven/MavenRetriever.java b/utils/common/src/main/java/brooklyn/util/maven/MavenRetriever.java
index 9753b19..7840d7b 100644
--- a/utils/common/src/main/java/brooklyn/util/maven/MavenRetriever.java
+++ b/utils/common/src/main/java/brooklyn/util/maven/MavenRetriever.java
@@ -29,18 +29,36 @@ import com.google.common.base.Function;
* with some methods checking local file system, and allowing the generators for each to be specified */
public class MavenRetriever {
- public static final Function<MavenArtifact,String> SONATYPE_SNAPSHOT_URL_GENERATOR = new Function<MavenArtifact, String>() {
+ public static final Function<MavenArtifact,String> CONDITIONAL_SNAPSHOT_URL_GENERATOR = new Function<MavenArtifact, String>() {
public String apply(MavenArtifact artifact) {
- return "https://oss.sonatype.org/service/local/artifact/maven/redirect?" +
- "r=snapshots&" +
- "v="+Urls.encode(artifact.version)+"&" +
- "g="+Urls.encode(artifact.groupId)+"&" +
- "a="+Urls.encode(artifact.artifactId)+"&" +
- (artifact.classifier!=null ? "c="+Urls.encode(artifact.classifier)+"&" : "")+
- "e="+Urls.encode(artifact.packaging);
+ if (artifact.groupId.startsWith("org.apache")) {
+ return APACHE_SNAPSHOT_URL_GENERATOR.apply(artifact);
+ } else {
+ return SONATYPE_SNAPSHOT_URL_GENERATOR.apply(artifact);
+ }
}
};
+ public static final Function<MavenArtifact,String> SONATYPE_SNAPSHOT_URL_GENERATOR =
+ nexusSnapshotUrlGenerator("https://oss.sonatype.org");
+
+ public static final Function<MavenArtifact,String> APACHE_SNAPSHOT_URL_GENERATOR =
+ nexusSnapshotUrlGenerator("https://repository.apache.org");
+
+ public static Function<MavenArtifact,String> nexusSnapshotUrlGenerator(final String baseUrl) {
+ return new Function<MavenArtifact, String>() {
+ public String apply(MavenArtifact artifact) {
+ return baseUrl+"/service/local/artifact/maven/redirect?" +
+ "r=snapshots&" +
+ "v="+Urls.encode(artifact.version)+"&" +
+ "g="+Urls.encode(artifact.groupId)+"&" +
+ "a="+Urls.encode(artifact.artifactId)+"&" +
+ (artifact.classifier!=null ? "c="+Urls.encode(artifact.classifier)+"&" : "")+
+ "e="+Urls.encode(artifact.packaging);
+ }
+ };
+ }
+
public static final Function<MavenArtifact,String> MAVEN_CENTRAL_URL_GENERATOR = new Function<MavenArtifact, String>() {
public String apply(MavenArtifact artifact) {
return "http://search.maven.org/remotecontent?filepath="+
@@ -59,7 +77,7 @@ public class MavenRetriever {
}
};
- protected Function<MavenArtifact,String> snapshotUrlGenerator = SONATYPE_SNAPSHOT_URL_GENERATOR;
+ protected Function<MavenArtifact,String> snapshotUrlGenerator = CONDITIONAL_SNAPSHOT_URL_GENERATOR;
protected Function<MavenArtifact,String> releaseUrlGenerator = MAVEN_CENTRAL_URL_GENERATOR;
public void setSnapshotUrlGenerator(Function<MavenArtifact, String> snapshotUrlGenerator) {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8e4878d9/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java b/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java
index c847d8d..df8eef4 100644
--- a/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java
+++ b/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java
@@ -39,12 +39,13 @@ public class MavenArtifactTest {
// only *integration* tests require these to be *installed*;
// note this may vary from machine to machine so version should be aligned with that in parent pom
final static String MAVEN_JAR_PLUGIN_COORDINATE = "org.apache.maven.plugins:maven-jar-plugin:jar:2.3.2";
- final static String THIS_PROJECT_COORDINATE = "io.brooklyn:brooklyn-utils-common:jar:0.7.0-SNAPSHOT"; // BROOKLYN_VERSION
+ final static String THIS_PROJECT_COORDINATE = "org.apache.brooklyn:brooklyn-utils-common:jar:0.7.0-SNAPSHOT"; // BROOKLYN_VERSION
// Don't need to be installed, only used as examples
final static String RELEASED_SOURCES_COORDINATE = "io.brooklyn:brooklyn-core:jar:sources:0.6.0";
final static String EXAMPLE_BZIP_COORDINATE = "com.example:example-artifact:tar.bz2:server-windows:2.0.1";
+ @Test
public void testArtifact() {
MavenArtifact m = MavenArtifact.fromCoordinate(MAVEN_JAR_PLUGIN_COORDINATE);
@@ -60,6 +61,7 @@ public class MavenArtifactTest {
Assert.assertEquals(m.isSnapshot(), false);
}
+ @Test
public void testArtifactWithClassifier() {
MavenArtifact m = MavenArtifact.fromCoordinate(RELEASED_SOURCES_COORDINATE);
@@ -73,6 +75,7 @@ public class MavenArtifactTest {
}
+ @Test
public void testRetrieval() {
MavenArtifact m = MavenArtifact.fromCoordinate(MAVEN_JAR_PLUGIN_COORDINATE);
@@ -85,6 +88,7 @@ public class MavenArtifactTest {
localPath);
}
+ @Test
public void testRetrievalWithClassifier() {
MavenArtifact m = MavenArtifact.fromCoordinate(RELEASED_SOURCES_COORDINATE);
@@ -94,6 +98,7 @@ public class MavenArtifactTest {
localPath);
}
+ @Test
public void testRetrievalWithUnusualClassifier() {
MavenArtifact m = MavenArtifact.fromCoordinate(EXAMPLE_BZIP_COORDINATE);
@@ -103,6 +108,7 @@ public class MavenArtifactTest {
localPath);
}
+ @Test
public void testSnapshotRetrieval() {
MavenArtifact m = MavenArtifact.fromCoordinate(THIS_PROJECT_COORDINATE);
@@ -112,11 +118,11 @@ public class MavenArtifactTest {
}
String hostedUrl = new MavenRetriever().getHostedUrl(m);
- Assert.assertTrue(hostedUrl.contains("sonatype"), hostedUrl);
+ Assert.assertTrue(hostedUrl.contains("repository.apache.org"), hostedUrl);
String localPath = new MavenRetriever().getLocalPath(m);
Assert.assertTrue(localPath.contains(
- "/repository/io/brooklyn"));
+ "/repository/org/apache/brooklyn"));
}
@Test(groups="Integration")
@@ -161,7 +167,7 @@ public class MavenArtifactTest {
@Test(groups="Integration")
public void testRetrievalHostedSnapshotIntegration() {
MavenArtifact m = MavenArtifact.fromCoordinate(
- "io.brooklyn:brooklyn-utils-common:jar:0.7.0-SNAPSHOT"); // BROOKLYN_VERSION
+ "org.apache.brooklyn:brooklyn-utils-common:jar:0.7.0-SNAPSHOT"); // BROOKLYN_VERSION
String localPath = new MavenRetriever().getLocalPath(m);
File f = new File(localPath);