Repository: brooklyn-dist
Updated Branches:
  refs/heads/master 7ca4ddc77 -> c259d6f20


Make archetypeRepository configurable

If archetypeRepository is set when using the quickstart archetype,
then add that URL to the pom.xml. This allows a customer’s private
maven artifactory to be used for accessing timestamped builds of
Brooklyn (for example).

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/dd8b0b3e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/dd8b0b3e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/dd8b0b3e

Branch: refs/heads/master
Commit: dd8b0b3e92a764524bb388ca70f2d8127a398c78
Parents: 7ca4ddc
Author: Aled Sage <aled.s...@gmail.com>
Authored: Wed Sep 28 15:49:31 2016 +0100
Committer: Aled Sage <aled.s...@gmail.com>
Committed: Wed Sep 28 15:49:31 2016 +0100

----------------------------------------------------------------------
 archetypes/quickstart/pom.xml                                  | 1 +
 archetypes/quickstart/src/brooklyn-sample/pom.xml              | 5 +++++
 .../src/main/resources/META-INF/maven/archetype-metadata.xml   | 6 ++++++
 .../resources/projects/integration-test-1/archetype.properties | 1 +
 4 files changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dd8b0b3e/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml
index fa5d07d..8a1553f 100644
--- a/archetypes/quickstart/pom.xml
+++ b/archetypes/quickstart/pom.xml
@@ -180,6 +180,7 @@
                 <replacement> <token>\$</token> <value>\\\$</value> 
</replacement>
                 -->
                 
+                <replacement> <token>brooklyn-sample-extra-repo-url</token> 
<value>\$\{archetypeRepository}</value> </replacement>
                 <replacement> <token>brooklyn-sample</token> 
<value>\$\{artifactId}</value> </replacement>
                 <replacement> <token>com\.acme\.sample\.brooklyn</token> 
<value>\$\{package}</value> </replacement>
                 <replacement> <token>com/acme/sample/brooklyn</token> 
<value>\$\{packageInPathFormat}</value> </replacement>

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dd8b0b3e/archetypes/quickstart/src/brooklyn-sample/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/src/brooklyn-sample/pom.xml 
b/archetypes/quickstart/src/brooklyn-sample/pom.xml
index 7604ca4..e211f6c 100644
--- a/archetypes/quickstart/src/brooklyn-sample/pom.xml
+++ b/archetypes/quickstart/src/brooklyn-sample/pom.xml
@@ -47,6 +47,11 @@
 
   <repositories>
     <repository>
+      <id>extra.repo</id>
+      <name>Extra Repository</name>
+      <url>brooklyn-sample-extra-repo-url</url> 
+    </repository>
+    <repository>
       <id>apache.snapshots</id>
       <name>Apache Snapshot Repository</name>
       <url>http://repository.apache.org/snapshots</url>

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dd8b0b3e/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git 
a/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
 
b/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
index 4768945..fda2403 100644
--- 
a/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ 
b/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -20,6 +20,12 @@
 <archetype 
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
   
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0
 http://maven.apache.org/xsd/archetype-1.0.0.xsd";>
 
+  <requiredProperties>
+    <requiredProperty key="archetypeRepository">
+      
<defaultValue>https://repository.apache.org/content/repositories/releases</defaultValue>
+    </requiredProperty>
+  </requiredProperties>
+
   <fileSets>
     <fileSet filtered="true" packaged="true">
       <directory>src/main/java</directory>

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dd8b0b3e/archetypes/quickstart/src/test/resources/projects/integration-test-1/archetype.properties
----------------------------------------------------------------------
diff --git 
a/archetypes/quickstart/src/test/resources/projects/integration-test-1/archetype.properties
 
b/archetypes/quickstart/src/test/resources/projects/integration-test-1/archetype.properties
index d1f4da4..f1a33ac 100644
--- 
a/archetypes/quickstart/src/test/resources/projects/integration-test-1/archetype.properties
+++ 
b/archetypes/quickstart/src/test/resources/projects/integration-test-1/archetype.properties
@@ -20,3 +20,4 @@ groupId=com.acme.sample
 artifactId=brooklyn-sample
 version=0.1.0-SNAPSHOT
 package=com.acme.sample.brooklyn
+archetypeRepository=brooklyn-sample-extra-repo-url
\ No newline at end of file

Reply via email to