Merge branch 'main' into faults-and-verifications

wiremock · Nov 8, 2023 · a255b9a · a255b9a
2 parents 72e2b2c + 39c8498
commit a255b9a
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 15 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -5,9 +5,9 @@ name: Build and test
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

diff --git a/.github/workflows/changelog-draft.yml b/.github/workflows/changelog-draft.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - master
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/validate-gradle-wrapper.yml b/.github/workflows/validate-gradle-wrapper.yml
@@ -5,9 +5,9 @@ name: Validate Gradle wrapper
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   validate:

diff --git a/.gitignore b/.gitignore
@@ -4,15 +4,6 @@
 # Log file
 *.log
 
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 replay_pid*

diff --git a/build.gradle b/build.gradle
@@ -103,7 +103,7 @@ dependencies {
   implementation 'javax.annotation:javax.annotation-api:1.3.2'
 
   //  testImplementation project(":")
-  testImplementation(platform('org.junit:junit-bom:5.10.0'))
+  testImplementation(platform('org.junit:junit-bom:5.10.1'))
   testImplementation "org.junit.jupiter:junit-jupiter"
   testImplementation "org.hamcrest:hamcrest-core:2.2"
   testImplementation "org.hamcrest:hamcrest-library:2.2"

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar