Skip to content
Snippets Groups Projects
Commit 570ea434 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 947b4f39 5349fc03
No related branches found
No related tags found
1 merge request!10Update dependency maven-wrapper to v3.3.2
Pipeline #5553 canceled
......@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# 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
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
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
\ No newline at end of file
......@@ -12,7 +12,14 @@
<artifactId>GrassDryingModel</artifactId>
<version>1.1.11-SNAPSHOT</version>
<packaging>jar</packaging>
<repositories>
<repository>
<id>gitlab-maven</id>
<url>https://gitlab.nibio.no/api/v4/projects/401/packages/maven</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>no.nibio.vips</groupId>
......@@ -22,13 +29,13 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.16.1</version>
<version>2.18.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.16.1</version>
<version>2.18.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment