From af7310343de1cbebf33052b72477dced4ac44978 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Wed, 12 Oct 2022 00:25:16 +0200 Subject: [PATCH 1/6] Update pom.xml --- pom.xml | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 86 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 4ba6107d25..e4d296661b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,9 +4,11 @@ 4.0.0 com.equinor neqsim + NeqSim + NeqSim is a library for calculation of fluid behavior, phase equilibrium and process simulation. + https://github.com/equinor/neqsim jar ${revision}${sha1}${changelist} - 2.4.0 UTF-8 @@ -14,14 +16,43 @@ - + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license + + + + + Even Solbraa + esolbraa@gmail.com + com.equinor + https://github.com/equinor/neqsim + + + + scm:git:git://github.com/equinor/neqsim.git + scm:git:ssh://github.com/equinor/neqsim.git + https://github.com/equinor/neqsim + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + central https://repo1.maven.org/maven2/ - org.apache.logging.log4j @@ -98,7 +129,58 @@ - + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ossrh + https://oss.sonatype.org/ + true + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + org.apache.maven.plugins maven-enforcer-plugin From 68ed68aa773eed547d71eaa948b0d54efc167c10 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Wed, 12 Oct 2022 00:33:10 +0200 Subject: [PATCH 2/6] Update pom.xml --- pom.xml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index e4d296661b..6fc01e2c95 100644 --- a/pom.xml +++ b/pom.xml @@ -37,16 +37,6 @@ scm:git:ssh://github.com/equinor/neqsim.git https://github.com/equinor/neqsim - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - central @@ -326,5 +316,13 @@ GitHub Equinor Apache Maven Packages https://maven.pkg.github.com/Equinor/neqsim + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + From da7e141a790790fd87cf9faf538b3d2d0ff6a793 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Wed, 12 Oct 2022 00:39:20 +0200 Subject: [PATCH 3/6] Update pom.xml --- pom.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6fc01e2c95..a27aa4036d 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,10 @@ central https://repo1.maven.org/maven2/ + + github + https://maven.pkg.github.com/Equinor/ + @@ -60,6 +64,11 @@ 5.8.2 test + + com.equinor + neqsim + 2.4.0 + colt colt @@ -311,12 +320,14 @@ + + ossrh https://oss.sonatype.org/content/repositories/snapshots From 4df9613990e7dc53135a4ad4a28229ef45d033aa Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Wed, 12 Oct 2022 00:50:23 +0200 Subject: [PATCH 4/6] Update pom.xml --- pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pom.xml b/pom.xml index a27aa4036d..271abf6587 100644 --- a/pom.xml +++ b/pom.xml @@ -42,10 +42,6 @@ central https://repo1.maven.org/maven2/ - - github - https://maven.pkg.github.com/Equinor/ - @@ -64,11 +60,6 @@ 5.8.2 test - - com.equinor - neqsim - 2.4.0 - colt colt From 50417f3a4d8806754a271d4484a1c27aaa50c197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?= <34712686+asmfstatoil@users.noreply.github.com> Date: Thu, 26 Sep 2024 08:10:46 +0200 Subject: [PATCH 5/6] style: indentation -> tabs --- pom.xml | 82 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/pom.xml b/pom.xml index 8134f2510b..ac9d6ba0cc 100644 --- a/pom.xml +++ b/pom.xml @@ -21,24 +21,24 @@ - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license - + Even Solbraa esolbraa@gmail.com com.equinor - https://github.com/equinor/neqsim - + https://github.com/equinor/neqsim + - scm:git:git://github.com/equinor/neqsim.git - scm:git:ssh://github.com/equinor/neqsim.git - https://github.com/equinor/neqsim + scm:git:git://github.com/equinor/neqsim.git + scm:git:ssh://github.com/equinor/neqsim.git + https://github.com/equinor/neqsim @@ -197,58 +197,58 @@ - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://oss.sonatype.org/ - true - - - + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ossrh + https://oss.sonatype.org/ + true + + + org.apache.maven.plugins maven-source-plugin 2.2.1 - + attach-sources - jar-no-fork + jar-no-fork - + - - + + org.apache.maven.plugins maven-javadoc-plugin 2.9.1 - + attach-javadocs - jar + jar - + - - + + org.apache.maven.plugins maven-gpg-plugin 1.5 - + sign-artifacts verify - sign + sign - + - + org.apache.maven.plugins maven-enforcer-plugin @@ -411,7 +411,7 @@ true - + @@ -425,10 +425,10 @@ ossrh https://oss.sonatype.org/content/repositories/snapshots - - + + ossrh https://oss.sonatype.org/service/local/staging/deploy/maven2/ - + From eb12e6c97265c373e243fd760d25b8380698d1a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?= <34712686+asmfstatoil@users.noreply.github.com> Date: Thu, 26 Sep 2024 09:46:38 +0200 Subject: [PATCH 6/6] wip --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ac9d6ba0cc..37202f0e5b 100644 --- a/pom.xml +++ b/pom.xml @@ -31,8 +31,8 @@ Even Solbraa esolbraa@gmail.com - com.equinor - https://github.com/equinor/neqsim + Equinor + https://github.com/equinor