Skip to content
This repository was archived by the owner on Oct 26, 2023. It is now read-only.

Commit 5f2a9a4

Browse files
mbiarneskieciuser
authored andcommitted
upgrade of hibernate to align with wildfly 14
needed downgrade org.apache.cxf needed downgrade of org.apache.lucene removed org.hibernate.javax.persistence.hibernate-jpa-2.1-api (cherry picked from commit a249b4ea23af877a3b1216d60d952ef8ae7cd3bc)
1 parent 40f6ac9 commit 5f2a9a4

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

ip-bom/pom.xml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,11 @@
507507
<artifactId>mail</artifactId>
508508
<version>${version.javax.mail}</version>
509509
</dependency>
510+
<dependency>
511+
<groupId>javax.persistence</groupId>
512+
<artifactId>javax.persistence-api</artifactId>
513+
<version>${version.javax.persistence-api}</version>
514+
</dependency>
510515
<!-- javax.servlet is specified by org.jboss.spec.javax.servlet-->
511516
<!-- javax.servlet.jsp is specified by org.jboss.spec.javax.servlet.jsp-->
512517
<!-- javax.security.jacc is specified by org.jboss.spec.javax.security.jacc-->
@@ -1161,6 +1166,11 @@
11611166
<artifactId>cxf-rt-ws-addr</artifactId>
11621167
<version>${version.org.apache.cxf}</version>
11631168
</dependency>
1169+
<dependency>
1170+
<groupId>org.apache.cxf</groupId>
1171+
<artifactId>cxf-rt-rs-client</artifactId>
1172+
<version>${version.org.apache.cxf}</version>
1173+
</dependency>
11641174

11651175
<dependency>
11661176
<groupId>org.apache.deltaspike.core</groupId>
@@ -1999,11 +2009,6 @@
19992009
<classifier>wildfly-10-dist</classifier>
20002010
<type>zip</type>
20012011
</dependency>
2002-
<dependency><!-- JPA 2 implementation agnostic jar -->
2003-
<groupId>org.hibernate.javax.persistence</groupId>
2004-
<artifactId>hibernate-jpa-2.1-api</artifactId>
2005-
<version>${version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api}</version>
2006-
</dependency>
20072012
<dependency>
20082013
<groupId>org.hibernate</groupId>
20092014
<artifactId>hibernate-jpamodelgen</artifactId>

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@
161161
<version.javax.jcr>2.0</version.javax.jcr>
162162
<version.javax.mail>1.4.5</version.javax.mail>
163163
<version.javax.validation>1.1.0.Final</version.javax.validation>
164+
<version.javax.persistence-api>2.2</version.javax.persistence-api>
164165
<version.jaxen>1.1.6</version.jaxen>
165166
<version.jivesoftware.smack>3.1.0</version.jivesoftware.smack>
166167
<version.joda-time>2.9.7</version.joda-time>
@@ -195,15 +196,15 @@
195196
<version.org.apache.commons.math3>3.4.1</version.org.apache.commons.math3>
196197
<version.org.apache.commons.pool2>2.4.2</version.org.apache.commons.pool2>
197198
<version.org.apache.commons.ssl>0.3.9</version.org.apache.commons.ssl>
198-
<version.org.apache.cxf>3.2.5</version.org.apache.cxf>
199+
<version.org.apache.cxf>3.1.16</version.org.apache.cxf>
199200
<version.org.apache.ws.security.wss4j>1.6.19</version.org.apache.ws.security.wss4j>
200201
<version.org.apache.deltaspike.core>1.5.1</version.org.apache.deltaspike.core>
201202
<version.org.apache.ftpserver>1.0.6</version.org.apache.ftpserver>
202203
<version.org.apache.helix>0.6.5</version.org.apache.helix>
203204
<version.org.apache.httpcomponents.httpclient>4.5.3</version.org.apache.httpcomponents.httpclient>
204205
<version.org.apache.httpcomponents.httpcore>4.4.6</version.org.apache.httpcomponents.httpcore>
205206
<version.org.apache.karaf>2.4.0</version.org.apache.karaf>
206-
<version.org.apache.lucene>7.1.0</version.org.apache.lucene>
207+
<version.org.apache.lucene>6.6.1</version.org.apache.lucene>
207208
<version.org.apache.lucene.regex>3.0.3</version.org.apache.lucene.regex>
208209
<version.org.apache.maven>3.3.9</version.org.apache.maven>
209210
<version.org.apache.maven.plugin-testing>2.1</version.org.apache.maven.plugin-testing>
@@ -250,10 +251,9 @@
250251
<version.org.freemarker>2.3.27-incubating</version.org.freemarker>
251252
<version.org.glassfish>3.1.2</version.org.glassfish>
252253
<version.org.gwtbootstrap3>0.9.3</version.org.gwtbootstrap3>
253-
<version.org.hibernate>5.1.15.Final</version.org.hibernate>
254+
<version.org.hibernate>5.3.6.Final</version.org.hibernate>
254255
<version.org.hibernate.search>5.5.8.Final</version.org.hibernate.search>
255-
<version.org.hibernate.validator>5.3.5.Final</version.org.hibernate.validator>
256-
<version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api>1.0.0.Final</version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api>
256+
<version.org.hibernate.validator>6.0.13.Final</version.org.hibernate.validator>
257257
<version.org.hibernate.commons.annotations>5.0.4.Final</version.org.hibernate.commons.annotations>
258258
<version.org.hornetq>2.4.7.Final</version.org.hornetq>
259259
<version.org.infinispan>8.1.8.Final</version.org.infinispan>

0 commit comments

Comments
 (0)