Merge pull request #21 from statisticsnorway/update-build

Update team uniform name and artifact registry references

Author: RupinderKaurSSB

.github/.cruft.json

@@ -5,7 +5,7 @@
   "context": {
     "cookiecutter": {
       "repo_name": "guardian-client-java",
-      "team_uniform_name": "dapla-stat",
+      "team_uniform_name": "dftjen",
       "program_type": "LIBRARY",
       "java_version": "17",
       "default_branch_name": "master",

.github/workflows/build-deploy-lib.yml

@@ -9,7 +9,7 @@ on:
       - ".gitignore"
 
 env:
-  DAPLA_REGISTRY: europe-north1-docker.pkg.dev/${{secrets.GAR_PROJECT_ID}}/dapla-stat-maven
+  DAPLA_REGISTRY: europe-north1-docker.pkg.dev/${{secrets.GAR_PROJECT_ID}}/dftjen-maven
 
 jobs:
   build-push:
@@ -34,7 +34,7 @@ jobs:
         uses: google-github-actions/auth@v2
         with:
           workload_identity_provider: "projects/${{secrets.GAR_PROJECT_NUMBER}}/locations/global/workloadIdentityPools/gh-actions/providers/gh-actions"
-          service_account: "gh-actions-dapla-stat@${{secrets.GAR_PROJECT_ID}}.iam.gserviceaccount.com"
+          service_account: "gh-actions-dftjen@${{secrets.GAR_PROJECT_ID}}.iam.gserviceaccount.com"
           token_format: access_token
 
       - name: Set up Docker Buildx

.github/workflows/build-test.yml

@@ -9,7 +9,7 @@ on:
       - ".gitignore"
 
 env:
-  DAPLA_REGISTRY: europe-north1-docker.pkg.dev/${{secrets.GAR_PROJECT_ID}}/dapla-stat-docker
+  DAPLA_REGISTRY: europe-north1-docker.pkg.dev/${{secrets.GAR_PROJECT_ID}}/dftjen-docker
 
 jobs:
   build-test:
@@ -35,7 +35,7 @@ jobs:
         uses: google-github-actions/auth@v2
         with:
           workload_identity_provider: "projects/${{secrets.GAR_PROJECT_NUMBER}}/locations/global/workloadIdentityPools/gh-actions/providers/gh-actions"
-          service_account: "gh-actions-dapla-stat@${{secrets.GAR_PROJECT_ID}}.iam.gserviceaccount.com"
+          service_account: "gh-actions-dftjen@${{secrets.GAR_PROJECT_ID}}.iam.gserviceaccount.com"
           token_format: access_token
 
       - name: Login to Artifact Registry

.github/workflows/mvn-release.yml

@@ -41,7 +41,7 @@ jobs:
         uses: google-github-actions/auth@v2
         with:
           workload_identity_provider: "projects/${{secrets.GAR_PROJECT_NUMBER}}/locations/global/workloadIdentityPools/gh-actions/providers/gh-actions"
-          service_account: "gh-actions-dapla-stat@${{secrets.GAR_PROJECT_ID}}.iam.gserviceaccount.com"
+          service_account: "gh-actions-dftjen@${{secrets.GAR_PROJECT_ID}}.iam.gserviceaccount.com"
           token_format: access_token
 
       - name: Get bot variables

pom.xml

@@ -10,9 +10,8 @@
     <java.version>17</java.version>
     <maven.compiler.release>${java.version}</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <old-artifact-registry.url>artifactregistry://europe-north1-maven.pkg.dev/artifact-registry-14da</old-artifact-registry.url>
     <dapla-artifact-registry.url>
-      artifactregistry://europe-north1-maven.pkg.dev/artifact-registry-5n/dapla-stat-maven</dapla-artifact-registry.url>
+      artifactregistry://europe-north1-maven.pkg.dev/artifact-registry-5n/dftjen-maven</dapla-artifact-registry.url>
     <github.repository>statisticsnorway/guardian-client-java</github.repository>
     <project.scm.id>github</project.scm.id>
 
@@ -268,14 +267,6 @@
         <enabled>true</enabled>
       </snapshots>
     </repository>
-    <repository> <!-- Old AR is added for compatibility with Dapla modules -->
-      <id>old-artifact-registry</id>
-      <url>${old-artifact-registry.url}/maven-releases</url>
-    </repository>
-    <repository> <!-- Old AR is added for compatibility with Dapla modules -->
-      <id>old-artifact-registry-snapshots</id>
-      <url>${old-artifact-registry.url}/maven-snapshots</url>
-    </repository>
   </repositories>
 
   <profiles>
@@ -305,19 +296,6 @@
         <skip.it>true</skip.it>
       </properties>
     </profile>
-    <profile>
-      <id>ssb-bip</id>
-      <distributionManagement>
-        <repository>
-          <id>artifact-registry</id>
-          <url>${artifact-registry.url}/maven-releases</url>
-        </repository>
-        <snapshotRepository>
-          <id>artifact-registry-snapshots</id>
-          <url>${artifact-registry.url}/maven-snapshots</url>
-        </snapshotRepository>
-      </distributionManagement>
-    </profile>
     <profile>
       <id>coverage</id>
       <properties>