Skip to content

Commit 1e41739

Browse files
frode-carlsenfrode-carlsen
authored
bygger jakarta kompatibel kontrakt jar parallelt (#1670)
1 parent 378ca8e commit 1e41739

File tree

3 files changed

+206
-40
lines changed

3 files changed

+206
-40
lines changed

‎kodeverk/pom.xml

+2-14
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<name>Abakus :: Kodeverk</name>
1515

1616
<properties>
17+
<maven.deploy.skip>false</maven.deploy.skip>
1718
</properties>
1819

1920
<dependencies>
@@ -24,6 +25,7 @@
2425
<dependency>
2526
<groupId>jakarta.validation</groupId>
2627
<artifactId>jakarta.validation-api</artifactId>
28+
<scope>provided</scope>
2729
</dependency>
2830

2931
<!-- for å sette opp default ObjectMapper korrekt -->
@@ -53,18 +55,4 @@
5355

5456
</dependencies>
5557

56-
<build>
57-
<plugins>
58-
59-
<plugin>
60-
<groupId>org.apache.maven.plugins</groupId>
61-
<artifactId>maven-deploy-plugin</artifactId>
62-
<configuration>
63-
<skip>false</skip>
64-
</configuration>
65-
</plugin>
66-
</plugins>
67-
</build>
68-
69-
7058
</project>

‎kontrakt/pom.xml

+9-16
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,21 @@
1414
<name>Abakus :: Kontrakter</name>
1515

1616
<properties>
17-
</properties>
17+
<maven.deploy.skip>false</maven.deploy.skip>
18+
</properties>
1819

1920
<dependencies>
2021
<dependency>
2122
<groupId>no.nav.foreldrepenger.abakus</groupId>
2223
<artifactId>abakus-kodeverk</artifactId>
2324
</dependency>
24-
25+
26+
<dependency>
27+
<groupId>jakarta.validation</groupId>
28+
<artifactId>jakarta.validation-api</artifactId>
29+
<scope>provided</scope>
30+
</dependency>
31+
2532
<dependency>
2633
<!-- avhengighet må deklareres av bruker dersom ønsker å benytte kafka topics fra abakus -->
2734
<groupId>org.apache.kafka</groupId>
@@ -38,18 +45,4 @@
3845

3946
</dependencies>
4047

41-
<build>
42-
<plugins>
43-
44-
<plugin>
45-
<groupId>org.apache.maven.plugins</groupId>
46-
<artifactId>maven-deploy-plugin</artifactId>
47-
<configuration>
48-
<skip>false</skip>
49-
</configuration>
50-
</plugin>
51-
</plugins>
52-
</build>
53-
54-
5548
</project>

‎pom.xml

+195-10
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<argLine>-Xms256m -Dlog.level.no.nav=WARN -Dfile.encoding=${project.build.sourceEncoding}</argLine>
2929
<maven.compiler.source>${java.version}</maven.compiler.source>
3030
<maven.compiler.target>${java.version}</maven.compiler.target>
31+
<maven.deploy.skip>true</maven.deploy.skip>
3132
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3233
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3334

@@ -353,15 +354,10 @@
353354
<version>3.0.0-M5</version>
354355
</plugin>
355356
<plugin>
356-
<groupId>org.asciidoctor</groupId>
357-
<artifactId>asciidoctor-maven-plugin</artifactId>
358-
<version>2.2.1</version>
359-
</plugin>
360-
<plugin>
361-
<groupId>org.codehaus.mojo</groupId>
362-
<artifactId>buildnumber-maven-plugin</artifactId>
363-
<version>3.0.0</version>
364-
</plugin>
357+
<groupId>org.apache.maven.plugins</groupId>
358+
<artifactId>maven-antrun-plugin</artifactId>
359+
<version>3.0.0</version>
360+
</plugin>
365361
<plugin>
366362
<groupId>org.apache.maven.plugins</groupId>
367363
<artifactId>maven-clean-plugin</artifactId>
@@ -472,20 +468,209 @@
472468
<artifactId>maven-deploy-plugin</artifactId>
473469
<configuration>
474470
<deployAtEnd>true</deployAtEnd>
475-
<skip>true</skip>
476471
</configuration>
477472
</plugin>
473+
474+
<plugin>
475+
<!-- FOR Å LEGGE VED JAKARTA EE9 KOMPATIBLE ARTEFAKTER I TILLEGG -->
476+
<groupId>org.apache.maven.plugins</groupId>
477+
<artifactId>maven-antrun-plugin</artifactId>
478+
<executions>
479+
<execution>
480+
<id>transform-jar</id>
481+
<phase>package</phase>
482+
<goals>
483+
<goal>run</goal>
484+
</goals>
485+
<configuration>
486+
<skip>${maven.deploy.skip}</skip>
487+
<target>
488+
<property name="plugin_classpath" refid="maven.plugin.classpath" />
489+
<java classname="no.nav.k9.dev.jakarta.App">
490+
<arg value="${project.build.directory}/${project.build.finalName}.jar" />
491+
<arg value="${project.build.directory}/${project.artifactId}-jakarta-${project.version}.jar" />
492+
<arg value="-q" />
493+
<arg value="-o" />
494+
<classpath>
495+
<pathelement path="${plugin_classpath}" />
496+
</classpath>
497+
</java>
498+
</target>
499+
</configuration>
500+
</execution>
501+
<execution>
502+
<id>transform-sources-jar</id>
503+
<phase>package</phase>
504+
<goals>
505+
<goal>run</goal>
506+
</goals>
507+
<configuration>
508+
<skip>${maven.deploy.skip}</skip>
509+
<target>
510+
<property name="plugin_classpath" refid="maven.plugin.classpath" />
511+
<java classname="no.nav.k9.dev.jakarta.App">
512+
<arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
513+
<arg value="${project.build.directory}/${project.artifactId}-jakarta-${project.version}-sources.jar" />
514+
<arg value="-q" />
515+
<arg value="-o" />
516+
<classpath>
517+
<pathelement path="${plugin_classpath}" />
518+
</classpath>
519+
</java>
520+
</target>
521+
</configuration>
522+
</execution>
523+
</executions>
524+
<dependencies>
525+
<dependency>
526+
<groupId>no.nav.k9.dev</groupId>
527+
<artifactId>dev-jakarta-transform</artifactId>
528+
<version>0.3.5</version>
529+
</dependency>
530+
<dependency>
531+
<groupId>ant-contrib</groupId>
532+
<artifactId>ant-contrib</artifactId>
533+
<version>1.0b3</version>
534+
<exclusions>
535+
<exclusion>
536+
<groupId>ant</groupId>
537+
<artifactId>ant</artifactId>
538+
</exclusion>
539+
</exclusions>
540+
</dependency>
541+
</dependencies>
542+
</plugin>
478543
</plugins>
479544
</build>
480545

546+
<profiles>
547+
<!-- FOR Å LEGGE VED JAKARTA EE9 KOMPATIBLE ARTEFAKTER I TILLEGG -->
548+
<!-- (bruker ikke attach-jar da den ikke støtter alterntiv artefakt navn) -->
549+
<profile>
550+
<id>jar-module</id>
551+
<activation>
552+
<file>
553+
<exists>src/main/java/</exists>
554+
</file>
555+
<property>
556+
<name>maven.deploy.skip</name>
557+
<value>false</value>
558+
</property>
559+
</activation>
560+
<build>
561+
<plugins>
562+
<plugin>
563+
<groupId>org.apache.maven.plugins</groupId>
564+
<artifactId>maven-antrun-plugin</artifactId>
565+
<executions>
566+
<execution>
567+
<phase>package</phase>
568+
<configuration>
569+
<target>
570+
<unzip src="${project.build.directory}/${project.artifactId}-jakarta-${project.version}.jar"
571+
dest="${project.build.directory}/jakarta">
572+
<patternset>
573+
<include name="META-INF/maven/**/pom.xml" />
574+
</patternset>
575+
</unzip>
576+
</target>
577+
</configuration>
578+
<goals>
579+
<goal>run</goal>
580+
</goals>
581+
</execution>
582+
<execution>
583+
<id>antrun-delete-file</id>
584+
<phase>package</phase>
585+
<configuration>
586+
<target>
587+
<!-- ompakker jar fil uten pom.xml -->
588+
<jar
589+
destfile="${project.build.directory}/${project.artifactId}-jakarta-${project.version}-TOBEDEPLOYED.jar">
590+
<zipfileset
591+
src="${project.build.directory}/${project.artifactId}-jakarta-${project.version}.jar"
592+
excludes="META-INF/maven/**" />
593+
</jar>
594+
<jar
595+
destfile="${project.build.directory}/${project.artifactId}-jakarta-${project.version}-sources-TOBEDEPLOYED.jar">
596+
<zipfileset
597+
src="${project.build.directory}/${project.artifactId}-jakarta-${project.version}-sources.jar"
598+
excludes="META-INF/maven/**" />
599+
</jar>
600+
</target>
601+
</configuration>
602+
<goals>
603+
<goal>run</goal>
604+
</goals>
605+
</execution>
606+
607+
</executions>
608+
</plugin>
609+
<plugin>
610+
<groupId>org.apache.maven.plugins</groupId>
611+
<artifactId>maven-install-plugin</artifactId>
612+
<executions>
613+
<execution>
614+
<phase>install</phase>
615+
<goals>
616+
<goal>install-file</goal>
617+
</goals>
618+
<configuration>
619+
<pomFile>${project.build.directory}/jakarta/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml</pomFile>
620+
<file>${project.build.directory}/${project.artifactId}-jakarta-${project.version}-TOBEDEPLOYED.jar</file>
621+
<sources>${project.build.directory}/${project.artifactId}-jakarta-${project.version}-sources-TOBEDEPLOYED.jar</sources>
622+
</configuration>
623+
</execution>
624+
</executions>
625+
</plugin>
626+
<plugin>
627+
<groupId>org.apache.maven.plugins</groupId>
628+
<artifactId>maven-deploy-plugin</artifactId>
629+
<executions>
630+
<execution>
631+
<phase>deploy</phase>
632+
<goals>
633+
<goal>deploy-file</goal>
634+
</goals>
635+
<configuration>
636+
<repositoryId>github</repositoryId>
637+
<!-- må matche unpacked pom.xml fra over (disse endrer ikke path ved transform p.t.) -->
638+
<pomFile>${project.build.directory}/jakarta/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml</pomFile>
639+
<url>${project.distributionManagement.repository.url}</url>
640+
<file>${project.build.directory}/${project.artifactId}-jakarta-${project.version}-TOBEDEPLOYED.jar</file>
641+
<sources>${project.build.directory}/${project.artifactId}-jakarta-${project.version}-sources-TOBEDEPLOYED.jar</sources>
642+
</configuration>
643+
</execution>
644+
</executions>
645+
</plugin>
646+
</plugins>
647+
</build>
648+
</profile>
649+
</profiles>
481650

482651
<repositories>
483652
<repository>
484653
<id>github</id>
485654
<name>GitHub Apache Maven Packages</name>
486655
<url>https://maven.pkg.github.com/navikt/fp-abakus/</url>
656+
</repository>
657+
<repository>
658+
<!-- bruker SNAPSHOT versjon av eclipse-transformer (0.3.0-SNAPSHOT) -->
659+
<id>ossrh</id>
660+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
661+
<layout>default</layout>
662+
<releases>
663+
<enabled>false</enabled>
664+
</releases>
487665
</repository>
488666
</repositories>
667+
<pluginRepositories>
668+
<pluginRepository>
669+
<id>github</id>
670+
<url>https://maven.pkg.github.com/navikt/dev-jakarta-transform/</url>
671+
</pluginRepository>
672+
</pluginRepositories>
673+
489674

490675
<scm>
491676
<connection>scm:git:https://github.com/navikt/fp-abakus.git</connection>

0 commit comments

Comments
 (0)