Skip to content

Commit

Permalink
updated maven pom (#651)
Browse files Browse the repository at this point in the history
* updated maven pom

* this file is not in use?

* formatting, spaces -> tabs

* added log4j-api

* spaces -> tabs

---------

Co-authored-by: Åsmund Våge Fannemel <[email protected]>
  • Loading branch information
EvenSol and asmfstatoil authored May 2, 2023
1 parent a561274 commit 0d3ef94
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 26 deletions.
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
"vscjava.vscode-java-pack",
"ms-vscode.test-adapter-converter",
"shengchen.vscode-checkstyle",
"mechatroner.rainbow-csv"
"mechatroner.rainbow-csv",
"redhat.vscode-xml"
]


Expand Down
12 changes: 0 additions & 12 deletions eclipse_dictionary.txt

This file was deleted.

14 changes: 8 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.equinor</groupId>
<artifactId>neqsim</artifactId>
<packaging>jar</packaging>
<version>${revision}${sha1}${changelist}</version>

<properties>
<revision>2.4.6</revision>
<revision>2.4.7</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sha1/>
<changelist/>
<sha1 />
<changelist />
</properties>

<repositories>
Expand Down Expand Up @@ -47,7 +49,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.9.1</version>
<version>5.9.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -246,4 +248,4 @@
<url>https://maven.pkg.github.com/Equinor/neqsim</url>
</repository>
</distributionManagement>
</project>
</project>
16 changes: 9 additions & 7 deletions pomJava8.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.equinor</groupId>
<artifactId>neqsim</artifactId>
<packaging>jar</packaging>
<version>${revision}${sha1}${changelist}-Java8</version>

<properties>
<revision>2.4.6</revision>
<revision>2.4.7</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sha1/>
<changelist/>
<sha1 />
<changelist />
</properties>

<repositories>
Expand All @@ -26,12 +28,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.19.0</version>
<version>2.20.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.19.0</version>
<version>2.20.0</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
Expand All @@ -41,7 +43,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.9.1</version>
<version>5.9.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit 0d3ef94

Please sign in to comment.