TFP-563 FP-FELLES: Gjøre repoet klar for bygging og distribusjon uten…

…for (#77)
navikt · Aug 23, 2019 · 631dc62 · 631dc62
1 parent 24950c0
commit 631dc62
Show file tree

Hide file tree

Showing 35 changed files with 556 additions and 318 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,65 @@
+version: 2.1
+jobs:
+  build:
+    docker:
+      - image: circleci/openjdk:latest
+      - image: circleci/postgres:latest
+        environment:
+          POSTGRES_USER: fp_unit
+          POSTGRES_DB: fp_unit
+          POSTGRES_PASSWORD: fp_unit
+    steps:
+      - checkout
+      - restore_cache:
+          name: Restore cached dependencies
+          keys:
+            - maven3-{{ checksum "pom.xml" }}
+      - run:
+          name: Build (and run tests)
+          command: mvn clean install
+      - save_cache:
+          name: Cache Maven dependencies
+          key: maven3-{{ checksum "pom.xml" }}
+          paths:
+            - ~/.m2
+
+  deploy:
+    docker:
+      - image: circleci/openjdk:latest
+    steps:
+      - checkout
+      - restore_cache:
+          name: Restore cached dependencies
+          keys:
+            - maven3-{{ checksum "pom.xml" }}
+      #- run:
+      #    name: Import gpg key
+      #    command: echo $GPG_KEY_BASE64 | base64 --decode | gpg --yes --batch --import
+      - run:
+          name: "Setting version"
+          command: |
+            sudo apt-get install libxml2-utils
+            export GIT_COMMIT_HASH=$(git log -n 1 --pretty=format:'%h')
+            export GIT_COMMIT_DATE=$(git log -1 --pretty='%ad' --date=format:'%Y%m%d%H%M%S')
+            export REVISION=$(xmllint --xpath '/*[local-name()="project"]//*[local-name()="revision"]/text()' pom.xml)
+            export VERSION=${REVISION}_${GIT_COMMIT_DATE}_${GIT_COMMIT_HASH}
+            echo "Setting version $VERSION"
+            mvn versions:set -DnewVersion="$VERSION"
+            mvn versions:commit
+      - run:
+          name: Deploy to Github Package Registry
+          command: "mvn --settings .circleci/maven-settings.xml deploy -PpublishGithub -DskipTests=true"
+
+
+workflows:
+  version: 2
+  build-and-deploy:
+    jobs:
+      - build
+#      - deploy:
+#          context: familie-ci
+#          requires:
+#            - build
+#          filters:
+#            branches:
+#              only: feature/TFP-563
diff --git a/.circleci/maven-settings.xml b/.circleci/maven-settings.xml
@@ -0,0 +1,33 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <activeProfiles>
+        <activeProfile>github</activeProfile>
+    </activeProfiles>
+
+    <profiles>
+        <profile>
+            <id>github</id>
+            <repositories>
+                <repository>
+                    <id>central</id>
+                    <url>https://repo1.maven.org/maven2</url>
+                    <releases><enabled>true</enabled></releases>
+                    <snapshots><enabled>true</enabled></snapshots>
+                </repository>
+                <repository>
+                    <id>github</id>
+                    <name>GitHub navikt Apache Maven Packages</name>
+                    <url>https://maven.pkg.github.com/navikt</url>
+                </repository>
+            </repositories>
+        </profile>
+    </profiles>
+    <servers>
+        <server>
+            <id>github</id>
+            <username>${env.GITHUB_USERNAME}</username>
+            <password>${env.GITHUB_PASSWORD}</password>
+        </server>
+    </servers>
+</settings>
diff --git a/.gitignore b/.gitignore
@@ -36,3 +36,4 @@ keystore.jks
 truststore.jts
 truststore.jks
 .DS_Store
+.env
diff --git a/README.md b/README.md
@@ -1 +1,10 @@
 # Felles kode / bibliotek for foredrepenger området
+
+
+
+## Postgres
+I test og utvikling bruker vi postgres. For å enkelt sette opp dette slik at det fungerer med unit-tests:
+```
+docker rm -f fp-postgres
+docker run --rm --name fp-postgres -e POSTGRES_USER=fp_unit -e POSTGRES_PASSWORD=fp_unit -e POSTGRES_DB=fp_unit  -d -p 5432:5432 postgres:alpine
+```
diff --git a/felles/pom.xml b/felles/pom.xml
@@ -29,7 +29,7 @@
 		<resteasy.version>3.6.1.SP2</resteasy.version>
 		<slf4j.version>1.7.26</slf4j.version>
 		<swagger.version>1.5.13</swagger.version>
-        <doksys.dokumentproduksjon.version>2.1.8</doksys.dokumentproduksjon.version>
+        <doksys.dokumentproduksjon.version>1.2019.08.12-12.12-4258f3dded02</doksys.dokumentproduksjon.version>
 
 	</properties>
 
@@ -144,22 +144,6 @@
 
 
 			<!-- NAV interne 3djepart avhengigheter til kontrakter og bibliotek -->
-            <dependency>
-                <groupId>no.nav.abac.policies</groupId>
-                <artifactId>abac-foreldrepenger-policies-alfa</artifactId>
-                <version>4.5.0</version>
-            </dependency>
-            <dependency>
-                <groupId>no.nav.abac.policies</groupId>
-                <artifactId>abac-common-attributes-alfa</artifactId>
-                <version>4.0.8</version>
-            </dependency>
-            <dependency>
-                <groupId>no.nav.abac.policies</groupId>
-                <artifactId>abac-arkiv-policies-alfa</artifactId>
-                <version>4.6.2</version>
-                <classifier>attributes</classifier>
-            </dependency>
 			<dependency>
 				<groupId>no.nav.tjenestespesifikasjoner</groupId>
 				<artifactId>nav-kodeverk-v3-tjenestespesifikasjon</artifactId>
@@ -171,10 +155,9 @@
 				<version>${tjenestespesifikasjoner.version}</version>
 			</dependency>
             <dependency>
-                <groupId>no.nav.tjenester.fim</groupId>
-                <artifactId>nav-fim-dokumentproduksjon-v2-tjenestespesifikasjon</artifactId>
+                <groupId>no.nav.tjenestespesifikasjoner</groupId>
+                <artifactId>dokumentproduksjon-v2-tjenestespesifikasjon</artifactId>
                 <version>${doksys.dokumentproduksjon.version}</version>
-                <classifier>jaxws</classifier>
             </dependency>
 			<dependency>
 				<groupId>no.nav.tjenestespesifikasjoner</groupId>
@@ -290,15 +273,11 @@
 
 			<!-- Database avhengigheter -->
 			<dependency>
-				<groupId>com.oracle</groupId>
-				<artifactId>ojdbc8</artifactId>
-				<version>12.2.0.1</version>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>42.2.5</version>
 			</dependency>
-			<!--<dependency>
-				<groupId>org.postgresql</groupId>
-				<artifactId>postgresql</artifactId>
-				<version>42.2.5</version>
-			</dependency>-->
+
 			<dependency>
 				<groupId>com.zaxxer</groupId>
 				<artifactId>HikariCP</artifactId>

diff --git a/felles/sikkerhet/sikkerhet/pom.xml b/felles/sikkerhet/sikkerhet/pom.xml
@@ -99,20 +99,6 @@
             <artifactId>picketbox</artifactId>
         </dependency>
 
-        <!-- for PDP/ABAC -->
-        <dependency>
-            <groupId>no.nav.abac.policies</groupId>
-            <artifactId>abac-foreldrepenger-policies-alfa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>no.nav.abac.policies</groupId>
-            <artifactId>abac-common-attributes-alfa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>no.nav.abac.policies</groupId>
-            <artifactId>abac-arkiv-policies-alfa</artifactId>
-            <classifier>attributes</classifier>
-        </dependency>
         <dependency>
             <groupId>javax.activation</groupId>
             <artifactId>javax.activation-api</artifactId>

diff --git a/felles/sikkerhet/sikkerhet/src/main/java/no/nav/abac/xacml/ArkivAttributter.java b/felles/sikkerhet/sikkerhet/src/main/java/no/nav/abac/xacml/ArkivAttributter.java
@@ -0,0 +1,12 @@
+package no.nav.abac.xacml;
+
+public class ArkivAttributter {
+
+
+    public static final String RESOURCE_ARKIV_DOKUMENT = "no.nav.abac.attributter.resource.arkiv.dokument";
+    public static final String RESOURCE_ARKIV_GSAK_SAKSID = "no.nav.abac.attributter.resource.arkiv.gsak_saksid";
+    public static final String RESOURCE_ARKIV_JOURNALPOST = "no.nav.abac.attributter.resource.arkiv.journalpost";
+    public static final String RESOURCE_ARKIV_PENSJON_SAKSID = "no.nav.abac.attributter.resource.arkiv.pensjon_saksid";
+    public static final String RESOURCE_ARKIV_SAK = "no.nav.abac.attributter.resource.arkiv.sak";
+
+}
diff --git a/felles/sikkerhet/sikkerhet/src/main/java/no/nav/abac/xacml/CommonAttributter.java b/felles/sikkerhet/sikkerhet/src/main/java/no/nav/abac/xacml/CommonAttributter.java
@@ -0,0 +1,72 @@
+package no.nav.abac.xacml;
+
+public class CommonAttributter {
+    public static final String ADVICES_ACTION_SPORBARHETSLOGG = "no.nav.abac.advices.action.sporbarhetslogg";
+    public static final String ADVICES_PING_RESPONSE = "no.nav.abac.advices.ping.response";
+    public static final String ADVICES_REASON_DENY_INFO = "no.nav.abac.advices.reason.deny_info";
+    public static final String ADVICES_REASON_DENY_REASON = "no.nav.abac.advices.reason.deny_reason";
+    public static final String ADVICEOROBLIGATION_CAUSE = "no.nav.abac.attributter.adviceorobligation.cause";
+    public static final String ADVICEOROBLIGATION_DENY_POLICY = "no.nav.abac.attributter.adviceorobligation.deny_policy";
+    public static final String ADVICEOROBLIGATION_DENY_RULE = "no.nav.abac.attributter.adviceorobligation.deny_rule";
+    public static final String ADVICEOROBLIGATION_FRITEKST = "no.nav.abac.attributter.adviceorobligation.fritekst";
+    public static final String ENVIRONMENT_FELLES_CONSUMER_OIDC_TOKEN_BODY = "no.nav.abac.attributter.environment.felles.consumer_oidc_token_body";
+    public static final String ENVIRONMENT_FELLES_MILJOE = "no.nav.abac.attributter.environment.felles.miljoe";
+    public static final String ENVIRONMENT_FELLES_OIDC_TOKEN_BODY = "no.nav.abac.attributter.environment.felles.oidc_token_body";
+    public static final String ENVIRONMENT_FELLES_PEP_ID = "no.nav.abac.attributter.environment.felles.pep_id";
+    public static final String ENVIRONMENT_FELLES_SAML_TOKEN = "no.nav.abac.attributter.environment.felles.saml_token";
+    public static final String ENVIRONMENT_FELLES_TJENESTENAVN = "no.nav.abac.attributter.environment.felles.tjenestenavn";
+    public static final String RESOURCE_FELLES_DOMENE = "no.nav.abac.attributter.resource.felles.domene";
+    public static final String RESOURCE_FELLES_ENHET = "no.nav.abac.attributter.resource.felles.enhet";
+    public static final String RESOURCE_FELLES_PERSON = "no.nav.abac.attributter.resource.felles.person";
+    public static final String RESOURCE_FELLES_PERSON_AKTOERID_RESOURCE = "no.nav.abac.attributter.resource.felles.person.aktoerId_resource";
+    public static final String RESOURCE_FELLES_PERSON_EGEN_ANSATT = "no.nav.abac.attributter.resource.felles.person.egen_ansatt";
+    public static final String RESOURCE_FELLES_PERSON_FNR = "no.nav.abac.attributter.resource.felles.person.fnr";
+    public static final String RESOURCE_FELLES_PERSON_GEOGRAFISK_TILKNYTNING = "no.nav.abac.attributter.resource.felles.person.geografisk_tilknytning";
+    public static final String RESOURCE_FELLES_PERSON_KONTAKTINFORMASJON = "no.nav.abac.attributter.resource.felles.person.kontaktinformasjon";
+    public static final String RESOURCE_FELLES_PERSON_NAV_ENHET_ID = "no.nav.abac.attributter.resource.felles.person.nav_enhet_id";
+    public static final String RESOURCE_FELLES_PERSON_NAVN = "no.nav.abac.attributter.resource.felles.person.navn";
+    public static final String RESOURCE_FELLES_PERSON_REGIONAL_ENHET = "no.nav.abac.attributter.resource.felles.person.regional_enhet";
+    public static final String RESOURCE_FELLES_PERSON_RELASJON = "no.nav.abac.attributter.resource.felles.person.relasjon";
+    public static final String RESOURCE_FELLES_PERSON_RELASJONER = "no.nav.abac.attributter.resource.felles.person.relasjoner";
+    public static final String RESOURCE_FELLES_PERSON_SPESREG = "no.nav.abac.attributter.resource.felles.person.spesreg";
+    public static final String RESOURCE_FELLES_PERSON_TILKNYTTET_EGEN_ANSATT = "no.nav.abac.attributter.resource.felles.person.tilknyttet_egen_ansatt";
+    public static final String RESOURCE_FELLES_PERSON_TILKNYTTET_FNR = "no.nav.abac.attributter.resource.felles.person.tilknyttet_fnr";
+    public static final String RESOURCE_FELLES_PERSON_TILKNYTTET_SPESREG = "no.nav.abac.attributter.resource.felles.person.tilknyttet_spesreg";
+    public static final String RESOURCE_FELLES_RESOURCE_TYPE = "no.nav.abac.attributter.resource.felles.resource_type";
+    public static final String RESOURCE_FELLES_TEMA = "no.nav.abac.attributter.resource.felles.tema";
+    public static final String SUBJECT_FELLES_AKTOERID_SUBJECT = "no.nav.abac.attributter.subject.felles.aktoerId_subject";
+    public static final String SUBJECT_FELLES_ALDER = "no.nav.abac.attributter.subject.felles.alder";
+    public static final String SUBJECT_FELLES_ALLE_TEMA = "no.nav.abac.attributter.subject.felles.alle_tema";
+    public static final String SUBJECT_FELLES_AUTHENTICATIONLEVEL = "no.nav.abac.attributter.subject.felles.authenticationLevel";
+    public static final String SUBJECT_FELLES_CONSUMERID = "no.nav.abac.attributter.subject.felles.consumerId";
+    public static final String SUBJECT_FELLES_CONSUMERID_ROLLE = "no.nav.abac.attributter.subject.felles.consumerId_rolle";
+    public static final String SUBJECT_FELLES_ENHETIDLISTE = "no.nav.abac.attributter.subject.felles.enhetidliste";
+    public static final String SUBJECT_FELLES_ER_LEVENDE = "no.nav.abac.attributter.subject.felles.er_levende";
+    public static final String SUBJECT_FELLES_HAR_TILGANG_EGEN_ANSATT = "no.nav.abac.attributter.subject.felles.har_tilgang_egen_ansatt";
+    public static final String SUBJECT_FELLES_HAR_TILGANG_KODE_6 = "no.nav.abac.attributter.subject.felles.har_tilgang_kode_6";
+    public static final String SUBJECT_FELLES_HAR_TILGANG_KODE_7 = "no.nav.abac.attributter.subject.felles.har_tilgang_kode_7";
+    public static final String SUBJECT_FELLES_INDIREKTE_GRUPPER = "no.nav.abac.attributter.subject.felles.indirekte_grupper";
+    public static final String SUBJECT_FELLES_REGIONIDLISTE = "no.nav.abac.attributter.subject.felles.regionidliste";
+    public static final String SUBJECT_FELLES_SUBJECTTYPE = "no.nav.abac.attributter.subject.felles.subjectType";
+    public static final String SUBJECT_FELLES_TEMA_FOR_ENHET = "no.nav.abac.attributter.subject.felles.tema_for_enhet";
+    public static final String XACML_1_0_ACTION_ACTION_ID = "urn:oasis:names:tc:xacml:1.0:action:action-id";
+    public static final String XACML_1_0_ACTION_IMPLIED_ACTION = "urn:oasis:names:tc:xacml:1.0:action:implied-action";
+    public static final String XACML_1_0_ENVIRONMENT_CURRENT_DATE = "urn:oasis:names:tc:xacml:1.0:environment:current-date";
+    public static final String XACML_1_0_ENVIRONMENT_CURRENT_DATETIME = "urn:oasis:names:tc:xacml:1.0:environment:current-dateTime";
+    public static final String XACML_1_0_ENVIRONMENT_CURRENT_TIME = "urn:oasis:names:tc:xacml:1.0:environment:current-time";
+    public static final String XACML_1_0_RESOURCE_RESOURCE_ID = "urn:oasis:names:tc:xacml:1.0:resource:resource-id";
+    public static final String XACML_1_0_SUBJECT_AUTHENTICATION_METHOD = "urn:oasis:names:tc:xacml:1.0:subject:authentication-method";
+    public static final String XACML_1_0_SUBJECT_AUTHENTICATION_TIME = "urn:oasis:names:tc:xacml:1.0:subject:authentication-time";
+    public static final String XACML_1_0_SUBJECT_KEY_INFO = "urn:oasis:names:tc:xacml:1.0:subject:key-info";
+    public static final String XACML_1_0_SUBJECT_REQUEST_TIME = "urn:oasis:names:tc:xacml:1.0:subject:request-time";
+    public static final String XACML_1_0_SUBJECT_SESSION_START_TIME = "urn:oasis:names:tc:xacml:1.0:subject:session-start-time";
+    public static final String XACML_1_0_SUBJECT_SUBJECT_ID = "urn:oasis:names:tc:xacml:1.0:subject:subject-id";
+    public static final String XACML_1_0_SUBJECT_SUBJECT_ID_QUALIFIER = "urn:oasis:names:tc:xacml:1.0:subject:subject-id-qualifier";
+    public static final String XACML_2_0_RESOURCE_TARGET_NAMESPACE = "urn:oasis:names:tc:xacml:2.0:resource:target-namespace";
+    public static final String XACML_2_0_SUBJECT_ROLE = "urn:oasis:names:tc:xacml:2.0:subject:role";
+    public static final String XACML_3_0_SUBJECT_AUTHN_LOCALITY_DNS_NAME = "urn:oasis:names:tc:xacml:3.0:subject:authn-locality:dns-name";
+    public static final String XACML_3_0_SUBJECT_AUTHN_LOCALITY_IP_ADDRESS = "urn:oasis:names:tc:xacml:3.0:subject:authn-locality:ip-address";
+
+    public CommonAttributter() {
+    }
+}
diff --git a/felles/sikkerhet/sikkerhet/src/main/java/no/nav/abac/xacml/ForeldrepengerAttributter.java b/felles/sikkerhet/sikkerhet/src/main/java/no/nav/abac/xacml/ForeldrepengerAttributter.java
@@ -0,0 +1,20 @@
+package no.nav.abac.xacml;
+
+public class ForeldrepengerAttributter {
+    public static final String FORELDREPENGER_FP_SAKSID = "no.nav.abac.attributter.foreldrepenger.fp_saksid";
+    public static final String FORELDREPENGER_OPPGAVEKO = "no.nav.abac.attributter.foreldrepenger.oppgaveko";
+    public static final String FORELDREPENGER_OPPGAVESTYRING = "no.nav.abac.attributter.foreldrepenger.oppgavestyring";
+    public static final String FORELDREPENGER_OPPGAVESTYRING_AVDELINGSENHET = "no.nav.abac.attributter.foreldrepenger.oppgavestyring.avdelingsenhet";
+    public static final String FORELDREPENGER_RISIKOKLASSIFISERING = "no.nav.abac.attributter.foreldrepenger.risikoklassifisering";
+    public static final String FORELDREPENGER_SAKLISTE = "no.nav.abac.attributter.foreldrepenger.sakliste";
+    public static final String RESOURCE_FORELDREPENGER_ALENEOMSORG = "no.nav.abac.attributter.resource.foreldrepenger.aleneomsorg";
+    public static final String RESOURCE_FORELDREPENGER_ANNEN_PART = "no.nav.abac.attributter.resource.foreldrepenger.annen_part";
+    public static final String RESOURCE_FORELDREPENGER_SAK_AKSJONSPUNKT_TYPE = "no.nav.abac.attributter.resource.foreldrepenger.sak.aksjonspunkt_type";
+    public static final String RESOURCE_FORELDREPENGER_SAK_ANSVARLIG_SAKSBEHANDLER = "no.nav.abac.attributter.resource.foreldrepenger.sak.ansvarlig_saksbehandler";
+    public static final String RESOURCE_FORELDREPENGER_SAK_BEHANDLINGSSTATUS = "no.nav.abac.attributter.resource.foreldrepenger.sak.behandlingsstatus";
+    public static final String RESOURCE_FORELDREPENGER_SAK_SAKSSTATUS = "no.nav.abac.attributter.resource.foreldrepenger.sak.saksstatus";
+    public static final String RESOURCE_FORELDREPENGER_UTTAKSPLAN = "no.nav.abac.attributter.resource.foreldrepenger.uttaksplan";
+
+    public ForeldrepengerAttributter() {
+    }
+}
diff --git a/felles/sikkerhet/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/abac/AbacSporingslogg.java b/felles/sikkerhet/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/abac/AbacSporingslogg.java
@@ -5,10 +5,11 @@
 import java.util.List;
 import java.util.Optional;
 
+import no.nav.abac.xacml.CommonAttributter;
 import org.slf4j.Logger;
 
-import no.nav.abac.common.xacml.CommonAttributter;
-import no.nav.abac.foreldrepenger.xacml.ForeldrepengerAttributter;
+
+import no.nav.abac.xacml.ForeldrepengerAttributter;
 import no.nav.vedtak.log.sporingslogg.Sporingsdata;
 import no.nav.vedtak.log.sporingslogg.SporingsloggId;
 import no.nav.vedtak.log.sporingslogg.StandardSporingsloggId;

diff --git a/felles/sikkerhet/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/abac/PepImpl.java b/felles/sikkerhet/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/abac/PepImpl.java
@@ -10,8 +10,8 @@
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 
-import no.nav.abac.common.xacml.CommonAttributter;
-import no.nav.abac.foreldrepenger.xacml.ForeldrepengerAttributter;
+import no.nav.abac.xacml.CommonAttributter;
+import no.nav.abac.xacml.ForeldrepengerAttributter;
 import no.nav.vedtak.konfig.KonfigVerdi;
 import no.nav.vedtak.sikkerhet.context.SubjectHandler;
 

diff --git a/...es/sikkerhet/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/abac/Tilgangsbeslutning.java b/...es/sikkerhet/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/abac/Tilgangsbeslutning.java
@@ -4,8 +4,8 @@
 
 import java.util.List;
 
-import no.nav.abac.common.xacml.CommonAttributter;
-import no.nav.abac.foreldrepenger.xacml.ForeldrepengerAttributter;
+import no.nav.abac.xacml.CommonAttributter;
+import no.nav.abac.xacml.ForeldrepengerAttributter;
 
 public final class Tilgangsbeslutning {
     private AbacResultat beslutningKode;

diff --git a/felles/sikkerhet/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/pdp/PdpKlientImpl.java b/felles/sikkerhet/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/pdp/PdpKlientImpl.java
@@ -11,7 +11,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import no.nav.abac.common.xacml.CommonAttributter;
+import no.nav.abac.xacml.CommonAttributter;
 import no.nav.vedtak.konfig.KonfigVerdi;
 import no.nav.vedtak.log.util.LoggerUtils;
 import no.nav.vedtak.sikkerhet.abac.AbacIdToken;

diff --git a/.../sikkerhet/sikkerhet/src/test/java/no/nav/vedtak/sikkerhet/abac/AbacSporingsloggTest.java b/.../sikkerhet/sikkerhet/src/test/java/no/nav/vedtak/sikkerhet/abac/AbacSporingsloggTest.java
@@ -1,6 +1,6 @@
 package no.nav.vedtak.sikkerhet.abac;
 
-import static no.nav.abac.foreldrepenger.xacml.ForeldrepengerAttributter.RESOURCE_FORELDREPENGER_SAK_AKSJONSPUNKT_TYPE;
+import static no.nav.abac.xacml.ForeldrepengerAttributter.RESOURCE_FORELDREPENGER_SAK_AKSJONSPUNKT_TYPE;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
@@ -10,7 +10,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import no.nav.abac.common.xacml.CommonAttributter;
+import no.nav.abac.xacml.CommonAttributter;
 import no.nav.modig.core.test.LogSniffer;
 
 public class AbacSporingsloggTest {

diff --git a/...sikkerhet/src/test/java/no/nav/vedtak/sikkerhet/abac/BeskyttetRessursInterceptorTest.java b/...sikkerhet/src/test/java/no/nav/vedtak/sikkerhet/abac/BeskyttetRessursInterceptorTest.java
@@ -14,7 +14,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import no.nav.abac.common.xacml.CommonAttributter;
+import no.nav.abac.xacml.CommonAttributter;
 import no.nav.modig.core.test.LogSniffer;
 import no.nav.vedtak.exception.ManglerTilgangException;
 import no.nav.vedtak.sikkerhet.InnloggetSubject;