Endret libs til å bruke ny convention plugin for publishing libs.

navikt · Jun 17, 2024 · d13c197 · d13c197
1 parent 1f7749a
commit d13c197
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 93 deletions.
diff --git a/libs/avro-schema/build.gradle b/libs/avro-schema/build.gradle
@@ -1,36 +1,14 @@
 plugins {
     id "dolly-libs"
+    id "dolly-libs-publish"
 
     id 'com.github.davidmc24.gradle.plugin.avro' version '1.9.1'
-    id 'maven-publish'
 }
 
 sonarqube {
     skipProject = true
 }
 
-if (project.hasProperty("releaseVersion")) {
-    version = releaseVersion
-}
-
-publishing {
-    repositories {
-        maven {
-            name = "github"
-            url = uri('https://maven.pkg.github.com/navikt/testnorge')
-            credentials(PasswordCredentials) {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
-    }
-    publications {
-        gpr(MavenPublication) {
-            from(components.java)
-        }
-    }
-}
-
 dependencies {
     implementation 'org.apache.avro:avro-compiler:1.11.3'
     implementation 'org.apache.avro:avro-maven-plugin:1.11.3'

diff --git a/libs/data-transfer-objects/build.gradle b/libs/data-transfer-objects/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id "dolly-libs"
-
-    id 'maven-publish'
+    id "dolly-libs-publish"
 }
 
 sonarqube {
@@ -25,28 +24,6 @@ dependencies {
     implementation 'no.nav.tjenestespesifikasjoner:nav-altinn-inntektsmelding:1.2019.08.16-13.46-35cbdfd492d4'
 }
 
-if (project.hasProperty("releaseVersion")) {
-    version = releaseVersion
-}
-
-publishing {
-    repositories {
-        maven {
-            name = "github"
-            url = uri('https://maven.pkg.github.com/navikt/testnorge')
-            credentials(PasswordCredentials) {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
-    }
-    publications {
-        gpr(MavenPublication) {
-            from(components.java)
-        }
-    }
-}
-
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
diff --git a/libs/data-transfer-search-objects/build.gradle b/libs/data-transfer-search-objects/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id "dolly-libs"
-
-    id 'maven-publish'
+    id "dolly-libs-publish"
 }
 
 sonarqube {
@@ -25,28 +24,6 @@ dependencies {
     implementation 'org.springframework.data:spring-data-elasticsearch'
 }
 
-if (project.hasProperty("releaseVersion")) {
-    version = releaseVersion
-}
-
-publishing {
-    repositories {
-        maven {
-            name = "github"
-            url = uri('https://maven.pkg.github.com/navikt/testnorge')
-            credentials(PasswordCredentials) {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
-    }
-    publications {
-        gpr(MavenPublication) {
-            from(components.java)
-        }
-    }
-}
-
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
diff --git a/libs/integration-test/build.gradle b/libs/integration-test/build.gradle
@@ -9,10 +9,6 @@ sonarqube {
     }
 }
 
-if (project.hasProperty("releaseVersion")) {
-    version = project.getProperties().get("releaseVersion")
-}
-
 dependencies {
     implementation 'no.nav.testnav.libs:security-core'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'

diff --git a/libs/reactive-core/build.gradle b/libs/reactive-core/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id "dolly-libs"
-
-    id 'maven-publish'
+    id "dolly-libs-publish"
 }
 
 sonarqube {
@@ -11,25 +10,9 @@ sonarqube {
     }
 }
 
-if (project.hasProperty("releaseVersion")) {
-    version = releaseVersion
-}
-
 publishing {
-    repositories {
-        maven {
-            name = "github"
-            url = uri('https://maven.pkg.github.com/navikt/testnorge')
-            credentials(PasswordCredentials) {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
-    }
     publications {
         gpr(MavenPublication) {
-            from(components.java)
-
             versionMapping {
                 usage('java-api') {
                     fromResolutionOf('runtimeClasspath')