Skip to content

Commit 5a24d84

Browse files
committed
v2.0.0-RC-3 rename to variist, fix junit 5.14 issues
1 parent 3461e46 commit 5a24d84

3 files changed

Lines changed: 52 additions & 52 deletions

File tree

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Following a few guidelines so that others can quickly benefit from your contribu
1212

1313
## Code of Conduct
1414
This project and everyone participating in it is governed by Variist's
15-
[Code of Conduct](https://github.com/tegonal/variist/tree/main/.github/CODE_OF_CONDUCT.md).
15+
[Code of Conduct](https://github.com/tegonal/variist/tree/v2.0.0-RC-3/.github/CODE_OF_CONDUCT.md).
1616
By participating, you are expected to uphold this code. Please report unacceptable behaviour to info@tutteli.ch
1717

1818
## How to Contribute

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<!-- for main -->
2-
3-
[![Download](https://img.shields.io/badge/Download-v2.0.0--RC--2-%23007ec6)](https://central.sonatype.com/artifact/com.tegonal.variist/variist/2.0.0-RC-2)
2+
<!--
3+
[![Download](https://img.shields.io/badge/Download-v2.0.0--RC--2-%23007ec6)](https://central.sonatype.com/artifact/com.tegonal.variist/variist/2.0.0-RC-3)
44
[![EUPL 1.2](https://img.shields.io/badge/%E2%9A%96-EUPL%201.2-%230b45a6)](https://joinup.ec.europa.eu/collection/eupl/eupl-text-11-12 "License")
55
[![Quality Assurance](https://github.com/tegonal/variist/actions/workflows/quality-assurance.yml/badge.svg?event=push&branch=main)](https://github.com/tegonal/variist/actions/workflows/quality-assurance.yml?query=branch%3Amain)
66
[![Newcomers Welcome](https://img.shields.io/badge/%F0%9F%91%8B-Newcomers%20Welcome-blueviolet)](https://github.com/tegonal/variist/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22 "Ask in discussions for help")
7-
7+
-->
88
<!-- for main end -->
99
<!-- for release -->
10-
<!--
11-
[![Download](https://img.shields.io/badge/Download-v2.0.0--RC--2-%23007ec6)](https://central.sonatype.com/artifact/com.tegonal.variist/variist/2.0.0-RC-2)
10+
11+
[![Download](https://img.shields.io/badge/Download-v2.0.0--RC--2-%23007ec6)](https://central.sonatype.com/artifact/com.tegonal.variist/variist/2.0.0-RC-3)
1212
[![EUPL](https://img.shields.io/badge/%E2%9A%96-EUPL%201.2-%230b45a6)](https://joinup.ec.europa.eu/collection/eupl/eupl-text-11-12 "License")
1313
[![Newcomers Welcome](https://img.shields.io/badge/%F0%9F%91%8B-Newcomers%20Welcome-blueviolet)](https://github.com/tegonal/variist/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22 "Ask in discussions for help")
14-
-->
14+
1515
<!-- for release end -->
1616

1717
# Variist
@@ -24,7 +24,7 @@ case you don't have enough time to execute all of them.
2424
❗ You are taking a *sneak peek* at the next version. It could be that some features you find on this page are not
2525
released yet.
2626
Please have a look at the README of the corresponding release/git tag. Latest
27-
version: [README of v2.0.0-RC-2](https://github.com/tegonal/variist/tree/v2.0.0-RC-2/README.md).
27+
version: [README of v2.0.0-RC-3](https://github.com/tegonal/variist/tree/v2.0.0-RC-3/README.md).
2828

2929
---
3030

@@ -96,7 +96,7 @@ repositories {
9696
mavenCentral()
9797
}
9898
dependencies {
99-
testImplementation("com.tegonal.variist:variist:2.0.0-RC-2")
99+
testImplementation("com.tegonal.variist:variist:2.0.0-RC-3")
100100
}
101101
```
102102

@@ -1217,7 +1217,7 @@ Last but not least, we provide the extension method `Random.nextBigInt`.
12171217
12181218
# Code Documentation
12191219
1220-
Code documentation can be found on github-pages: <https://tegonal.github.io/variist/latest#/kdoc>.
1220+
Code documentation can be found on github-pages: <https://tegonal.github.io/variist/2.0.0-RC-3/kdoc>.
12211221
12221222
# Contributors and contribute
12231223
@@ -1236,7 +1236,7 @@ You are more than welcome to contribute as well:
12361236
the [help wanted issues](https://github.com/tegonal/variist/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22).
12371237
12381238
Please have a look at
1239-
[CONTRIBUTING.md](https://github.com/tegonal/variist/tree/main/.github/CONTRIBUTING.md)
1239+
[CONTRIBUTING.md](https://github.com/tegonal/variist/tree/v2.0.0-RC-3/.github/CONTRIBUTING.md)
12401240
for further suggestions and guidelines.
12411241
12421242
# License

build.gradle.kts

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
id("me.champeau.jmh") version "0.7.3"
88
}
99

10-
version = "2.0.0-RC-2"
10+
version = "2.0.0-RC-3"
1111
group = "com.tegonal.variist"
1212
description = "Library which helps to setup and prioritise parameterized tests"
1313

@@ -82,82 +82,82 @@ Release & deploy a commit
8282
1. update main:
8383
8484
85-
export MNLMST_PREVIOUS_VERSION=2.0.0-RC-2
86-
export MNLMST_VERSION=2.0.0-RC-3
85+
export VARIIST_PREVIOUS_VERSION=2.0.0-RC-3
86+
export VARIIST_VERSION=2.0.0-RC-3
8787
find ./ -name "*.md" | xargs perl -0777 -i \
88-
-pe "s@$MNLMST_PREVIOUS_VERSION@$MNLMST_VERSION@g;" \
89-
-pe "s@tree/main@tree/v$MNLMST_VERSION@g;" \
90-
-pe "s@latest#/kdoc@$MNLMST_VERSION/kdoc@g;"
88+
-pe "s@$VARIIST_PREVIOUS_VERSION@$VARIIST_VERSION@g;" \
89+
-pe "s@tree/main@tree/v$VARIIST_VERSION@g;" \
90+
-pe "s@latest#/kdoc@$VARIIST_VERSION/kdoc@g;"
9191
perl -0777 -i \
92-
-pe "s@$MNLMST_PREVIOUS_VERSION@$MNLMST_VERSION@g;" \
93-
-pe "s/version = \"${MNLMST_VERSION}-SNAPSHOT\"/version = \"$MNLMST_VERSION\"/;" \
92+
-pe "s@$VARIIST_PREVIOUS_VERSION@$VARIIST_VERSION@g;" \
93+
-pe "s/version = \"${VARIIST_VERSION}-SNAPSHOT\"/version = \"$VARIIST_VERSION\"/;" \
9494
./build.gradle.kts
9595
perl -0777 -i \
9696
-pe 's/(<!-- for main -->\n)\n([\S\s]*?)(\n<!-- for main end -->\n<!-- for release -->\n)<!--\n([\S\s]*?)-->\n(<!-- for release end -->)/$1<!--\n$2-->$3\n$4\n$5/;' \
9797
-pe 's/(---\n❗ You are taking[^-]*?---)/<!$1>/;' \
9898
./README.md
99-
git commit -a -m "v$MNLMST_VERSION"
99+
git commit -a -m "v$VARIIST_VERSION"
100100
101101
check changes (CONTRIBUTING.md, build.gradle.kts, README.md)
102102
git push
103103
104104
105105
2. prepare release on github
106-
a) git tag "v$MNLMST_VERSION"
107-
b) git push origin "v$MNLMST_VERSION"
106+
a) git tag "v$VARIIST_VERSION"
107+
b) git push origin "v$VARIIST_VERSION"
108108
c) Log in to github and create draft for the release
109109
110110
The tag is required for dokka in order that the externalLinkDocumentation works
111111
112112
3. update github pages:
113113
Assumes you have a variist-gh-pages folder on the same level as variist where the gh-pages branch is checked out
114114
115-
Either use the following commands or the manual steps below (assuming MNLMST_PREVIOUS_VERSION and MNLMST_VERSION
115+
Either use the following commands or the manual steps below (assuming VARIIST_PREVIOUS_VERSION and VARIIST_VERSION
116116
is already set from commands above)
117117
118-
Increment MNLMST_GH_PAGES_VERSIONS_JS_VERSION and MNLMST_GH_PAGES_VERSIONS_JS_VERSION__NEXT
118+
Increment VARIIST_GH_PAGES_VERSIONS_JS_VERSION and VARIIST_GH_PAGES_VERSIONS_JS_VERSION__NEXT
119119
120-
export MNLMST_GH_PAGES_LOGO_CSS_VERSION="1.3"
121-
export MNLMST_GH_PAGES_ALERT_CSS_VERSION="1.1"
122-
export MNLMST_GH_PAGES_VERSIONS_JS_VERSION="1.3.0"
123-
export MNLMST_GH_PAGES_VERSIONS_JS_VERSION_NEXT="1.4.0"
120+
export VARIIST_GH_PAGES_LOGO_CSS_VERSION="1.3"
121+
export VARIIST_GH_PAGES_ALERT_CSS_VERSION="1.1"
122+
export VARIIST_GH_PAGES_VERSIONS_JS_VERSION="1.3.0"
123+
export VARIIST_GH_PAGES_VERSIONS_JS_VERSION_NEXT="1.4.0"
124124
125125
gr dokkaHtml
126126
127127
cd ../variist-gh-pages
128-
git add . && git commit -m "dokka generation for v$MNLMST_VERSION"
128+
git add . && git commit -m "dokka generation for v$VARIIST_VERSION"
129129
130130
perl -0777 -i \
131-
-pe "s@$MNLMST_PREVIOUS_VERSION@$MNLMST_VERSION@g;" \
131+
-pe "s@$VARIIST_PREVIOUS_VERSION@$VARIIST_VERSION@g;" \
132132
./index.html
133133
perl -0777 -i \
134-
-pe "s@$MNLMST_PREVIOUS_VERSION@$MNLMST_VERSION@g;" \
134+
-pe "s@$VARIIST_PREVIOUS_VERSION@$VARIIST_VERSION@g;" \
135135
./latest/index.html
136136
perl -0777 -i \
137-
-pe "s/(\s+)\"$MNLMST_PREVIOUS_VERSION\",/\$1\"$MNLMST_VERSION\",\$1\"$MNLMST_PREVIOUS_VERSION\",/;" \
137+
-pe "s/(\s+)\"$VARIIST_PREVIOUS_VERSION\",/\$1\"$VARIIST_VERSION\",\$1\"$VARIIST_PREVIOUS_VERSION\",/;" \
138138
./scripts/versions.js
139139
140140
141-
find "./$MNLMST_VERSION" -name "*.html" | xargs perl -0777 -i \
141+
find "./$VARIIST_VERSION" -name "*.html" | xargs perl -0777 -i \
142142
-pe "s@<script.*src=\"https://unpkg\.com.*</script>@@;" \
143143
-pe "s@(<div class=\"library-name\">[\S\s]+?)Variist@\$1<span>Variist</span>@;" \
144-
-pe "s@\"((?:\.\./+)*)styles/logo-styles.css\" rel=\"Stylesheet\">@\"../../\${1}styles/logo-styles.css?v=$MNLMST_GH_PAGES_LOGO_CSS_VERSION\" rel=\"Stylesheet\">\n<link href=\"../../\${1}styles/alert.css?v=$MNLMST_GH_PAGES_ALERT_CSS_VERSION\" rel=\"Stylesheet\">\n<script id=\"versions-script\" type=\"text/javascript\" src=\"\../../\${1}scripts/versions.js?v=$MNLMST_GH_PAGES_VERSIONS_JS_VERSION\" data-version=\"$MNLMST_VERSION\" async=\"async\"></script>@g;" \
144+
-pe "s@\"((?:\.\./+)*)styles/logo-styles.css\" rel=\"Stylesheet\">@\"../../\${1}styles/logo-styles.css?v=$VARIIST_GH_PAGES_LOGO_CSS_VERSION\" rel=\"Stylesheet\">\n<link href=\"../../\${1}styles/alert.css?v=$VARIIST_GH_PAGES_ALERT_CSS_VERSION\" rel=\"Stylesheet\">\n<script id=\"versions-script\" type=\"text/javascript\" src=\"\../../\${1}scripts/versions.js?v=$VARIIST_GH_PAGES_VERSIONS_JS_VERSION\" data-version=\"$VARIIST_VERSION\" async=\"async\"></script>@g;" \
145145
-pe "s@((?:\.\./+)*)images/logo-icon.svg\"([^>]+)>@../../\${1}images/logo-icon.svg\"\$2>\n<meta name=\"og:image\" content=\"../../\${1}images/logo_social.png\"/>@g;" \
146146
-pe "s@(<a class=\"library-name--link\" href=\"(?:\.\./+)*)index.html\">@\$1../../index.html\" title=\"Back to Overview Code Documentation of Variist\">@g;" \
147147
-pe "s@<html@<html lang=\"en\"@g;" \
148148
-pe "s@<head>@<head>\n<meta name=\"keywords\" content=\"Kotlin, junit, junit-jupiter, test, Testing, parameterized tests, minimal test set\">\n<meta name=\"author\" content=\"Tegonal Genossenschaft\">\n<meta name=\"copyright\" content=\"Tegonal Genossenschaft\">@g;" \
149-
-pe "s@<title>([^<]+)</title>@<title>\$1 - Variist $MNLMST_VERSION</title>\n<meta name=\"description\" content=\"Code documentation of Variist $MNLMST_VERSION: \$1\">@g;" \
149+
-pe "s@<title>([^<]+)</title>@<title>\$1 - Variist $VARIIST_VERSION</title>\n<meta name=\"description\" content=\"Code documentation of Variist $VARIIST_VERSION: \$1\">@g;" \
150150
-pe "s@(<code class=\"runnablesample[^>]+>)[\S\s]+?//sampleStart[\n\s]*([\S\s]+?)\s+//sampleEnd[\n\s]*\}@\${1}\${2}@g;"
151151
152152
find "./" -name "*.html" | xargs perl -0777 -i \
153-
-pe "s@(scripts/versions\.js\?v\=)$MNLMST_GH_PAGES_VERSIONS_JS_VERSION@\${1}$MNLMST_GH_PAGES_VERSIONS_JS_VERSION_NEXT@g;"
153+
-pe "s@(scripts/versions\.js\?v\=)$VARIIST_GH_PAGES_VERSIONS_JS_VERSION@\${1}$VARIIST_GH_PAGES_VERSIONS_JS_VERSION_NEXT@g;"
154154
155-
cp "./$MNLMST_PREVIOUS_VERSION/index.html" "./$MNLMST_VERSION/index.html"
155+
cp "./$VARIIST_PREVIOUS_VERSION/index.html" "./$VARIIST_VERSION/index.html"
156156
perl -0777 -i \
157-
-pe "s/$MNLMST_PREVIOUS_VERSION/$MNLMST_VERSION/g;" \
157+
-pe "s/$VARIIST_PREVIOUS_VERSION/$VARIIST_VERSION/g;" \
158158
-pe "s@Released .*</p>@Released $(LC_ALL=en_GB date '+%b %d, %Y')</p>@;" \
159-
"./$MNLMST_VERSION/index.html"
160-
git add . && git commit -m "v$MNLMST_VERSION"
159+
"./$VARIIST_VERSION/index.html"
160+
git add . && git commit -m "v$VARIIST_VERSION"
161161
162162
check changes
163163
git push
@@ -167,8 +167,8 @@ cd ../variist
167167
3. deploy to sonatype central portal:
168168
(assumes you have an alias named gr pointing to ./gradlew)
169169
a) java -version 2>&1 | grep "version \"11" && PUB=true CI=true gr clean pubToMaLo &&
170-
tmpDir=$(mktemp -d -t "variist-release-$MNLMST_VERSION-XXXXXXXXXX") &&
171-
find "$HOME/.m2/repository/com/tegonal/variist" -type d -name "*$MNLMST_VERSION" -print0 |
170+
tmpDir=$(mktemp -d -t "variist-release-$VARIIST_VERSION-XXXXXXXXXX") &&
171+
find "$HOME/.m2/repository/com/tegonal/variist" -type d -name "*$VARIIST_VERSION" -print0 |
172172
while read -r -d $'\0' versionDir; do
173173
find "$versionDir" -type f -print0 | while read -r -d $'\0' file; do
174174
relPath="${file#"$HOME/.m2/repository/"}"
@@ -182,7 +182,7 @@ cd ../variist
182182
md5sum "$file" | awk '{ print $1 }' > "${file}.md5"
183183
sha1sum "$file" | awk '{ print $1 }' > "$file.sha1"
184184
done &&
185-
(cd "$tmpDir" && zip -r "variist-$MNLMST_VERSION.zip" .) &&
185+
(cd "$tmpDir" && zip -r "variist-$VARIIST_VERSION.zip" .) &&
186186
find "$tmpDir" -name "*.jar" | head -n 1 | xargs -I {} gpg --verify "{}.asc" "{}" &&
187187
echo "verify the correct gpg key was used (see above) and you might want to check the release in $tmpDir"
188188
b) Log into https://central.sonatype.com/publishing/deployments
@@ -197,22 +197,22 @@ Prepare next dev cycle
197197
1. update main:
198198
199199
200-
export MNLMST_VERSION=2.0.0-RC-2
201-
export MNLMST_NEXT_VERSION=2.0.0-RC-3
200+
export VARIIST_VERSION=2.0.0-RC-3
201+
export VARIIST_NEXT_VERSION=2.0.0-RC-3
202202
find ./ -name "*.md" | xargs perl -0777 -i \
203-
-pe "s@tree/v$MNLMST_VERSION@tree/main@g;" \
204-
-pe "s@$MNLMST_VERSION/kdoc@latest#/kdoc@g;" \
205-
-pe "s/add \\\`\@since $MNLMST_VERSION\\\` \(adapt to current/add \\\`\@since $MNLMST_NEXT_VERSION\\\` \(adapt to current/g;"
203+
-pe "s@tree/v$VARIIST_VERSION@tree/main@g;" \
204+
-pe "s@$VARIIST_VERSION/kdoc@latest#/kdoc@g;" \
205+
-pe "s/add \\\`\@since $VARIIST_VERSION\\\` \(adapt to current/add \\\`\@since $VARIIST_NEXT_VERSION\\\` \(adapt to current/g;"
206206
perl -0777 -i \
207-
-pe "s/rootProject.version = \"$MNLMST_VERSION\"/rootProject.version = \"${MNLMST_NEXT_VERSION}-SNAPSHOT\"/;" \
208-
-pe "s/MNLMST_VERSION=$MNLMST_VERSION/MNLMST_VERSION=$MNLMST_NEXT_VERSION/;" \
207+
-pe "s/rootProject.version = \"$VARIIST_VERSION\"/rootProject.version = \"${VARIIST_NEXT_VERSION}-SNAPSHOT\"/;" \
208+
-pe "s/VARIIST_VERSION=$VARIIST_VERSION/VARIIST_VERSION=$VARIIST_NEXT_VERSION/;" \
209209
./build.gradle.kts
210210
perl -0777 -i \
211211
-pe 's/(<!-- for main -->\n)<!--\n([\S\s]*?)-->(\n<!-- for release -->)\n([\S\s]*?)\n(\n# <img)/$1\n$2$3\n<!--$4-->\n$5/;' \
212212
-pe 's/<!(---\n❗ You are taking[^-]*?---)>/$1/;' \
213-
-pe "s@(latest version: \[README of v$MNLMST_VERSION\].*tree/)main/@\$1v$MNLMST_VERSION/@;" \
213+
-pe "s@(latest version: \[README of v$VARIIST_VERSION\].*tree/)main/@\$1v$VARIIST_VERSION/@;" \
214214
./README.md
215-
git commit -a -m "prepare dev cycle of $MNLMST_NEXT_VERSION"
215+
git commit -a -m "prepare dev cycle of $VARIIST_NEXT_VERSION"
216216
217217
check changes
218218
git push

0 commit comments

Comments
 (0)