Skip to content

Commit

Permalink
Merge branch 'release-1.5.0' into develop. Close #178.
Browse files Browse the repository at this point in the history
**Description**

Version 1.5.0 of Ogma is ready and should be closed.

**Type**

- Management: release and publication.

**Additional context**

None.

**Requester**

- Ivan Perez.

**Method to check presence of bug**

Not applicable (not a bug).

**Expected result**

- Cabal files indicate new version number, constraints are adjusted as
  needed, commit is tagged with version number.

**Solution implemented**

- Cabal files indicate new version number, constraints are adjusted as
  needed, commit is tagged with version number.

**Further notes**

- None.
  • Loading branch information
ivanperez-keera committed Nov 22, 2024
2 parents 3836380 + 53df563 commit 82bd8ca
Show file tree
Hide file tree
Showing 18 changed files with 46 additions and 22 deletions.
3 changes: 2 additions & 1 deletion ogma-cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Revision history for ogma-cli

## [1.X.Y] - 2024-11-21
## [1.5.0] - 2024-11-21

* Version bump 1.5.0 (#178).
* Provide ability to customize template in cfs command (#157).
* Provide ability to customize template in ros command (#162).
* Introduce new standalone command (#170).
Expand Down
4 changes: 2 additions & 2 deletions ogma-cli/ogma-cli.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Simple

name: ogma-cli
version: 1.4.1
version: 1.5.0
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
Expand Down Expand Up @@ -134,7 +134,7 @@ executable ogma
build-depends:
base >= 4.11.0.0 && < 5
, optparse-applicative
, ogma-core >= 1.4.1 && < 1.5
, ogma-core >= 1.5.0 && < 1.6

hs-source-dirs:
src
Expand Down
3 changes: 2 additions & 1 deletion ogma-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Revision history for ogma-core

## [1.X.Y] - 2024-11-21
## [1.5.0] - 2024-11-21

* Version bump 1.5.0 (#178).
* Fix incorrect path when using Space ROS humble-2024.10.0 (#158).
* Use template expansion system to generate cFS monitoring application (#157).
* Use template expansion system to generate ROS monitoring application (#162).
Expand Down
16 changes: 8 additions & 8 deletions ogma-core/ogma-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Simple

name: ogma-core
version: 1.4.1
version: 1.5.0
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
Expand Down Expand Up @@ -114,13 +114,13 @@ library
, mtl
, text >= 1.2.3.1 && < 2.1

, ogma-extra >= 1.4.1 && < 1.5
, ogma-language-c >= 1.4.1 && < 1.5
, ogma-language-cocospec >= 1.4.1 && < 1.5
, ogma-language-copilot >= 1.4.1 && < 1.5
, ogma-language-jsonspec >= 1.4.1 && < 1.5
, ogma-language-smv >= 1.4.1 && < 1.5
, ogma-spec >= 1.4.1 && < 1.5
, ogma-extra >= 1.5.0 && < 1.6
, ogma-language-c >= 1.5.0 && < 1.6
, ogma-language-cocospec >= 1.5.0 && < 1.6
, ogma-language-copilot >= 1.5.0 && < 1.6
, ogma-language-jsonspec >= 1.5.0 && < 1.6
, ogma-language-smv >= 1.5.0 && < 1.6
, ogma-spec >= 1.5.0 && < 1.6

hs-source-dirs:
src
Expand Down
3 changes: 2 additions & 1 deletion ogma-extra/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Revision history for ogma-extra

## [1.X.Y] - 2024-11-20
## [1.5.0] - 2024-11-21

* Version bump 1.5.0 (#178).
* Introduce template expansion functionality (#162).

## [1.4.1] - 2024-09-21
Expand Down
2 changes: 1 addition & 1 deletion ogma-extra/ogma-extra.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Simple

name: ogma-extra
version: 1.4.1
version: 1.5.0
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
Expand Down
4 changes: 4 additions & 0 deletions ogma-language-c/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-language-c

## [1.5.0] - 2024-11-21

* Version bump 1.5.0 (#178).

## [1.4.1] - 2024-09-21

* Version bump 1.4.1 (#155).
Expand Down
2 changes: 1 addition & 1 deletion ogma-language-c/ogma-language-c.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Custom

name: ogma-language-c
version: 1.4.1
version: 1.5.0
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
Expand Down
4 changes: 4 additions & 0 deletions ogma-language-cocospec/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-language-cocospec

## [1.5.0] - 2024-11-21

* Version bump 1.5.0 (#178).

## [1.4.1] - 2024-09-21

* Version bump 1.4.1 (#155).
Expand Down
2 changes: 1 addition & 1 deletion ogma-language-cocospec/ogma-language-cocospec.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Custom

name: ogma-language-cocospec
version: 1.4.1
version: 1.5.0
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
Expand Down
4 changes: 4 additions & 0 deletions ogma-language-copilot/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-language-copilot

## [1.5.0] - 2024-11-21

* Version bump 1.5.0 (#178).

## [1.4.1] - 2024-09-21

* Version bump 1.4.1 (#155).
Expand Down
2 changes: 1 addition & 1 deletion ogma-language-copilot/ogma-language-copilot.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Simple

name: ogma-language-copilot
version: 1.4.1
version: 1.5.0
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
Expand Down
3 changes: 2 additions & 1 deletion ogma-language-jsonspec/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Revision history for ogma-language-jsonspec

## [1.X.Y] - 2024-11-21
## [1.5.0] - 2024-11-21

* Version bump 1.5.0 (#178).
* Make JSONFormat readable (#170).

## [1.4.1] - 2024-09-21
Expand Down
4 changes: 2 additions & 2 deletions ogma-language-jsonspec/ogma-language-jsonspec.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Simple

name: ogma-language-jsonspec
version: 1.4.1
version: 1.5.0
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
Expand Down Expand Up @@ -70,7 +70,7 @@ library
, megaparsec
, bytestring

, ogma-spec >= 1.4.1 && < 1.5
, ogma-spec >= 1.5.0 && < 1.6

hs-source-dirs:
src
Expand Down
4 changes: 4 additions & 0 deletions ogma-language-smv/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-language-smv

## [1.5.0] - 2024-11-21

* Version bump 1.5.0 (#178).

## [1.4.1] - 2024-09-21

* Version bump 1.4.1 (#155).
Expand Down
2 changes: 1 addition & 1 deletion ogma-language-smv/ogma-language-smv.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Custom

name: ogma-language-smv
version: 1.4.1
version: 1.5.0
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
Expand Down
4 changes: 4 additions & 0 deletions ogma-spec/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-spec

## [1.5.0] - 2024-11-21

* Version bump 1.5.0 (#178).

## [1.4.1] - 2024-09-21

* Version bump 1.4.1 (#155).
Expand Down
2 changes: 1 addition & 1 deletion ogma-spec/ogma-spec.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Simple

name: ogma-spec
version: 1.4.1
version: 1.5.0
homepage: https://github.com/nasa/ogma
license: OtherLicense
license-file: LICENSE.pdf
Expand Down

0 comments on commit 82bd8ca

Please sign in to comment.