Prepare 1.0.0-m.1 release

* Update dependencies and build scripts
* Fix tests for new version

.travis.yml

@@ -36,6 +36,8 @@ notifications:
     on_success: always
     on_failure: always
     on_start: always
+    on_cancel: always
+    on_error: always
     urls:
     - https://webhook.atomist.com/travis
 cache:
@@ -51,7 +53,7 @@ deploy:
   skip_cleanup: true
   on:
     tags: true
-    condition: $TRAVIS_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$
+    condition: $TRAVIS_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+(-(m|rc)\.[0-9]+)?$
 after_deploy:
 - bash src/main/scripts/update-brew.bash $HOMEBREW_TAP $GITHUB_TOKEN
 - bash src/main/scripts/update-brew.bash atomisthq/s3-images $GITHUB_TOKEN images/Formula

CHANGELOG.md

@@ -7,7 +7,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-[Unreleased]: https://github.com/atomist/rug-cli/compare/0.33.4...HEAD
+[Unreleased]: https://github.com/atomist/rug-cli/compare/1.0.0-m.1...HEAD
+
+## [1.0.0-m.1] - 2017-04-26
+
+Initial milestone 1 release
+
+[1.0.0-m.1]: https://github.com/atomist/rug-cli/compare/0.34.0...1.0.0-m.1
+
+### Changed
+
+-	Upgrade all Atomist dependencies to 1.0.0-m.1
+
+## [0.34.0] - 2017-04-24
+
+[0.34.0]: https://github.com/atomist/rug-cli/compare/0.33.4...0.34.0
 
 ### Changed
 

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.atomist</groupId>
 	<artifactId>rug-cli</artifactId>
-	<version>0.34.0-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>rug-cli</name>
 	<description>CLI for creating and running Rugs</description>
@@ -15,8 +15,8 @@
 		<timestamp>${maven.build.timestamp}</timestamp>
 		<java.version>1.8</java.version>
 		<maven.version>3.3.9</maven.version>
-		<rug.version>(0.26.1,1.0.0)</rug.version>
-		<rug-resolver.version>0.20.0</rug-resolver.version>
+		<rug.version>1.0.0-m.1</rug.version>
+		<rug-resolver.version>1.0.0-m.1</rug-resolver.version>
 	</properties>
 	<licenses>
 		<license>
@@ -32,7 +32,7 @@
 			<dependency>
 				<groupId>com.atomist</groupId>
 				<artifactId>atomist-bom</artifactId>
-				<version>0.11.0</version>
+				<version>1.0.0-m.1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>com.atomist</groupId>
 			<artifactId>artifact-source</artifactId>
-			<version>0.26.0</version>
+			<version>1.0.0-m.1</version>
 			<exclusions>
 				<exclusion>
 					<groupId>ch.qos.logback</groupId>

src/main/java/com/atomist/rug/cli/Constants.java

@@ -15,7 +15,7 @@ public class Constants {
     public static final String ARTIFACT = "rug-cli";
 
     public static final String RUG_ARTIFACT = "rug";
-    public static final String RUG_VERSION_RANGE = "[0.27.0,1.0.0)";
+    public static final String RUG_VERSION_RANGE = "[1.0.0-m.1,2.0.0)";
 
     public static final String ATOMIST_ROOT = ".atomist";
     public static final String CLI_CONFIG_NAME = "cli.yml";

src/main/resources/gestures/rug.yml

@@ -6,7 +6,7 @@ generate_rug_project:
     as OWNER.  DESCRIPTION should be a short introduction to what your new rug project is about." 
   commands:
     - "/echo ${cyan}${divider}${/cyan} ${bold}Loading generator${/bold}"
-    - "shell atomist:rug-editors:latest"
+    - "shell atomist:rug-rugs:latest"
     - "/echo \n${line}\n\n${cyan}${divider}${/cyan} ${bold}Generating new rug project${/bold}"
     - "generate NewRugProject ${project_name:my-rug-archive} owner=${owner:my-rugs} description=${description:\"My first Rug archive\"} -R"
     - "/cd ${project_name:my-rug-archive}"

src/main/scripts/travis-build.bash

@@ -19,7 +19,7 @@ function main() {
 
     local mvn="mvn --settings .settings.xml -B -V -U"
     local project_version
-    if [[ $TRAVIS_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+    if [[ $TRAVIS_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+(-(m|rc)\.[0-9]+)?$ ]]; then
         if ! $mvn build-helper:parse-version versions:set -DnewVersion="$TRAVIS_TAG" versions:commit; then
             err "failed to set project version"
             return 1
@@ -53,7 +53,7 @@ function main() {
    		return 1
 	fi
 
-    if [[ $TRAVIS_BRANCH == master || $TRAVIS_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+    if [[ $TRAVIS_BRANCH == master || $TRAVIS_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+(-(m|rc)\.[0-9]+)?$ ]]; then
         msg "version is $project_version"
         local mvn_deploy_args
         if [[ $TRAVIS_BRANCH == master ]]; then
@@ -83,7 +83,7 @@ function main() {
         fi
 
         # Build the Docker image only on releases
-        if [[ $TRAVIS_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+        if [[ $TRAVIS_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+(-(m|rc)\.[0-9]+)$ ]]; then
             if ! $mvn docker:build -DpushImageTag; then
                 err "maven docker build or push failed"
                 return 1

src/test/resources/common-editors/.atomist/manifest.yml

@@ -1,7 +1,7 @@
 group: rug-cli-tests
 artifact: common-editors
 version: "0.8.0"
-requires: "[0.26.1,1.0.0)"
+requires: "[1.0.0-m.1,2.0.0)"
 dependencies:
 extensions:
 

src/test/resources/handlers-failing-verification/.atomist/manifest.yml

@@ -2,7 +2,7 @@ group: rug-cli-tests
 artifact: handlers-failing-verification
 version: "0.12.0"
 
-requires: "[0.26.1,1.0.0)"
+requires: "[1.0.0-m.1,2.0.0)"
 
 dependencies:
 

src/test/resources/handlers/.atomist/manifest.yml

@@ -2,7 +2,7 @@ group: rug-cli-tests
 artifact: handlers
 version: "0.12.0"
 
-requires: "[0.26.1,1.0.0)"
+requires: "[1.0.0-m.1,2.0.0)"
 
 dependencies:
 

src/test/resources/repository/atomist-rugs/common-editors/0.8.0/common-editors-0.8.0.pom

@@ -11,7 +11,7 @@
     <dependency>
       <groupId>com.atomist</groupId>
       <artifactId>rug</artifactId>
-      <version>(0.26.1,1.0.0)</version>
+      <version>[1.0.0-m.1,2.0.0)</version>
     </dependency>
   </dependencies>
 </project>

src/test/resources/repository/atomist-rugs/rug-editors/0.25.0/rug-editors-0.25.0.pom

@@ -11,7 +11,7 @@
     <dependency>
       <groupId>com.atomist</groupId>
       <artifactId>rug</artifactId>
-      <version>[0.26.1,1.0.0)</version>
+      <version>[1.0.0-m.1,2.0.0)</version>
     </dependency>
   </dependencies>
 </project>

src/test/resources/repository/atomist-rugs/rug-project/0.3.0/rug-project-0.3.0.pom

@@ -11,7 +11,7 @@
     <dependency>
       <groupId>com.atomist</groupId>
       <artifactId>rug</artifactId>
-      <version>(0.26.1,1.0.0)</version>
+      <version>[1.0.0-m.1,2.0.0)</version>
     </dependency>
     <dependency>
       <groupId>atomist-rugs</groupId>

src/test/resources/repository/atomist-rugs/spring-boot-rest-service/0.10.0/spring-boot-rest-service-0.10.0.pom

@@ -11,7 +11,7 @@
     <dependency>
       <groupId>com.atomist</groupId>
       <artifactId>rug</artifactId>
-      <version>(0.26.1,1.0.0)</version>
+      <version>[1.0.0-m.1,2.0.0)</version>
     </dependency>
   </dependencies>
 </project>