Skip to content

Commit 5015c21

Browse files
forenkling regel oppsett (pakket sammen i egen artefakt - no.nav.k9.dev:dev-jakarta-transform) (#172)
1 parent 54b484d commit 5015c21

7 files changed

+21
-539
lines changed

pom.xml

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,24 @@
3636
<name>GitHub Apache Maven Packages</name>
3737
<url>https://maven.pkg.github.com/navikt/k9-format/</url>
3838
</repository>
39+
<repository>
40+
<!-- bruker SNAPSHOT versjon av eclipse-transformer (0.3.0-SNAPSHOT) -->
41+
<id>ossrh</id>
42+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
43+
<layout>default</layout>
44+
<releases>
45+
<enabled>false</enabled>
46+
</releases>
47+
</repository>
3948
</repositories>
4049

50+
<pluginRepositories>
51+
<pluginRepository>
52+
<id>github</id>
53+
<url>https://maven.pkg.github.com/navikt/dev-jakarta-transform/</url>
54+
</pluginRepository>
55+
</pluginRepositories>
56+
4157
<scm>
4258
<connection>scm:git:https://github.com/navikt/k9-format.git</connection>
4359
<developerConnection>scm:git:https://github.com/navikt/k9-format.git</developerConnection>
@@ -253,7 +269,6 @@
253269
<artifactId>maven-source-plugin</artifactId>
254270
<executions>
255271
<execution>
256-
<?m2e ignore?>
257272
<id>attach-sources</id>
258273
<goals>
259274
<goal>jar</goal>
@@ -275,19 +290,11 @@
275290
<configuration>
276291
<target>
277292
<property name="plugin_classpath" refid="maven.plugin.classpath" />
278-
<java classname="org.eclipse.transformer.jakarta.JakartaTransformer">
293+
<java classname="no.nav.k9.dev.jakarta.App">
279294
<arg value="${project.build.directory}/${project.build.finalName}.jar" />
280295
<arg value="${project.build.directory}/${project.artifactId}-jakarta-${project.version}.jar" />
281296
<arg value="-q" />
282297
<arg value="-o" />
283-
<arg value="-tr" />
284-
<arg value="${maven.multiModuleProjectDirectory}/rules/jakarta-renames.properties" />
285-
<arg value="-tv" />
286-
<arg value="${maven.multiModuleProjectDirectory}/rules/jakarta-versions.properties" />
287-
<arg value="-td" />
288-
<arg value="${maven.multiModuleProjectDirectory}/rules/jakarta-direct.properties" />
289-
<arg value="-tf" />
290-
<arg value="${maven.multiModuleProjectDirectory}/rules/pom.properties" />
291298
<classpath>
292299
<pathelement path="${plugin_classpath}" />
293300
</classpath>
@@ -304,19 +311,11 @@
304311
<configuration>
305312
<target>
306313
<property name="plugin_classpath" refid="maven.plugin.classpath" />
307-
<java classname="org.eclipse.transformer.jakarta.JakartaTransformer">
314+
<java classname="no.nav.k9.dev.jakarta.App">
308315
<arg value="${project.build.directory}/${project.build.finalName}-sources.jar" />
309316
<arg value="${project.build.directory}/${project.artifactId}-jakarta-${project.version}-sources.jar" />
310317
<arg value="-q" />
311318
<arg value="-o" />
312-
<arg value="-tr" />
313-
<arg value="${maven.multiModuleProjectDirectory}/rules/jakarta-renames.properties" />
314-
<arg value="-tv" />
315-
<arg value="${maven.multiModuleProjectDirectory}/rules/jakarta-versions.properties" />
316-
<arg value="-td" />
317-
<arg value="${maven.multiModuleProjectDirectory}/rules/jakarta-direct.properties" />
318-
<arg value="-tf" />
319-
<arg value="${maven.multiModuleProjectDirectory}/rules/pom.properties" />
320319
<classpath>
321320
<pathelement path="${plugin_classpath}" />
322321
</classpath>
@@ -327,9 +326,9 @@
327326
</executions>
328327
<dependencies>
329328
<dependency>
330-
<groupId>org.eclipse.transformer</groupId>
331-
<artifactId>org.eclipse.transformer.cli</artifactId>
332-
<version>0.2.0</version>
329+
<groupId>no.nav.k9.dev</groupId>
330+
<artifactId>dev-jakarta-transform</artifactId>
331+
<version>0.3.2</version>
333332
</dependency>
334333
<dependency>
335334
<groupId>ant-contrib</groupId>

rules/jakarta-direct.properties

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)