diff --git a/.github/workflows/jgiven_align_gh_pages.yml b/.github/workflows/jgiven_align_gh_pages.yml index f8bb28c26b..569d7ec57a 100644 --- a/.github/workflows/jgiven_align_gh_pages.yml +++ b/.github/workflows/jgiven_align_gh_pages.yml @@ -10,6 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - name: get all git data + run: git fetch - name: Checkout gh-pages run: git checkout -f gh-pages - name: Rebase on master diff --git a/CHANGELOG.md b/CHANGELOG.md index 39bdbe28a3..fc4d0a9ea0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# v1.2.2 +##Fixed issues +* Fixed issue where tags listed all of their ancestors as direct parents [#868](https://github.com/TNG/JGiven/issues/868) (thanks to jadhindieh for reporting) # v1.2.1 ##New features * JGiven-JUnit5 now reports its test outcomes back to JUnit5 before the `@After` methods, not after them. This should make it easier to run extensions like ReportPortal alongside JUnit5. diff --git a/build.gradle b/build.gradle index 0b6a273213..75c682563a 100644 --- a/build.gradle +++ b/build.gradle @@ -64,9 +64,6 @@ subprojects { slf4jVersion = '1.7.35' paranamerVersion = '2.8' jansiVersion = '1.18' - gsonVersion = '2.8.8' - guavaVersion = '30.1.1-jre' - guavaAndroidVersion = '28.1-android' springVersion = '5.3.19' jacocoVersion = '0.8.5' quickcheckVersion = '0.6' diff --git a/jgiven-android/build.gradle b/jgiven-android/build.gradle index f717b5ee2b..0dc7273920 100644 --- a/jgiven-android/build.gradle +++ b/jgiven-android/build.gradle @@ -60,7 +60,7 @@ configurations.all { } dependencies { - api "com.google.guava:guava:$guavaAndroidVersion" + api 'com.google.guava:guava:28.1-android' api("net.bytebuddy:byte-buddy-android:$byteBuddyVersion") api "junit:junit:$junitVersion" implementation "androidx.appcompat:appcompat:1.4.2" diff --git a/jgiven-core/build.gradle b/jgiven-core/build.gradle index d7162a13a6..2d71699021 100644 --- a/jgiven-core/build.gradle +++ b/jgiven-core/build.gradle @@ -5,8 +5,8 @@ plugins { description = "JGiven core module" dependencies { - api "com.google.guava:guava:$guavaVersion" - api "com.google.code.gson:gson:$gsonVersion" + api 'com.google.guava:guava:31.1-jre' + api 'com.google.code.gson:gson:2.9.0' implementation "com.thoughtworks.paranamer:paranamer:$paranamerVersion" implementation "net.bytebuddy:byte-buddy:$byteBuddyVersion" implementation "org.fusesource.jansi:jansi:$jansiVersion" diff --git a/jgiven-gradle-plugin/build.gradle b/jgiven-gradle-plugin/build.gradle index 103fde29a1..ce2a29cb99 100644 --- a/jgiven-gradle-plugin/build.gradle +++ b/jgiven-gradle-plugin/build.gradle @@ -8,8 +8,8 @@ dependencies { implementation localGroovy() implementation project(':jgiven-core') implementation project(':jgiven-html5-report') - implementation "com.google.guava:guava:$guavaVersion" - implementation "com.google.code.gson:gson:$gsonVersion" + implementation 'com.google.guava:guava:31.1-jre' + implementation 'com.google.code.gson:gson:2.9.0' testImplementation project(':jgiven-junit5') testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2' diff --git a/jgiven-timing/build.gradle b/jgiven-timing/build.gradle index ae3f7082fd..a445ddf693 100644 --- a/jgiven-timing/build.gradle +++ b/jgiven-timing/build.gradle @@ -10,10 +10,10 @@ description = "Module for injecting automated performance analysis for test meth dependencies { implementation project(":jgiven-core") - implementation("com.google.guava:guava:$guavaVersion") + implementation("com.google.guava:guava:31.1-jre") implementation "net.bytebuddy:byte-buddy-gradle-plugin:$byteBuddyVersion" implementation "net.bytebuddy:byte-buddy-agent:$byteBuddyVersion" - testImplementation("com.google.guava:guava-testlib:$guavaVersion") + testImplementation("com.google.guava:guava-testlib:31.1-jre") testImplementation 'org.mockito:mockito-inline:4.6.1' } diff --git a/scripts/release.sh b/scripts/release.sh index 4787927d76..160f7d3a98 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -43,8 +43,7 @@ updateAllVersionInformation $VERSION if [ -n "$(git status --porcelain)" ]; then echo Commiting version change - git add gradle.properties - git commit -m "Update version to $VERSION" + git commit -a -m "Update version to $VERSION" fi echo Building, Testing, and Uploading Archives...