Skip to content

Commit

Permalink
Upgrading to the latest version of the Eclipselink Maven plugin and a…
Browse files Browse the repository at this point in the history 
…ligning Eclipselink version to correspond with it. (#2138)

* Upgraded to the latest version of the Eclipselink Maven plugin and aligned Eclipselink version to correspond with it.
* Fixed Pokemon example which was using EclipseLink weaving but a Hibernate runtime.
* Removed commented out code.

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
  • Loading branch information
@ljnelson
ljnelson authored Jul 9, 2020
1 parent 7a9a2ae commit cf156c5
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 113 deletions.
5 changes: 4 additions & 1 deletion applications/mp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<properties>
<version.plugin.jandex>1.0.6</version.plugin.jandex>
<version.plugin.jaxb2>0.14.0</version.plugin.jaxb2>
<version.plugin.eclipselink>2.7.1.1</version.plugin.eclipselink>
<version.plugin.eclipselink>2.7.5.1</version.plugin.eclipselink>
<version.plugin.hibernate.enhance>5.4.6.Final</version.plugin.hibernate.enhance>
<mainClass>io.helidon.microprofile.cdi.Main</mainClass>
</properties>
Expand Down Expand Up @@ -71,6 +71,9 @@
<version>${version.lib.jaxb-api}</version>
</dependency>
</dependencies>
<configuration>
<updatePersistenceXml>false</updatePersistenceXml>
</configuration>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
Expand Down
2 changes: 1 addition & 1 deletion dependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<version.lib.cdi-api>2.0.2</version.lib.cdi-api>
<version.lib.commons-logging>1.2</version.lib.commons-logging>
<version.lib.dropwizard.metrics>4.1.2</version.lib.dropwizard.metrics>
<version.lib.eclipselink>2.7.4</version.lib.eclipselink>
<version.lib.eclipselink>2.7.5</version.lib.eclipselink>
<version.lib.el-api>3.0.3</version.lib.el-api>
<version.lib.el-impl>3.0.2</version.lib.el-impl>
<version.lib.etcd4j>2.17.0</version.lib.etcd4j>
Expand Down
19 changes: 14 additions & 5 deletions examples/integrations/cdi/pokemons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,16 +153,25 @@
</executions>
</plugin>
<plugin>
<groupId>com.ethlo.persistence.tools</groupId>
<artifactId>eclipselink-maven-plugin</artifactId>
<groupId>org.hibernate.orm.tooling</groupId>
<artifactId>hibernate-enhance-maven-plugin</artifactId>
<executions>
<execution>
<id>weave</id>
<phase>process-classes</phase>
<configuration>
<failOnError>true</failOnError>
<enableLazyInitialization>true</enableLazyInitialization>
<enableDirtyTracking>true</enableDirtyTracking>
</configuration>
<goals>
<goal>weave</goal>
<goal>enhance</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.ethlo.persistence.tools</groupId>
<artifactId>eclipselink-maven-plugin</artifactId>
<executions>
<execution>
<id>modelgen</id>
<phase>generate-sources</phase>
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<!-- plugin versions -->
<version.plugin.compiler>3.8.1</version.plugin.compiler>
<version.plugin.dependency>3.0.0</version.plugin.dependency>
<version.plugin.eclipselink>2.7.1.1</version.plugin.eclipselink>
<version.plugin.eclipselink>2.7.5.1</version.plugin.eclipselink>
<version.plugin.exec>1.6.0</version.plugin.exec>
<version.plugin.failsafe>2.19.1</version.plugin.failsafe>
<version.plugin.helidon>1.1.1</version.plugin.helidon>
Expand Down
104 changes: 0 additions & 104 deletions integrations/cdi/jpa-cdi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,110 +197,6 @@
</execution>
</executions>
</plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>Copy test classes to Eclipselink weaving area</id>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>process-test-classes</phase>
<configuration>
<resources>
<resource>
<directory>${project.build.testOutputDirectory}</directory>
<filtering>false</filtering>
</resource>
</resources>
<outputDirectory>${project.build.directory}/eclipselink/test-classes</outputDirectory>
<overwrite>true</overwrite>
</configuration>
</execution>
<execution>
<id>Copy test classes to Hibernate weaving area</id>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>process-test-classes</phase>
<configuration>
<resources>
<resource>
<directory>${project.build.testOutputDirectory}</directory>
<filtering>false</filtering>
</resource>
</resources>
<outputDirectory>${project.build.directory}/hibernate/test-classes</outputDirectory>
<overwrite>true</overwrite>
</configuration>
</execution>
</executions>
</plugin>
-->
<!--
<plugin>
<groupId>com.ethlo.persistence.tools</groupId>
<artifactId>eclipselink-maven-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${version.lib.junit}</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>Statically weave JPA entities for Eclipselink</id>
<phase>process-test-classes</phase>
<goals>
<goal>weave</goal>
</goals>
<configuration>
<source>${project.build.directory}/eclipselink/test-classes</source>
<target>${project.build.directory}/eclipselink/test-classes</target>
<persistenceInfoLocation>${project.build.directory}/eclipselink/test-classes</persistenceInfoLocation>
</configuration>
</execution>
<execution>
<id>modelgen</id>
<phase>generate-test-sources</phase>
<goals>
<goal>modelgen</goal>
</goals>
<configuration>
<source>${project.build.testSourceDirectory}</source>
<generatedSourcesDirectory>${project.build.directory}/generated-test-sources/apt</generatedSourcesDirectory>
</configuration>
</execution>
</executions>
</plugin>
-->
<!--
<plugin>
<groupId>org.hibernate.orm.tooling</groupId>
<artifactId>hibernate-enhance-maven-plugin</artifactId>
<executions>
<execution>
<id>Statically enhance JPA entities for Hibernate</id>
<phase>process-test-classes</phase>
<goals>
<goal>enhance</goal>
</goals>
<configuration>
<base>${project.build.directory}/hibernate/test-classes</base>
<dir>${project.build.directory}/hibernate/test-classes</dir>
<failOnError>true</failOnError>
<enableAssociationManagement>true</enableAssociationManagement>
<enableDirtyTracking>true</enableDirtyTracking>
<enableExtendedEnhancement>true</enableExtendedEnhancement>
<enableLazyInitialization>true</enableLazyInitialization>
</configuration>
</execution>
</executions>
</plugin>
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
5 changes: 4 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<version.plugin.compiler>3.8.1</version.plugin.compiler>
<version.plugin.dependency>3.1.2</version.plugin.dependency>
<version.plugin.directory>0.1</version.plugin.directory>
<version.plugin.eclipselink>2.7.1.1</version.plugin.eclipselink>
<version.plugin.eclipselink>2.7.5.1</version.plugin.eclipselink>
<version.plugin.enforcer>3.0.0-M1</version.plugin.enforcer>
<version.plugin.exec>1.6.0</version.plugin.exec>
<version.plugin.failsafe>2.19.1</version.plugin.failsafe>
Expand Down Expand Up @@ -545,6 +545,9 @@
<groupId>com.ethlo.persistence.tools</groupId>
<artifactId>eclipselink-maven-plugin</artifactId>
<version>${version.plugin.eclipselink}</version>
<configuration>
<updatePersistenceXml>false</updatePersistenceXml>
</configuration>
</plugin>
<plugin>
<groupId>org.hibernate.orm.tooling</groupId>
Expand Down

0 comments on commit cf156c5

Please sign in to comment.