Skip to content

Commit 5858069

Browse files
tendestadtendestad
authored
Fjernet støtte for javax-namespace i kontrakt (#380)
1 parent 6097dc6 commit 5858069

File tree

1 file changed

+1
-174
lines changed

1 file changed

+1
-174
lines changed

‎pom.xml‎

Lines changed: 1 addition & 174 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</modules>
2020

2121
<properties>
22-
<revision>5.2.0</revision>
22+
<revision>9.0.0</revision>
2323
<sha1></sha1>
2424
<changelist>-SNAPSHOT</changelist>
2525
<java.version>17</java.version>
@@ -48,13 +48,6 @@
4848
</repository>
4949
</repositories>
5050

51-
<pluginRepositories>
52-
<pluginRepository>
53-
<id>github</id>
54-
<url>https://maven.pkg.github.com/navikt/dev-jakarta-transform/</url>
55-
</pluginRepository>
56-
</pluginRepositories>
57-
5851
<scm>
5952
<connection>scm:git:https://github.com/navikt/k9-format.git</connection>
6053
<developerConnection>scm:git:https://github.com/navikt/k9-format.git</developerConnection>
@@ -288,175 +281,9 @@
288281
</execution>
289282
</executions>
290283
</plugin>
291-
292-
<plugin>
293-
<groupId>org.apache.maven.plugins</groupId>
294-
<artifactId>maven-antrun-plugin</artifactId>
295-
<executions>
296-
<execution>
297-
<id>transform-jar</id>
298-
<phase>package</phase>
299-
<goals>
300-
<goal>run</goal>
301-
</goals>
302-
<configuration>
303-
<target>
304-
<property name="plugin_classpath" refid="maven.plugin.classpath" />
305-
<java classname="no.nav.k9.dev.jakarta.App">
306-
<arg value="${project.build.directory}/${project.build.finalName}.jar" />
307-
<arg value="${project.build.directory}/${project.artifactId}-jakarta-${project.version}.jar" />
308-
<arg value="-q" />
309-
<arg value="-o" />
310-
<classpath>
311-
<pathelement path="${plugin_classpath}" />
312-
</classpath>
313-
</java>
314-
</target>
315-
</configuration>
316-
</execution>
317-
<execution>
318-
<id>transform-sources-jar</id>
319-
<phase>package</phase>
320-
<goals>
321-
<goal>run</goal>
322-
</goals>
323-
<configuration>
324-
<target>
325-
<property name="plugin_classpath" refid="maven.plugin.classpath" />
326-
<java classname="no.nav.k9.dev.jakarta.App">
327-
<arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
328-
<arg value="${project.build.directory}/${project.artifactId}-jakarta-${project.version}-sources.jar" />
329-
<arg value="-q" />
330-
<arg value="-o" />
331-
<classpath>
332-
<pathelement path="${plugin_classpath}" />
333-
</classpath>
334-
</java>
335-
</target>
336-
</configuration>
337-
</execution>
338-
</executions>
339-
<dependencies>
340-
<dependency>
341-
<groupId>no.nav.k9.dev</groupId>
342-
<artifactId>dev-jakarta-transform</artifactId>
343-
<version>0.6.11</version>
344-
</dependency>
345-
<dependency>
346-
<groupId>ant-contrib</groupId>
347-
<artifactId>ant-contrib</artifactId>
348-
<version>1.0b3</version>
349-
<exclusions>
350-
<exclusion>
351-
<groupId>ant</groupId>
352-
<artifactId>ant</artifactId>
353-
</exclusion>
354-
</exclusions>
355-
</dependency>
356-
</dependencies>
357-
</plugin>
358284
</plugins>
359285
</build>
360286

361-
<profiles>
362-
<profile>
363-
<id>jar-module</id>
364-
<activation>
365-
<file>
366-
<exists>src/main/java/</exists>
367-
</file>
368-
</activation>
369-
<build>
370-
<plugins>
371-
<plugin>
372-
<groupId>org.apache.maven.plugins</groupId>
373-
<artifactId>maven-antrun-plugin</artifactId>
374-
<executions>
375-
<execution>
376-
<phase>package</phase>
377-
<configuration>
378-
<target>
379-
<unzip src="${project.build.directory}/${project.artifactId}-jakarta-${project.version}.jar"
380-
dest="${project.build.directory}/jakarta">
381-
<patternset>
382-
<include name="META-INF/maven/**/pom.xml" />
383-
</patternset>
384-
</unzip>
385-
</target>
386-
</configuration>
387-
<goals>
388-
<goal>run</goal>
389-
</goals>
390-
</execution>
391-
<execution>
392-
<id>antrun-delete-file</id>
393-
<phase>package</phase>
394-
<configuration>
395-
<target>
396-
<!-- ompakker jar fil uten pom.xml -->
397-
<jar
398-
destfile="${project.build.directory}/${project.artifactId}-jakarta-${project.version}-TOBEDEPLOYED.jar">
399-
<zipfileset
400-
src="${project.build.directory}/${project.artifactId}-jakarta-${project.version}.jar"
401-
excludes="META-INF/maven/**" />
402-
</jar>
403-
<jar
404-
destfile="${project.build.directory}/${project.artifactId}-jakarta-${project.version}-sources-TOBEDEPLOYED.jar">
405-
<zipfileset
406-
src="${project.build.directory}/${project.artifactId}-jakarta-${project.version}-sources.jar"
407-
excludes="META-INF/maven/**" />
408-
</jar>
409-
</target>
410-
</configuration>
411-
<goals>
412-
<goal>run</goal>
413-
</goals>
414-
</execution>
415-
416-
</executions>
417-
</plugin>
418-
<plugin>
419-
<groupId>org.apache.maven.plugins</groupId>
420-
<artifactId>maven-install-plugin</artifactId>
421-
<executions>
422-
<execution>
423-
<phase>install</phase>
424-
<goals>
425-
<goal>install-file</goal>
426-
</goals>
427-
<configuration>
428-
<pomFile>${project.build.directory}/jakarta/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml</pomFile>
429-
<file>${project.build.directory}/${project.artifactId}-jakarta-${project.version}-TOBEDEPLOYED.jar</file>
430-
<sources>${project.build.directory}/${project.artifactId}-jakarta-${project.version}-sources-TOBEDEPLOYED.jar</sources>
431-
</configuration>
432-
</execution>
433-
</executions>
434-
</plugin>
435-
<plugin>
436-
<groupId>org.apache.maven.plugins</groupId>
437-
<artifactId>maven-deploy-plugin</artifactId>
438-
<executions>
439-
<execution>
440-
<phase>deploy</phase>
441-
<goals>
442-
<goal>deploy-file</goal>
443-
</goals>
444-
<configuration>
445-
<repositoryId>github</repositoryId>
446-
<!-- må matche unpacked pom.xml fra over (disse endrer ikke path ved transform p.t.) -->
447-
<pomFile>${project.build.directory}/jakarta/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml</pomFile>
448-
<url>${project.distributionManagement.repository.url}</url>
449-
<file>${project.build.directory}/${project.artifactId}-jakarta-${project.version}-TOBEDEPLOYED.jar</file>
450-
<sources>${project.build.directory}/${project.artifactId}-jakarta-${project.version}-sources-TOBEDEPLOYED.jar</sources>
451-
</configuration>
452-
</execution>
453-
</executions>
454-
</plugin>
455-
</plugins>
456-
</build>
457-
</profile>
458-
</profiles>
459-
460287
<distributionManagement>
461288
<repository>
462289
<id>github</id>

0 commit comments

Comments
 (0)