From b820d97db73211bbe7a72be6aa315fdca2aaa556 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Fri, 2 Mar 2018 12:25:21 -0500 Subject: [PATCH] Prepares 0.9.3 release --- .bumpversion.cfg | 5 ++-- .travis.yml | 2 +- CHANGELOG.md | 24 +++++++++++++++---- CONTRIBUTING.md | 2 +- setup.cfg | 2 +- .../static/salt/formulas/dotnet4-formula | 2 +- .../static/salt/formulas/scap-formula | 2 +- 7 files changed, 28 insertions(+), 11 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 7d8ccb4e6..8afe87d55 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.9.3.dev +current_version = 0.9.3 commit = False tag = False tag_name = {new_version} @@ -9,5 +9,6 @@ tag_name = {new_version} [bumpversion:file:CHANGELOG.md] [bumpversion:part:release] -values = +values = dev + diff --git a/.travis.yml b/.travis.yml index ab10263e2..637af4545 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,7 +97,7 @@ deploy: name: $WAM_VERSION tag_name: $WAM_VERSION body: $WAM_BODY - draft: true + draft: false skip_cleanup: true api_key: secure: NZQua4PHfAugtez+Kkp+TZxxg8sgFPuTnEmJmQ/BBazUTWy5IGcMJFcQxI6y+YVmiiMshwV36B53sQaY9lLwZEaPARjPMNprBCRuGR436s5UrkmDSAl2uH7kbpEkbsIA2L4V++85v0q2PVSacgWW8abGs0mHydA6chHKewlvKiyI5PqlEhgABPx5LDIF2Wmrg/YfdPxtmMb9IHP0LN1sj5x59dxe727fbY6/kUpb4mrQ306EHBYSMi4E2mpP2zIlrt21KUuU8iFHNaRKUzSlq5Lva4JeoKlh3RT7G3YA4u+7dH5eJUxnHFFhFnLBIz1d2wDY1tVaEGX1CDAKW6lSCBBOarnLnDkvtLDD23NVUNXC81+7OLObaw63rtubfC3syZ1Kp517R4vgIZwRhBrvvJDr2IO5X/YtHVETBwkhDb8Ol8djXrwRbOeEgGWwkU66BbgX2HlcoggQqDhDWZWBosu7iz01pXvAFKiylNHbPULNV2gOM9HzY0kmxq3/zzwdBfLxJH8delSCK1uvQpZlmaBW6SA0/l7yuoxDN8KrXSRgwuE9A3XuMe6ZhbU5AZSqWA7vMdnwCg05xK2zo3Xohi7QE4AxY1jZW2ficBWWWFcdUTZpG+TRKC8LzQWBmZ61s9lNn+HfFC5yqYkJopLPeRYzfyeUJN79rr9leC04sVI= diff --git a/CHANGELOG.md b/CHANGELOG.md index 901b78ba9..fd037ab7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,30 @@ ## Changelog -### 0.9.3.dev +### 0.9.3 -**Commit Delta**: [Change from 0.9.2 release](https://github.com/plus3it/watchmaker/compare/0.9.2...0.9.3.dev) +**Commit Delta**: [Change from 0.9.2 release](https://github.com/plus3it/watchmaker/compare/0.9.2...0.9.3) -**Released**: TBD +**Released**: 2017.03.08 **Summary**: -* TBD +* scap-formula + - Incorporates content from OpenSCAP Security Guide v0.1.38-1 + - Incorporates content from latest DISA SCAP benchmarks + - Microsoft Internet Explorer 11 STIG Benchmark - Ver 1, Rel 11 + - Microsoft Windows 10 STIG Benchmark - Ver 1, Rel 10 + - Microsoft Windows 2008 R2 DC STIG Benchmark - Ver 1, Rel 27 + - Microsoft Windows 2008 R2 MS STIG Benchmark - Ver 1, Rel 28 + - Microsoft Windows 2012 and 2012 R2 DC STIG Benchmark - Ver 2, Rel 11 + - Microsoft Windows 2012 and 2012 R2 MS STIG Benchmark - Ver 2, Rel 11 + - Microsoft Windows 8/8.1 STIG Benchmark - Ver 1, Rel 21 + - Microsoft Windows Server 2016 STIG Benchmark - Ver 1, Rel 4 + - Red Hat 6 STIG Benchmark - Ver 1, Rel 18 + - Red Hat 7 STIG Benchmark - Ver 1, Rel 2 +* dotnet4-formula + - Skips dotnet4 hotfix install if a newer version is already installed + - Creates per-OS maps for hotfix updates, since the hotfix id varies per + OS ### 0.9.2 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4cdaf7319..e3620e707 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -180,7 +180,7 @@ specify something like this for EC2 userdata: $GitRepo = "https://github.com//watchmaker.git" $GitBranch = "" - $BootstrapUrl = "https://raw.githubusercontent.com/plus3it/watchmaker/master/docs/files/bootstrap/watchmaker-bootstrap.ps1" + $BootstrapUrl = "https://raw.githubusercontent.com/plus3it/watchmaker/develop/docs/files/bootstrap/watchmaker-bootstrap.ps1" $PythonUrl = "https://www.python.org/ftp/python/3.6.4/python-3.6.4-amd64.exe" $GitUrl = "https://github.com/git-for-windows/git/releases/download/v2.16.2.windows.1/Git-2.16.2-64-bit.exe" $PypiUrl = "https://pypi.org/simple" diff --git a/setup.cfg b/setup.cfg index a2347b420..e10686ffb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [metadata] name = watchmaker description = Applied Configuration Management -version = 0.9.3.dev +version = 0.9.3 author = Plus3IT Maintainers of Watchmaker author_email = projects@plus3it.com url = https://github.com/plus3it/watchmaker diff --git a/src/watchmaker/static/salt/formulas/dotnet4-formula b/src/watchmaker/static/salt/formulas/dotnet4-formula index 4e4da7251..679bbdf3b 160000 --- a/src/watchmaker/static/salt/formulas/dotnet4-formula +++ b/src/watchmaker/static/salt/formulas/dotnet4-formula @@ -1 +1 @@ -Subproject commit 4e4da7251120dd66cfb3b77dc430d0d4e8b1c11e +Subproject commit 679bbdf3b451b2e738085d7197146c9808f14dfe diff --git a/src/watchmaker/static/salt/formulas/scap-formula b/src/watchmaker/static/salt/formulas/scap-formula index 182d54637..b5e359abf 160000 --- a/src/watchmaker/static/salt/formulas/scap-formula +++ b/src/watchmaker/static/salt/formulas/scap-formula @@ -1 +1 @@ -Subproject commit 182d54637037b96327675b17e12008c4f9db3626 +Subproject commit b5e359abfaedb5629b26bb011040e00276fd8e5d