Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
VIPSCommon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VIPS
VIPSCommon
Commits
6911ae7c
Commit
6911ae7c
authored
1 year ago
by
Tor-Einar Skog
Browse files
Options
Downloads
Plain Diff
Merge branch 'main' into feature/utilgetPointFromLonLat
parents
a7601109
c37b4849
Loading
Loading
No related merge requests found
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.gitignore
+1
-0
1 addition, 0 deletions
.gitignore
.gitlab-ci.yml
+409
-167
409 additions, 167 deletions
.gitlab-ci.yml
README.md
+2
-1
2 additions, 1 deletion
README.md
ci_settings.xml
+0
-16
0 additions, 16 deletions
ci_settings.xml
pom.xml
+2
-13
2 additions, 13 deletions
pom.xml
with
414 additions
and
197 deletions
.gitignore
+
1
−
0
View file @
6911ae7c
...
...
@@ -4,3 +4,4 @@ jbossmodule/
/nbproject/
*~
.idea/
/VIPSCommon.iml
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
409
−
167
View file @
6911ae7c
This diff is collapsed.
Click to expand it.
README.md
+
2
−
1
View file @
6911ae7c
...
...
@@ -3,7 +3,8 @@
This is a jar file that contains the entities and util classes that are used throughout the VIPS system
## Requirements
*
Java >= 14
*
Java >= 14
## Development
This diff is collapsed.
Click to expand it.
ci_settings.xml
deleted
100644 → 0
+
0
−
16
View file @
a7601109
<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
This diff is collapsed.
Click to expand it.
pom.xml
+
2
−
13
View file @
6911ae7c
...
...
@@ -5,22 +5,16 @@
<parent>
<groupId>
no.nibio.vips
</groupId>
<artifactId>
vips-parent-pom
</artifactId>
<version>
1.0.
2
</version>
<version>
1.0.
0
</version>
</parent>
<groupId>
no.nibio.vips
</groupId>
<artifactId>
VIPSCommon
</artifactId>
<version>
2.0.
8
-SNAPSHOT
</version>
<version>
2.0.
1
-SNAPSHOT
</version>
<packaging>
jar
</packaging>
<name>
VIPSCommon
</name>
<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>
<dependency>
<groupId>
junit
</groupId>
...
...
@@ -153,10 +147,6 @@
</dependency>
</dependencies>
<repositories>
<repository>
<id>
gitlab-maven
</id>
<url>
https://gitlab.nibio.no/api/v4/projects/401/packages/maven
</url>
</repository>
<repository>
<id>
bedatadriven
</id>
<name>
bedatadriven public repo
</name>
...
...
@@ -238,7 +228,6 @@
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment