Skip to content
Snippets Groups Projects
Commit 8103a387 authored by Lene Wasskog's avatar Lene Wasskog
Browse files

Merge branch 'main' into 'renovate/maven-wrapper-3.x' 

# Conflicts:
#   .mvn/wrapper/maven-wrapper.properties
parents 8f738978 4bf5d094
Branches
Tags
1 merge request!9Update dependency maven-wrapper to v3.3.2
Pipeline #5522 canceled
Stage: build
Stage: test
Hide whitespace changes
Inline Side-by-side
.mvn/wrapper/maven-wrapper.properties
+ 2
− 2
View file @ 8103a387
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the # KIND, either express or implied. See the License for the
# specific language governing permissions and limitations # specific language governing permissions and limitations
# under the License. # under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
\ No newline at end of file
pom.xml
+ 1
− 1
View file @ 8103a387
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest-core</artifactId>
<version>2.2</version> <version>3.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment