Skip to content

Commit

Permalink
Fix build noise (helidon-io#7740)
Browse files Browse the repository at this point in the history
- 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)
  • Loading branch information
romain-grecourt authored and dalexandrov committed Oct 17, 2023
1 parent 2933196 commit adf89f6
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 67 deletions.
13 changes: 0 additions & 13 deletions applications/mp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,6 @@
<phase>process-classes</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>${version.plugin.jaxb}</version>
<dependencies>
<!-- Force upgrade version. Needed to support Java 16 -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${version.lib.jaxb-runtime}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.hibernate.orm.tooling</groupId>
Expand Down
1 change: 0 additions & 1 deletion dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
<version.lib.jaxb-impl>4.0.3</version.lib.jaxb-impl>
<version.lib.jboss.classfilewriter>1.3.0.Final</version.lib.jboss.classfilewriter>
<version.lib.jboss.logging>3.5.3.Final</version.lib.jboss.logging>
<!-- Force upgrade version used by maven-jaxb2-plugin. Needed to support Java 16 -->
<version.lib.jaxb-runtime>4.0.3</version.lib.jaxb-runtime>
<version.lib.jersey>3.1.3</version.lib.jersey>
<version.lib.jgit>6.7.0.202309050840-r</version.lib.jgit>
Expand Down
9 changes: 9 additions & 0 deletions integrations/oci/sdk/processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@
<groupId>com.github.jknack</groupId>
<artifactId>handlebars</artifactId>
</dependency>
<dependency>
<!-- required as handlebars use slf4j -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.common.testing</groupId>
<artifactId>helidon-common-testing-junit5</artifactId>
Expand Down
32 changes: 5 additions & 27 deletions tests/integration/jpa/appl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@
<artifactId>jandex</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand All @@ -115,7 +120,6 @@
<artifactId>hamcrest-all</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand Down Expand Up @@ -155,32 +159,6 @@
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<executions>
<execution>
<id>Generate persistence.xml Java objects</id>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<generatePackage>io.helidon.tests.integration.nativeimage.mp2.jaxb</generatePackage>
<markGenerated>true</markGenerated>
<schemas>
<schema>
<dependencyResource>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
<resource>javax/persistence/persistence_2_2.xsd</resource>
</dependencyResource>
</schema>
</schemas>
<strict>false</strict>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.hibernate.orm.tooling</groupId>
<artifactId>hibernate-enhance-maven-plugin</artifactId>
Expand Down
26 changes: 0 additions & 26 deletions tests/integration/native-image/mp-2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,32 +141,6 @@
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<executions>
<execution>
<id>Generate persistence.xml Java objects</id>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<generatePackage>io.helidon.tests.integration.nativeimage.mp2.jaxb</generatePackage>
<markGenerated>true</markGenerated>
<schemas>
<schema>
<dependencyResource>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
<resource>javax/persistence/persistence_2_2.xsd</resource>
</dependencyResource>
</schema>
</schemas>
<strict>false</strict>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.hibernate.orm.tooling</groupId>
<artifactId>hibernate-enhance-maven-plugin</artifactId>
Expand Down

0 comments on commit adf89f6

Please sign in to comment.