Skip to content

Commit

Permalink
Rydder opp i deps til felles-db (#1305)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrsladek
mrsladek committed Jul 5, 2023
1 parent c3b7d78 commit b226403
Show file tree
Hide file tree
Showing 11 changed files with 76 additions and 63 deletions.
4 changes: 4 additions & 0 deletions felles/abac-kontekst/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
<name>Felles :: ABAC</name>

<dependencies>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>no.nav.foreldrepenger.felles</groupId>
<artifactId>felles-kontekst</artifactId>
Expand Down
17 changes: 1 addition & 16 deletions felles/abac/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,22 +63,7 @@
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.spec.javax.interceptor</groupId>
<artifactId>jboss-interceptors-api_1.2_spec</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.spec.javax.annotation</groupId>
<artifactId>
jboss-annotations-api_1.3_spec
</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.spec.javax.el</groupId>
<artifactId>jboss-el-api_3.0_spec</artifactId>
</exclusion>
</exclusions>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
40 changes: 15 additions & 25 deletions felles/db/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@
<jakarta-persistence-api.version>2.3.3</jakarta-persistence-api.version>
</properties>
<dependencies>
<dependency>
<groupId>no.nav.foreldrepenger.felles</groupId>
<artifactId>felles-feil</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
Expand All @@ -31,10 +23,23 @@
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>no.nav.foreldrepenger.felles</groupId>
<artifactId>felles-feil</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-micrometer</artifactId>
<version>${hibernate.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>io.micrometer</groupId>
Expand All @@ -49,22 +54,7 @@
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.spec.javax.interceptor</groupId>
<artifactId>jboss-interceptors-api_1.2_spec</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.spec.javax.annotation</groupId>
<artifactId>
jboss-annotations-api_1.3_spec
</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.spec.javax.el</groupId>
<artifactId>jboss-el-api_3.0_spec</artifactId>
</exclusion>
</exclusions>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
4 changes: 4 additions & 0 deletions felles/kontekst/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>no.nav.foreldrepenger</groupId>
<artifactId>konfig</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions felles/log/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>no.nav.foreldrepenger</groupId>
<artifactId>konfig</artifactId>
Expand All @@ -21,9 +25,5 @@
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
</dependencies>
</project>
1 change: 1 addition & 0 deletions felles/sikkerhet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down
14 changes: 14 additions & 0 deletions felles/testutilities/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
<artifactId>felles-testutilities</artifactId>

<dependencies>
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>no.nav.foreldrepenger.felles</groupId>
<artifactId>felles-db</artifactId>
Expand All @@ -21,6 +25,16 @@
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down
7 changes: 1 addition & 6 deletions felles/xmlutils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<exclusions>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</exclusion>
</exclusions>
<scope>provided</scope>
</dependency>
</dependencies>

Expand Down
17 changes: 11 additions & 6 deletions integrasjon/rest-klient/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
<name>Felles :: Integrasjon :: REST-klient</name>

<dependencies>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency>
<groupId>no.nav.foreldrepenger</groupId>
<artifactId>konfig</artifactId>
Expand All @@ -29,17 +37,14 @@
<artifactId>felles-mapper</artifactId>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
</dependency>

<dependency>
<groupId>no.nav.foreldrepenger.felles</groupId>
<artifactId>felles-testutilities</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
</dependency>
</dependencies>
</project>
15 changes: 12 additions & 3 deletions integrasjon/webservice/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
<name>Felles :: Integrasjon :: WebService</name>

<dependencies>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
<groupId>no.nav.foreldrepenger.felles</groupId>
<artifactId>felles-log</artifactId>
Expand Down Expand Up @@ -50,11 +58,12 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
</dependency>

<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>provided</scope>
</dependency>

<!-- Test -->
<dependency>
<groupId>no.nav.foreldrepenger.felles</groupId>
Expand Down
12 changes: 9 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>no.nav.foreldrepenger.felles</groupId>
<artifactId>fp-bom</artifactId>
<version>0.5.6</version>
<version>0.6.0</version>
</parent>

<artifactId>felles-root</artifactId>
Expand All @@ -33,7 +33,7 @@
<dependency>
<groupId>no.nav.foreldrepenger.felles</groupId>
<artifactId>fp-bom</artifactId>
<version>0.5.6</version>
<version>0.6.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand All @@ -43,6 +43,12 @@
<artifactId>jose4j</artifactId>
<version>0.9.3</version>
</dependency>

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-micrometer</artifactId>
<version>${hibernate.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -105,7 +111,7 @@
<dependency>
<groupId>no.nav.k9.dev</groupId>
<artifactId>dev-jakarta-transform</artifactId>
<version>0.6.10</version>
<version>0.6.11</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
Expand Down

0 comments on commit b226403

Please sign in to comment.