Skip to content

Commit 4144a72

Browse files
romain-grecourtromain-grecourt
authored
Fix build noise (helidon-io#7740)
- Remove usage of `maven-jaxb2-plugin` (not actually needed, and fails with java.net.MalformedURLException: unknown protocol: maven) - Apply the same fix as helidon-io#7706, add slf4j-api and slf4j-jdk14 (because of handlerbars)
1 parent bfe6099 commit 4144a72

5 files changed

Lines changed: 14 additions & 67 deletions

File tree

‎applications/mp/pom.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,6 @@
5555
<phase>process-classes</phase>
5656
</execution>
5757
</executions>
58-
</plugin>
59-
<plugin>
60-
<groupId>org.jvnet.jaxb2.maven2</groupId>
61-
<artifactId>maven-jaxb2-plugin</artifactId>
62-
<version>${version.plugin.jaxb}</version>
63-
<dependencies>
64-
<!-- Force upgrade version. Needed to support Java 16 -->
65-
<dependency>
66-
<groupId>org.glassfish.jaxb</groupId>
67-
<artifactId>jaxb-runtime</artifactId>
68-
<version>${version.lib.jaxb-runtime}</version>
69-
</dependency>
70-
</dependencies>
7158
</plugin>
7259
<plugin>
7360
<groupId>org.hibernate.orm.tooling</groupId>

‎dependencies/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
<version.lib.jaxb-impl>4.0.3</version.lib.jaxb-impl>
9090
<version.lib.jboss.classfilewriter>1.3.0.Final</version.lib.jboss.classfilewriter>
9191
<version.lib.jboss.logging>3.5.3.Final</version.lib.jboss.logging>
92-
<!-- Force upgrade version used by maven-jaxb2-plugin. Needed to support Java 16 -->
9392
<version.lib.jaxb-runtime>4.0.3</version.lib.jaxb-runtime>
9493
<version.lib.jersey>3.1.3</version.lib.jersey>
9594
<version.lib.jgit>6.7.0.202309050840-r</version.lib.jgit>

‎integrations/oci/sdk/processor/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,15 @@
4242
<groupId>com.github.jknack</groupId>
4343
<artifactId>handlebars</artifactId>
4444
</dependency>
45+
<dependency>
46+
<!-- required as handlebars use slf4j -->
47+
<groupId>org.slf4j</groupId>
48+
<artifactId>slf4j-api</artifactId>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.slf4j</groupId>
52+
<artifactId>slf4j-jdk14</artifactId>
53+
</dependency>
4554
<dependency>
4655
<groupId>io.helidon.common.testing</groupId>
4756
<artifactId>helidon-common-testing-junit5</artifactId>

‎tests/integration/jpa/appl/pom.xml‎

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@
105105
<artifactId>jandex</artifactId>
106106
<scope>runtime</scope>
107107
</dependency>
108+
<dependency>
109+
<groupId>org.slf4j</groupId>
110+
<artifactId>slf4j-jdk14</artifactId>
111+
<scope>runtime</scope>
112+
</dependency>
108113
<dependency>
109114
<groupId>org.junit.jupiter</groupId>
110115
<artifactId>junit-jupiter-api</artifactId>
@@ -115,7 +120,6 @@
115120
<artifactId>hamcrest-all</artifactId>
116121
<scope>test</scope>
117122
</dependency>
118-
119123
</dependencies>
120124

121125
<build>
@@ -155,32 +159,6 @@
155159
<groupId>io.smallrye</groupId>
156160
<artifactId>jandex-maven-plugin</artifactId>
157161
</plugin>
158-
<plugin>
159-
<groupId>org.jvnet.jaxb2.maven2</groupId>
160-
<artifactId>maven-jaxb2-plugin</artifactId>
161-
<executions>
162-
<execution>
163-
<id>Generate persistence.xml Java objects</id>
164-
<goals>
165-
<goal>generate</goal>
166-
</goals>
167-
<configuration>
168-
<generatePackage>io.helidon.tests.integration.nativeimage.mp2.jaxb</generatePackage>
169-
<markGenerated>true</markGenerated>
170-
<schemas>
171-
<schema>
172-
<dependencyResource>
173-
<groupId>jakarta.persistence</groupId>
174-
<artifactId>jakarta.persistence-api</artifactId>
175-
<resource>javax/persistence/persistence_2_2.xsd</resource>
176-
</dependencyResource>
177-
</schema>
178-
</schemas>
179-
<strict>false</strict>
180-
</configuration>
181-
</execution>
182-
</executions>
183-
</plugin>
184162
<plugin>
185163
<groupId>org.hibernate.orm.tooling</groupId>
186164
<artifactId>hibernate-enhance-maven-plugin</artifactId>

‎tests/integration/native-image/mp-2/pom.xml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -141,32 +141,6 @@
141141
<groupId>io.smallrye</groupId>
142142
<artifactId>jandex-maven-plugin</artifactId>
143143
</plugin>
144-
<plugin>
145-
<groupId>org.jvnet.jaxb2.maven2</groupId>
146-
<artifactId>maven-jaxb2-plugin</artifactId>
147-
<executions>
148-
<execution>
149-
<id>Generate persistence.xml Java objects</id>
150-
<goals>
151-
<goal>generate</goal>
152-
</goals>
153-
<configuration>
154-
<generatePackage>io.helidon.tests.integration.nativeimage.mp2.jaxb</generatePackage>
155-
<markGenerated>true</markGenerated>
156-
<schemas>
157-
<schema>
158-
<dependencyResource>
159-
<groupId>jakarta.persistence</groupId>
160-
<artifactId>jakarta.persistence-api</artifactId>
161-
<resource>javax/persistence/persistence_2_2.xsd</resource>
162-
</dependencyResource>
163-
</schema>
164-
</schemas>
165-
<strict>false</strict>
166-
</configuration>
167-
</execution>
168-
</executions>
169-
</plugin>
170144
<plugin>
171145
<groupId>org.hibernate.orm.tooling</groupId>
172146
<artifactId>hibernate-enhance-maven-plugin</artifactId>

0 commit comments

Comments
 (0)