Lag Jandex/index av 2.3 format men ta inn bakoverkompatibel 2.4 (#956)

navikt · Oct 2, 2021 · 7d6c9bf · 7d6c9bf
1 parent 39915d6
commit 7d6c9bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/felles/pom.xml b/felles/pom.xml
@@ -65,6 +65,12 @@
                 <artifactId>jakarta.activation</artifactId>
                 <version>${jakarta.activation.version}</version>
             </dependency>
+            <!-- jandex brukes av weld (leser format 2.3 prdousert av jandex-maven 1.1.1 (ikke 1.2.0) + dto-tester -->
+            <dependency>
+                <groupId>org.jboss</groupId>
+                <artifactId>jandex</artifactId>
+                <version>2.4.0.Final</version>
+            </dependency>
             <dependency>
                 <groupId>org.jboss.weld</groupId>
                 <artifactId>weld-core-bom</artifactId>
@@ -79,7 +85,7 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <!-- trengs for Java17 inntil jetty 10.0.7 kommer -->
+            <!-- trengs for Java17 inntil jetty 10.0.7 kommer 11 oct 2021 -->
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm</artifactId>
@@ -169,11 +175,6 @@
                 <artifactId>felles-sikkerhet</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>jakarta.enterprise</groupId>
-                <artifactId>jakarta.enterprise.cdi-api</artifactId>
-                <version>2.0.2</version>
-            </dependency>
             <dependency>
                 <groupId>jakarta.ws.rs</groupId>
                 <artifactId>jakarta.ws.rs-api</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
 		<tjenestespesifikasjoner.version>1.2021.02.22-10.45-4201aaea72fb</tjenestespesifikasjoner.version>
 		<no.nav.security.version>1.3.8</no.nav.security.version>
 		<additionalparam>-Xdoclint:none</additionalparam>
-		<argLine>-Dfile.encoding=UTF-8 --illegal-access=permit</argLine>
+		<argLine>-Dfile.encoding=UTF-8</argLine>
 	</properties>
 
 	<scm>
@@ -268,10 +268,11 @@
 					<useFile>true</useFile>
 				</configuration>
 			</plugin>
+            <!-- ikke oppgrader til 1.2.0 før weld støtter nytt indexformat -->
 			<plugin>
 				<groupId>org.jboss.jandex</groupId>
 				<artifactId>jandex-maven-plugin</artifactId>
-				<version>1.2.0</version>
+				<version>1.1.1</version>
 				<executions>
 					<execution>
 						<id>make-index</id>