Skip to content
Snippets Groups Projects
Commit 6911ae7c authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Merge branch 'main' into feature/utilgetPointFromLonLat

parents a7601109 c37b4849
No related branches found
No related tags found
No related merge requests found
...@@ -4,3 +4,4 @@ jbossmodule/ ...@@ -4,3 +4,4 @@ jbossmodule/
/nbproject/ /nbproject/
*~ *~
.idea/ .idea/
/VIPSCommon.iml
This diff is collapsed.
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
This is a jar file that contains the entities and util classes that are used throughout the VIPS system This is a jar file that contains the entities and util classes that are used throughout the VIPS system
## Requirements ## Requirements
* Java >= 14 * Java >= 14
## Development ## Development
<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
<servers>
<server>
<id>gitlab-maven</id>
<configuration>
<httpHeaders>
<property>
<name>Job-Token</name>
<value>${CI_JOB_TOKEN}</value>
</property>
</httpHeaders>
</configuration>
</server>
</servers>
</settings>
\ No newline at end of file
...@@ -5,22 +5,16 @@ ...@@ -5,22 +5,16 @@
<parent> <parent>
<groupId>no.nibio.vips</groupId> <groupId>no.nibio.vips</groupId>
<artifactId>vips-parent-pom</artifactId> <artifactId>vips-parent-pom</artifactId>
<version>1.0.2</version> <version>1.0.0</version>
</parent> </parent>
<groupId>no.nibio.vips</groupId>
<artifactId>VIPSCommon</artifactId> <artifactId>VIPSCommon</artifactId>
<version>2.0.8-SNAPSHOT</version> <version>2.0.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>VIPSCommon</name> <name>VIPSCommon</name>
<url>https://gitlab.nibio.no/VIPS/VIPSCommon</url> <url>https://gitlab.nibio.no/VIPS/VIPSCommon</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
...@@ -153,10 +147,6 @@ ...@@ -153,10 +147,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<repositories> <repositories>
<repository>
<id>gitlab-maven</id>
<url>https://gitlab.nibio.no/api/v4/projects/401/packages/maven</url>
</repository>
<repository> <repository>
<id>bedatadriven</id> <id>bedatadriven</id>
<name>bedatadriven public repo</name> <name>bedatadriven public repo</name>
...@@ -238,7 +228,6 @@ ...@@ -238,7 +228,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment