Skip to content
Snippets Groups Projects
Commit c3bea711 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 6ae5ad8c 71a1bb02
Branches
Tags
1 merge request!13Update dependency maven-wrapper to v3.3.2
Pipeline #5507 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.9.2/apache-maven-3.9.2-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,6 +12,13 @@
<artifactId>FinnCerealModels</artifactId>
<version>1.1.12-SNAPSHOT</version>
<repositories>
<repository>
<id>gitlab-maven</id>
<url>https://gitlab.nibio.no/api/v4/projects/401/packages/maven</url>
</repository>
</repositories>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
......@@ -25,7 +32,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<version>3.13.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment