Skip to content
This repository has been archived by the owner on Mar 19, 2019. It is now read-only.

Commit

Permalink
Prepare 1.0.0-m.1
Browse files Browse the repository at this point in the history
  • Loading branch information
cdupuis committed Apr 26, 2017
1 parent 0a6bec1 commit 4ea14e1
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

[Unreleased]: https://github.com/atomist/rug/compare/0.26.1...HEAD
[Unreleased]: https://github.com/atomist/rug/compare/1.0.0-m.1...HEAD

## [1.0.0-m.1] - 2017-04-26

[1.0.0-m.1]: https://github.com/atomist/rug/compare/0.26.1...1.0.0-m.1

### Added

Expand All @@ -17,7 +21,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

- **BREAKING** TypeScript `Match` now uses property access, not function

- Updated to artifact-source 0.26.0
- Updated all Atomist dependencies to 1.0.0-m.1 versions

- Handlers are now picked up from arrays as well as regular `vars`

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.atomist</groupId>
<artifactId>rug</artifactId>
<version>0.27.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>rug</name>
<description>Rug Runtime</description>
Expand All @@ -22,7 +22,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>
Expand All @@ -39,14 +39,14 @@
<dependency>
<groupId>com.atomist</groupId>
<artifactId>artifact-source</artifactId>
<version>0.26.0</version>
<version>1.0.0-m.1</version>
</dependency>
<!-- For now the TS compiler needs to stay as runtime dependency to make sure it gets brought into the CLI
when running rug install etc. This has to become part of the language <-> runtime version mapping -->
<dependency>
<groupId>com.atomist</groupId>
<artifactId>rug-typescript-compiler</artifactId>
<version>0.14.1</version>
<version>1.0.0-m.1</version>
</dependency>
<dependency>
<groupId>com.coveo</groupId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/scripts/travis-build.bash
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function main() {

local mvn="mvn --settings .settings.xml -B -V -P npm-release"
local project_version
if [[ $TRAVIS_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+(-m\.[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
Expand Down Expand Up @@ -49,7 +49,7 @@ function main() {
return 0
fi

if [[ $TRAVIS_BRANCH == master || $TRAVIS_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+(-m\.[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
Expand Down

0 comments on commit 4ea14e1

Please sign in to comment.