From 9a5096308c29e278cd59253922110bdf3464951f Mon Sep 17 00:00:00 2001 From: Maxim Solodovnik Date: Thu, 18 Oct 2018 12:38:31 +0700 Subject: [PATCH] [OPENJPA-2752] libraries are updated to most recent versions --- openjpa-all/pom.xml | 1 - openjpa-examples/image-gallery/pom.xml | 2 - openjpa-examples/openbooks/build.properties | 2 +- openjpa-examples/openbooks/build.xml | 2 +- openjpa-examples/openbooks/pom.xml | 20 ++-- openjpa-examples/pom.xml | 1 - openjpa-integration/daytrader/pom.xml | 5 +- .../daytrader/AccountDataBean.java | 6 +- .../integration/daytrader/OrderDataBean.java | 6 +- .../integration/daytrader/QuoteDataBean.java | 4 +- .../integration/daytrader/TradeAction.java | 3 +- openjpa-integration/examples/pom.xml | 42 ++++---- openjpa-integration/jmx/pom.xml | 3 +- openjpa-integration/pom.xml | 1 - openjpa-integration/slf4j/pom.xml | 5 +- openjpa-integration/tck/pom.xml | 18 ++-- openjpa-integration/validation/pom.xml | 12 +-- openjpa-jdbc/pom.xml | 3 +- openjpa-jest/pom.xml | 21 ++-- .../0.0.1/websphere_uow_api-0.0.1.jar | Bin 4793 -> 0 bytes .../0.0.1/websphere_uow_api-0.0.1.jar.md5 | 1 - .../0.0.1/websphere_uow_api-0.0.1.jar.sha1 | 1 - .../0.0.1/websphere_uow_api-0.0.1.pom | 45 --------- .../0.0.1/websphere_uow_api-0.0.1.pom.md5 | 1 - .../0.0.1/websphere_uow_api-0.0.1.pom.sha1 | 1 - .../websphere_uow_api/maven-metadata.xml | 11 --- .../websphere_uow_api/maven-metadata.xml.md5 | 1 - .../websphere_uow_api/maven-metadata.xml.sha1 | 1 - openjpa-kernel/pom.xml | 27 +++--- openjpa-lib/pom.xml | 9 +- .../openjpa/lib/log/Log4JLogFactory.java | 17 ++-- openjpa-persistence-jdbc/pom.xml | 7 +- .../persistence/jdbc/localizer.properties | 3 +- openjpa-persistence-locking/pom.xml | 5 +- openjpa-persistence/pom.xml | 1 - .../persistence/criteria/localizer.properties | 3 +- .../openjpa/persistence/localizer.properties | 3 +- openjpa-project/assembly.xml | 2 +- openjpa-project/bin-assembly.xml | 2 +- openjpa-project/pom.xml | 26 +---- openjpa-project/suppressions.xml | 2 + openjpa-slice/pom.xml | 5 +- .../apache/openjpa/slice/localizer.properties | 3 +- .../slice/transaction/localizer.properties | 3 +- .../openjpa-fetch-statistics-was/pom.xml | 5 +- .../openjpa-fetch-statistics/pom.xml | 4 + openjpa-tools/openjpa-maven-plugin/pom.xml | 30 +++--- .../src/it/default_settings/pom.xml | 4 +- .../src/it/dependingArtifact/prjA/pom.xml | 4 +- .../src/it/dependingArtifact/prjB/pom.xml | 4 +- .../src/it/enhanceIncludesExcludes/pom.xml | 4 +- .../src/it/modifyDatabase/pom.xml.disabled | 4 +- .../src/it/nonDefaultPersistenceXml/pom.xml | 4 +- .../openjpa-maven-plugin/src/it/settings.xml | 15 ++- .../src/it/sqlActionDropSchema/pom.xml | 4 +- .../src/it/testDependencies/prjA/pom.xml | 4 +- .../src/it/testDependencies/prjB/pom.xml | 4 +- openjpa-tools/pom.xml | 1 - openjpa-xmlstore/pom.xml | 1 - pom.xml | 91 +++++++++--------- 60 files changed, 223 insertions(+), 297 deletions(-) delete mode 100644 openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar delete mode 100644 openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar.md5 delete mode 100644 openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar.sha1 delete mode 100644 openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom delete mode 100644 openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom.md5 delete mode 100644 openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom.sha1 delete mode 100644 openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/maven-metadata.xml delete mode 100644 openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/maven-metadata.xml.md5 delete mode 100644 openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/maven-metadata.xml.sha1 diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml index 93cf796fc..28c221ec7 100644 --- a/openjpa-all/pom.xml +++ b/openjpa-all/pom.xml @@ -31,7 +31,6 @@ 3.0.1-SNAPSHOT - org.apache.openjpa openjpa-all jar OpenJPA Aggregate Jar with Dependencies diff --git a/openjpa-examples/image-gallery/pom.xml b/openjpa-examples/image-gallery/pom.xml index c56c3587d..b8c5cd75d 100644 --- a/openjpa-examples/image-gallery/pom.xml +++ b/openjpa-examples/image-gallery/pom.xml @@ -54,12 +54,10 @@ org.slf4j slf4j-api - ${slf4jVersion} org.slf4j slf4j-simple - ${slf4jVersion} diff --git a/openjpa-examples/openbooks/build.properties b/openjpa-examples/openbooks/build.properties index 67bb7e014..1bd87831a 100644 --- a/openjpa-examples/openbooks/build.properties +++ b/openjpa-examples/openbooks/build.properties @@ -21,7 +21,7 @@ # Directory location of maven repository maven.repos=${user.home}/.m2/repository # OpenJPA runtime artifact -openjpa.version=2.3.0-SNAPSHOT +openjpa.version=3.0.1-SNAPSHOT # This is the variable of interest. # Notice that the variable points to a directory, not a *.jar file. diff --git a/openjpa-examples/openbooks/build.xml b/openjpa-examples/openbooks/build.xml index 83f7ad1ed..8d4d00083 100644 --- a/openjpa-examples/openbooks/build.xml +++ b/openjpa-examples/openbooks/build.xml @@ -211,7 +211,7 @@ - + diff --git a/openjpa-examples/openbooks/pom.xml b/openjpa-examples/openbooks/pom.xml index 2a3be1bb6..71ad8ceea 100644 --- a/openjpa-examples/openbooks/pom.xml +++ b/openjpa-examples/openbooks/pom.xml @@ -58,7 +58,6 @@ org.apache.ant ant - 1.8.1 provided @@ -70,7 +69,6 @@ mysql mysql-connector-java - 5.1.12 provided @@ -124,14 +122,14 @@ genmodel process-resources - + Running OpenBooks genmodel - + run @@ -141,14 +139,14 @@ enhance process-classes - + Running OpenBooks Enhance - + run @@ -158,7 +156,7 @@ generate-source prepare-package - + Running OpenBooks Generate Source @@ -170,7 +168,7 @@ - + run @@ -186,7 +184,7 @@ bin package - attached + single @@ -213,14 +211,14 @@ run test - + Launching OpenBooks - + run diff --git a/openjpa-examples/pom.xml b/openjpa-examples/pom.xml index 6aea2321b..dcee16e42 100644 --- a/openjpa-examples/pom.xml +++ b/openjpa-examples/pom.xml @@ -31,7 +31,6 @@ 3.0.1-SNAPSHOT - org.apache.openjpa openjpa-examples pom diff --git a/openjpa-integration/daytrader/pom.xml b/openjpa-integration/daytrader/pom.xml index e33a3d272..7d888a608 100644 --- a/openjpa-integration/daytrader/pom.xml +++ b/openjpa-integration/daytrader/pom.xml @@ -37,6 +37,7 @@ ${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml + ${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml 2.2-SNAPSHOT 10 5 @@ -119,7 +120,7 @@ test-compile - + @@ -128,7 +129,7 @@ - + run diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountDataBean.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountDataBean.java index a5dfedf6f..465c22056 100644 --- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountDataBean.java +++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountDataBean.java @@ -50,8 +50,10 @@ import javax.persistence.Transient; @NamedQuery(name = "accountejb.findByLogoutcount", query = "SELECT a FROM accountejb a WHERE a.logoutCount = :logoutcount"), @NamedQuery(name = "accountejb.findByBalance", query = "SELECT a FROM accountejb a WHERE a.balance = :balance"), @NamedQuery(name = "accountejb.findByAccountid", query = "SELECT a FROM accountejb a WHERE a.accountID = :accountid"), - @NamedQuery(name = "accountejb.findByAccountid_eager", query = "SELECT a FROM accountejb a LEFT JOIN FETCH a.profile WHERE a.accountID = :accountid"), - @NamedQuery(name = "accountejb.findByAccountid_eagerholdings", query = "SELECT a FROM accountejb a LEFT JOIN FETCH a.holdings WHERE a.accountID = :accountid"), + @NamedQuery(name = "accountejb.findByAccountid_eager", query = "SELECT a FROM accountejb a LEFT JOIN FETCH a.profile" + + " WHERE a.accountID = :accountid"), + @NamedQuery(name = "accountejb.findByAccountid_eagerholdings", query = "SELECT a FROM accountejb a LEFT JOIN FETCH a.holdings" + + " WHERE a.accountID = :accountid"), @NamedQuery(name = "accountejb.findByLastlogin", query = "SELECT a FROM accountejb a WHERE a.lastLogin = :lastlogin"), @NamedQuery(name = "accountejb.findByLogincount", query = "SELECT a FROM accountejb a WHERE a.loginCount = :logincount") }) diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/OrderDataBean.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/OrderDataBean.java index 27c8d621c..cb3b8b9d6 100644 --- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/OrderDataBean.java +++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/OrderDataBean.java @@ -55,8 +55,10 @@ import javax.persistence.Transient; @NamedQuery(name = "orderejb.findByQuoteSymbol", query = "SELECT o FROM orderejb o WHERE o.quote.symbol = :quoteSymbol"), // Never used query related to FK constraint on holdingejb. the FK constraint will cause EJB3 runtime mode failure. So comment it. //@NamedQuery(name = "orderejb.findByHoldingHoldingid", query = "SELECT o FROM orderejb o WHERE o.holding.holdingID = :holdingHoldingid"), - @NamedQuery(name = "orderejb.closedOrders", query = "SELECT o FROM orderejb o WHERE o.orderStatus = 'closed' AND o.account.profile.userID = :userID"), - @NamedQuery(name = "orderejb.completeClosedOrders", query = "UPDATE orderejb o SET o.orderStatus = 'completed' WHERE o.orderStatus = 'closed' AND o.account.profile.userID = :userID") + @NamedQuery(name = "orderejb.closedOrders", query = "SELECT o FROM orderejb o WHERE o.orderStatus = 'closed'" + + " AND o.account.profile.userID = :userID"), + @NamedQuery(name = "orderejb.completeClosedOrders", query = "UPDATE orderejb o SET o.orderStatus = 'completed' WHERE o.orderStatus = 'closed'" + + " AND o.account.profile.userID = :userID") }) public class OrderDataBean implements Serializable { diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/QuoteDataBean.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/QuoteDataBean.java index b29eea1b5..d2567d24b 100644 --- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/QuoteDataBean.java +++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/QuoteDataBean.java @@ -47,8 +47,8 @@ import javax.persistence.Table; @NamedQuery(name = "quoteejb.findByChange1", query = "SELECT q FROM quoteejb q WHERE q.change1 = :change1") }) @NamedNativeQueries({ - // @NamedNativeQuery(name="quoteejb.quoteForUpdate", query="select * from quoteejb q where q.symbol=? for update",resultClass=org.apache.geronimo.samples.daytrader.beans.QuoteDataBean.class) - @NamedNativeQuery(name="quoteejb.quoteForUpdate", query="select * from quoteejb q where q.symbol=? for update",resultClass=org.apache.openjpa.integration.daytrader.QuoteDataBean.class) + @NamedNativeQuery(name="quoteejb.quoteForUpdate", query="select * from quoteejb q where q.symbol=? for update" + , resultClass=org.apache.openjpa.integration.daytrader.QuoteDataBean.class) }) public class QuoteDataBean implements Serializable { diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeAction.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeAction.java index b20aa00b2..a9f842498 100644 --- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeAction.java +++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeAction.java @@ -456,4 +456,5 @@ public class TradeAction extends TradeJPADirect { sb.append(System.getProperty("line.separator")); } } -} \ No newline at end of file +} + diff --git a/openjpa-integration/examples/pom.xml b/openjpa-integration/examples/pom.xml index 2c983d3fb..965262a85 100644 --- a/openjpa-integration/examples/pom.xml +++ b/openjpa-integration/examples/pom.xml @@ -40,7 +40,6 @@ 3.0.1-SNAPSHOT - org.apache.openjpa openjpa-integration-examples pom OpenJPA Integration Tests - Examples @@ -62,31 +61,30 @@ run-examples integration-test - - Running OpenJPA Examples + + Running OpenJPA Examples - - - + + + - + - - - - - - - - Could not extract assembly. - + + + + + + + + Could not extract assembly. + - - - - - - + + + + + run diff --git a/openjpa-integration/jmx/pom.xml b/openjpa-integration/jmx/pom.xml index 430f57995..76ad5c4dd 100644 --- a/openjpa-integration/jmx/pom.xml +++ b/openjpa-integration/jmx/pom.xml @@ -38,6 +38,7 @@ ${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml + ${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml com.sun.management.jmxremote @@ -62,12 +63,10 @@ org.apache.bval org.apache.bval.bundle - 0.3-incubating org.slf4j slf4j-simple - ${slf4jVersion} diff --git a/openjpa-integration/pom.xml b/openjpa-integration/pom.xml index cbbc719e2..cd57637c7 100644 --- a/openjpa-integration/pom.xml +++ b/openjpa-integration/pom.xml @@ -31,7 +31,6 @@ 3.0.1-SNAPSHOT - org.apache.openjpa openjpa-integration pom OpenJPA Integration Tests diff --git a/openjpa-integration/slf4j/pom.xml b/openjpa-integration/slf4j/pom.xml index 3b7dbe028..be6407f3c 100644 --- a/openjpa-integration/slf4j/pom.xml +++ b/openjpa-integration/slf4j/pom.xml @@ -37,6 +37,7 @@ ${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml + ${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml slf4j @@ -45,12 +46,10 @@ org.slf4j slf4j-api - ${slf4jVersion} org.slf4j slf4j-simple - ${slf4jVersion} org.apache.openjpa @@ -123,12 +122,10 @@ org.slf4j slf4j-api - ${slf4jVersion} org.slf4j slf4j-simple - ${slf4jVersion} diff --git a/openjpa-integration/tck/pom.xml b/openjpa-integration/tck/pom.xml index 5bce7d812..9e2549971 100644 --- a/openjpa-integration/tck/pom.xml +++ b/openjpa-integration/tck/pom.xml @@ -78,7 +78,6 @@ 3.0.1-SNAPSHOT - org.apache.openjpa openjpa-integration-tck pom OpenJPA Integration Tests - JPA TCK @@ -109,7 +108,7 @@ - [1.6,) + [1.8,) @@ -124,7 +123,7 @@ tckinit pre-integration-test - + Running Sun JPA 2.0 TCK Init @@ -132,7 +131,7 @@ - + run @@ -142,7 +141,7 @@ run-tck integration-test - + Running Sun JPA 2.0 TCK @@ -192,7 +191,7 @@ - + run @@ -214,7 +213,7 @@ org.slf4j slf4j-simple - ${slf4jVersion} + ${slf4j.version} @@ -240,7 +239,7 @@ run-tck integration-test - + Running Sun JPA 1.0b TCK @@ -431,7 +430,7 @@ databaseName=${db.name} JPA TCK Passed 100%! - + run @@ -548,7 +547,6 @@ databaseName=${db.name} org.apache.derby derby - ${derby.version} compile diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml index 36b6d3026..d1e76fd2c 100644 --- a/openjpa-integration/validation/pom.xml +++ b/openjpa-integration/validation/pom.xml @@ -30,7 +30,6 @@ 3.0.1-SNAPSHOT - org.apache.openjpa openjpa-integration-validation jar OpenJPA Integration Tests - Bean Validation @@ -38,6 +37,7 @@ ${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml + ${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml @@ -110,13 +110,13 @@ org.slf4j slf4j-api - 1.5.6 + ${slf4j.version} test org.slf4j slf4j-log4j12 - 1.5.6 + ${slf4j.version} test @@ -165,12 +165,10 @@ org.apache.bval org.apache.bval.bundle - 0.3-incubating org.slf4j slf4j-simple - ${slf4jVersion} @@ -210,7 +208,7 @@ process-test-classes - + @@ -219,7 +217,7 @@ - + run diff --git a/openjpa-jdbc/pom.xml b/openjpa-jdbc/pom.xml index a407ae488..7c3e4a70c 100644 --- a/openjpa-jdbc/pom.xml +++ b/openjpa-jdbc/pom.xml @@ -30,7 +30,6 @@ 3.0.1-SNAPSHOT - org.apache.openjpa openjpa-jdbc jar OpenJPA JDBC @@ -60,7 +59,7 @@ provided - postgresql + org.postgresql postgresql provided diff --git a/openjpa-jest/pom.xml b/openjpa-jest/pom.xml index 4583deda7..69ba3c433 100644 --- a/openjpa-jest/pom.xml +++ b/openjpa-jest/pom.xml @@ -31,7 +31,6 @@ 3.0.1-SNAPSHOT - org.apache.openjpa openjpa-jest jar OpenJPA JEST @@ -63,16 +62,16 @@ ${project.version} - httpunit - httpunit - 1.7 - test + org.httpunit + httpunit + 1.7.3 + test - org.apache.commons - commons-jci-rhino - 1.0 - test + org.apache.commons + commons-jci-rhino + 1.1 + test @@ -85,7 +84,7 @@ process-test-classes - + @@ -93,7 +92,7 @@ - + run diff --git a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar b/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar deleted file mode 100644 index 8b9def9fd5ea58433272f3a5470ef36a84486893..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4793 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 DMpq^% diff --git a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar.md5 b/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar.md5 deleted file mode 100644 index 1ff224476..000000000 --- a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -1c04cfd6dff604d4270156224d741c0e \ No newline at end of file diff --git a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar.sha1 b/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar.sha1 deleted file mode 100644 index dc1ea7a17..000000000 --- a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ee2f4edf04371ba20e7ba9ebb1a55846fba4a5ab \ No newline at end of file diff --git a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom b/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom deleted file mode 100644 index cbacdc826..000000000 --- a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom +++ /dev/null @@ -1,45 +0,0 @@ - - - 4.0.0 - com.ibm.websphere - websphere_uow_api - 0.0.1 - WebSphere UOW API - jar - - - - - You may use or redistribute the files or modules contained in this - jar subject to the following terms: - -The WebSphere Application Server files or modules contained in this jar -may be redistrubuted as provided by IBM to you, and only as part of Your -application distribution. - -You may not use IBM's name or trademarks in connection with the marketing -of Your applications without IBM's prior written consent. - -IBM PROVIDES THESE FILES OR MODULES ON AN "AS IS" BASIS AND IBM DISCLAIMS -ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -WARRANTY OF NON-INFRINGEMENT AND THE IMPLIED WARRANTIES OF MERCHANTABILITY -OR FITNESS FOR A PARTICULAR PURPOSE. IBM SHALL NOT BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT -OF THE USE OR OPERATION OF THE FILES OR MODULES . IBM HAS NO OBLIGATION -TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR MODIFICATIONS TO -THE FILES OR MODULES . - - - - diff --git a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom.md5 b/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom.md5 deleted file mode 100644 index b49e1b0fb..000000000 --- a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -095278fb41358599450220f918c1f0d3 diff --git a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom.sha1 b/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom.sha1 deleted file mode 100644 index b9a70cb74..000000000 --- a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -58422cdc01d008740e58c0687684e1d979b9dd95 diff --git a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/maven-metadata.xml b/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/maven-metadata.xml deleted file mode 100644 index a474011bd..000000000 --- a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/maven-metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - com.ibm.websphere - websphere_uow_api - 0.0.1 - - - 0.0.1 - - 20080429183654 - - \ No newline at end of file diff --git a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/maven-metadata.xml.md5 b/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/maven-metadata.xml.md5 deleted file mode 100644 index 73b10622e..000000000 --- a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -9f808e8e78bdb70e3a57e9e5cd22c39a \ No newline at end of file diff --git a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/maven-metadata.xml.sha1 b/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/maven-metadata.xml.sha1 deleted file mode 100644 index b7520c252..000000000 --- a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -a89fd2b9dd1d41deafc9936146b268451a394939 \ No newline at end of file diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml index 6e6c917d1..49a49164b 100644 --- a/openjpa-kernel/pom.xml +++ b/openjpa-kernel/pom.xml @@ -30,7 +30,6 @@ 3.0.1-SNAPSHOT - org.apache.openjpa openjpa-kernel jar OpenJPA Kernel @@ -56,8 +55,8 @@ com.ibm.websphere - websphere_uow_api - 0.0.1 + uow_api + 6 provided @@ -76,7 +75,7 @@ org.apache.xbean xbean-asm6-shaded - 4.8 + 4.10 @@ -92,7 +91,7 @@ generate-sources false - 1.6 + ${java.class.version} jjtree-javacc @@ -108,9 +107,9 @@ add-was-interfaces process-classes - + - + run @@ -120,11 +119,11 @@ generate-standard-sco-proxies process-classes - + - + run @@ -165,14 +164,10 @@ - - openjpa-internal - Internal repository - file://${basedir}/internal-repository + seasar-repo + seasar repository + https://www.seasar.org/maven/maven2 diff --git a/openjpa-lib/pom.xml b/openjpa-lib/pom.xml index 6ddb909f9..370cc3e9e 100644 --- a/openjpa-lib/pom.xml +++ b/openjpa-lib/pom.xml @@ -30,7 +30,6 @@ 3.0.1-SNAPSHOT - org.apache.openjpa openjpa-lib jar OpenJPA Utilities Library @@ -50,8 +49,8 @@ provided - log4j - log4j + org.apache.logging.log4j + log4j-core provided @@ -96,7 +95,7 @@ set subversion revision compile - + @@ -131,7 +130,7 @@ openjpa.version=${project.version} openjpa.enhancer.revision=${pcenhancer.LastChangedRev} - + run diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/Log4JLogFactory.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/Log4JLogFactory.java index e08732851..dd2651c72 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/Log4JLogFactory.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/Log4JLogFactory.java @@ -18,9 +18,8 @@ */ package org.apache.openjpa.lib.log; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * {@link LogFactory} implementation that delegates to the Log4J framework. @@ -31,7 +30,7 @@ public class Log4JLogFactory extends LogFactoryAdapter { @Override protected Log newLogAdapter(String channel) { - return new LogAdapter((Logger) LogManager.getLogger(channel)); + return new LogAdapter(LogManager.getLogger(channel)); } /** @@ -52,27 +51,27 @@ public class Log4JLogFactory extends LogFactoryAdapter { @Override public boolean isTraceEnabled() { - return _log.isEnabledFor(Level.DEBUG); + return _log.isTraceEnabled(); } @Override public boolean isInfoEnabled() { - return _log.isEnabledFor(Level.INFO); + return _log.isInfoEnabled(); } @Override public boolean isWarnEnabled() { - return _log.isEnabledFor(Level.WARN); + return _log.isWarnEnabled(); } @Override public boolean isErrorEnabled() { - return _log.isEnabledFor(Level.ERROR); + return _log.isErrorEnabled(); } @Override public boolean isFatalEnabled() { - return _log.isEnabledFor(Level.FATAL); + return _log.isFatalEnabled(); } @Override diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml index 0956b8cc1..4f075a58f 100644 --- a/openjpa-persistence-jdbc/pom.xml +++ b/openjpa-persistence-jdbc/pom.xml @@ -30,7 +30,6 @@ 3.0.1-SNAPSHOT - org.apache.openjpa openjpa-persistence-jdbc jar OpenJPA Persistence JDBC @@ -875,7 +874,7 @@ simple-jndi simple-jndi - 0.11.4 + 0.11.4.1 test @@ -889,7 +888,7 @@ process-test-classes - + @@ -898,7 +897,7 @@ - + run diff --git a/openjpa-persistence-jdbc/src/main/resources/org/apache/openjpa/persistence/jdbc/localizer.properties b/openjpa-persistence-jdbc/src/main/resources/org/apache/openjpa/persistence/jdbc/localizer.properties index 73957c2e6..f31c6de4b 100644 --- a/openjpa-persistence-jdbc/src/main/resources/org/apache/openjpa/persistence/jdbc/localizer.properties +++ b/openjpa-persistence-jdbc/src/main/resources/org/apache/openjpa/persistence/jdbc/localizer.properties @@ -62,4 +62,5 @@ implicit-non-default-fk: While parsing "{0}" from "{1}", found a @ForeignKey \ non-default value for an implicit ForeignKey. table-not-allowed: You have specified Table annotation or XML descriptor element \ for MappedSuperclass "{0}". A class designated as a mapped superclass can not \ - have a separate table defined for it. \ No newline at end of file + have a separate table defined for it. + diff --git a/openjpa-persistence-locking/pom.xml b/openjpa-persistence-locking/pom.xml index 2600802cc..0d784902c 100644 --- a/openjpa-persistence-locking/pom.xml +++ b/openjpa-persistence-locking/pom.xml @@ -30,7 +30,6 @@ 3.0.1-SNAPSHOT - org.apache.openjpa openjpa-persistence-locking jar OpenJPA Persistence Locking Tests @@ -836,7 +835,7 @@ process-test-classes - + @@ -845,7 +844,7 @@ - + run diff --git a/openjpa-persistence/pom.xml b/openjpa-persistence/pom.xml index 8c06d4ff7..af6da3aba 100644 --- a/openjpa-persistence/pom.xml +++ b/openjpa-persistence/pom.xml @@ -30,7 +30,6 @@ 3.0.1-SNAPSHOT - org.apache.openjpa openjpa-persistence jar OpenJPA Persistence diff --git a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/criteria/localizer.properties b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/criteria/localizer.properties index 7cfeb38df..5a961a294 100644 --- a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/criteria/localizer.properties +++ b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/criteria/localizer.properties @@ -24,4 +24,5 @@ select-undefined: No terms is selected for criteria query. \ projection terms for the query. select-no-ctor: You have specified selection term to construct an instance of \ "{0}" with argument types "{1}". But "{0}" has no constructor with such \ - argument types. \ No newline at end of file + argument types. + diff --git a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties index f9da719cf..40610bd3f 100644 --- a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties +++ b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties @@ -256,4 +256,5 @@ EntityManagers this property should not be used because these EntityManagers may time. shared-cache-mode-take-precedence: The DataCache is set to {0} while the shared-cache-mode Element or \ javax.persistence.sharedCache.mode property is set to NONE. The shared-cache-mode takes precedence and caching is disabled. -id-class-not-serializable: The composite identity class "{0}" for entity "{1}" is not serializable. \ No newline at end of file +id-class-not-serializable: The composite identity class "{0}" for entity "{1}" is not serializable. + diff --git a/openjpa-project/assembly.xml b/openjpa-project/assembly.xml index 7e8edf0ae..75b17b695 100644 --- a/openjpa-project/assembly.xml +++ b/openjpa-project/assembly.xml @@ -143,7 +143,7 @@ org.apache.geronimo.specs:geronimo-jms_1.1_spec org.apache.geronimo.specs:geronimo-validation_1.0_spec org.apache.bval:org.apache.bval.bundle - org.apache.xbean:xbean-asm5-shaded + org.apache.xbean:xbean-asm6-shaded diff --git a/openjpa-project/bin-assembly.xml b/openjpa-project/bin-assembly.xml index c3a5090a6..c0e6c4af2 100644 --- a/openjpa-project/bin-assembly.xml +++ b/openjpa-project/bin-assembly.xml @@ -82,7 +82,7 @@ org.apache.geronimo.specs:geronimo-jms_1.1_spec org.apache.geronimo.specs:geronimo-validation_1.0_spec org.apache.bval:org.apache.bval.bundle - org.apache.xbean:xbean-asm5-shaded + org.apache.xbean:xbean-asm6-shaded diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml index b976cd082..c03a5a244 100644 --- a/openjpa-project/pom.xml +++ b/openjpa-project/pom.xml @@ -42,7 +42,6 @@ 3.0.1-SNAPSHOT - org.apache.openjpa apache-openjpa pom OpenJPA Project Docs and Assemblies @@ -135,13 +134,12 @@ org.apache.maven.plugins maven-assembly-plugin - 2.6 bin package - attached + single @@ -313,25 +311,11 @@ - org.docbook + net.sf.docbook docbook-xml - 4.4 + 5.0 runtime - @@ -366,7 +350,7 @@ package - + @@ -375,7 +359,7 @@ - + run diff --git a/openjpa-project/suppressions.xml b/openjpa-project/suppressions.xml index 4c237ec88..e7541efb4 100644 --- a/openjpa-project/suppressions.xml +++ b/openjpa-project/suppressions.xml @@ -10,4 +10,6 @@ + + diff --git a/openjpa-slice/pom.xml b/openjpa-slice/pom.xml index 3aed91085..4746a0ce2 100644 --- a/openjpa-slice/pom.xml +++ b/openjpa-slice/pom.xml @@ -30,7 +30,6 @@ 3.0.1-SNAPSHOT - org.apache.openjpa openjpa-slice jar OpenJPA Slice @@ -110,7 +109,7 @@ process-test-classes - + @@ -118,7 +117,7 @@ - + run diff --git a/openjpa-slice/src/main/resources/org/apache/openjpa/slice/localizer.properties b/openjpa-slice/src/main/resources/org/apache/openjpa/slice/localizer.properties index bfda3825f..cd4db57d9 100644 --- a/openjpa-slice/src/main/resources/org/apache/openjpa/slice/localizer.properties +++ b/openjpa-slice/src/main/resources/org/apache/openjpa/slice/localizer.properties @@ -27,4 +27,5 @@ multithreaded-false: Configuration property "{0}" is set to "false". \ operations per slice in parallel in different threads, setting "{0}" to \ "false" may cause unpredictable behavior. unknown-impl-data: Encountered unrecognized internal data "{0}" of "{1}" \ - associated with persistent instance "{2}". \ No newline at end of file + associated with persistent instance "{2}". + diff --git a/openjpa-slice/src/main/resources/org/apache/openjpa/slice/transaction/localizer.properties b/openjpa-slice/src/main/resources/org/apache/openjpa/slice/transaction/localizer.properties index c8d8c8a05..255ce9579 100644 --- a/openjpa-slice/src/main/resources/org/apache/openjpa/slice/transaction/localizer.properties +++ b/openjpa-slice/src/main/resources/org/apache/openjpa/slice/transaction/localizer.properties @@ -16,4 +16,5 @@ # under the License. no-txn-on-thread: No transaction is associated with current thread "{0}" prepare-failed: One or more XA-complaint resources have failed to prepare for \ - commit during the first phase of a two-phase commit protocol due to {0} \ No newline at end of file + commit during the first phase of a two-phase commit protocol due to {0} + diff --git a/openjpa-tools/openjpa-fetch-statistics-was/pom.xml b/openjpa-tools/openjpa-fetch-statistics-was/pom.xml index 46210d0f2..cad880c42 100644 --- a/openjpa-tools/openjpa-fetch-statistics-was/pom.xml +++ b/openjpa-tools/openjpa-fetch-statistics-was/pom.xml @@ -27,6 +27,10 @@ OpenJPA tool to capture the fetching statistic data for the persistent fields . 2012 + + ${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml + + org.apache.openjpa @@ -80,7 +84,6 @@ org.apache.maven.plugins maven-shade-plugin - 1.7.1 package diff --git a/openjpa-tools/openjpa-fetch-statistics/pom.xml b/openjpa-tools/openjpa-fetch-statistics/pom.xml index b33faa3d2..66a6d641f 100644 --- a/openjpa-tools/openjpa-fetch-statistics/pom.xml +++ b/openjpa-tools/openjpa-fetch-statistics/pom.xml @@ -27,6 +27,10 @@ OpenJPA tool to capture the fetching statistic data for the persistent fields . 2012 + + ${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml + + org.apache.geronimo.specs diff --git a/openjpa-tools/openjpa-maven-plugin/pom.xml b/openjpa-tools/openjpa-maven-plugin/pom.xml index 3d986e819..80ab6f79b 100644 --- a/openjpa-tools/openjpa-maven-plugin/pom.xml +++ b/openjpa-tools/openjpa-maven-plugin/pom.xml @@ -40,9 +40,13 @@ Apache maven (see http://maven.apache.org). 2011 - + + ${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml + ${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml + 3.3.9 + - 2.0.6 + ${min.maven.version} @@ -71,23 +75,23 @@ org.apache.maven maven-plugin-api - 2.0.6 + ${min.maven.version} org.apache.maven - maven-project - 2.0.6 + maven-compat + ${min.maven.version} org.apache.maven.plugin-tools maven-plugin-annotations - 3.4 + 3.5.2 provided org.codehaus.plexus plexus-utils - 1.5.7 + 3.1.0 @@ -126,8 +130,8 @@ org.apache.bval.bundle - log4j - log4j + org.apache.logging.log4j + log4j-core runtime @@ -135,7 +139,7 @@ org.apache.maven.plugin-testing maven-plugin-testing-harness - 1.2 + 3.3.0 test @@ -153,7 +157,6 @@ org.apache.maven.plugins maven-plugin-plugin - 3.4 true @@ -183,11 +186,10 @@ */pom.xml - - install - verify + + integration-test diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml index c9847e85a..c41368a9a 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml +++ b/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml @@ -103,8 +103,8 @@ maven-compiler-plugin - 1.5 - 1.5 + 1.8 + 1.8 diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjA/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjA/pom.xml index 47df633f3..5d5110e4e 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjA/pom.xml +++ b/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjA/pom.xml @@ -40,8 +40,8 @@ maven-compiler-plugin - 1.5 - 1.5 + 1.8 + 1.8 diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/pom.xml index 932ae1f6b..4a9e2b807 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/pom.xml +++ b/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/pom.xml @@ -84,8 +84,8 @@ maven-compiler-plugin - 1.5 - 1.5 + 1.8 + 1.8 diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/pom.xml index d5f6d0809..6b170e3c2 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/pom.xml +++ b/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/pom.xml @@ -73,8 +73,8 @@ maven-compiler-plugin - 1.5 - 1.5 + 1.8 + 1.8 diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/modifyDatabase/pom.xml.disabled b/openjpa-tools/openjpa-maven-plugin/src/it/modifyDatabase/pom.xml.disabled index 1638586b0..26fe12999 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/modifyDatabase/pom.xml.disabled +++ b/openjpa-tools/openjpa-maven-plugin/src/it/modifyDatabase/pom.xml.disabled @@ -52,8 +52,8 @@ maven-compiler-plugin - 1.5 - 1.5 + 1.8 + 1.8 diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml index a4fc45b75..e4633be49 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml +++ b/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml @@ -87,8 +87,8 @@ maven-compiler-plugin - 1.5 - 1.5 + 1.8 + 1.8 diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/settings.xml b/openjpa-tools/openjpa-maven-plugin/src/it/settings.xml index 47f559e37..0c0005583 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/settings.xml +++ b/openjpa-tools/openjpa-maven-plugin/src/it/settings.xml @@ -22,7 +22,18 @@ local.central - file:///@localRepository@ + file:@localRepository@ + + true + + + true + + + + + apache.snapshots + file:@localRepository@ true @@ -34,7 +45,7 @@ local.central - file:///@localRepository@ + file:@localRepository@ true diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/pom.xml index cce1721ae..8126eb827 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/pom.xml +++ b/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/pom.xml @@ -115,8 +115,8 @@ maven-compiler-plugin - 1.5 - 1.5 + 1.8 + 1.8 diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjA/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjA/pom.xml index 195accae0..871d3aff0 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjA/pom.xml +++ b/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjA/pom.xml @@ -31,8 +31,8 @@ maven-compiler-plugin - 1.5 - 1.5 + 1.8 + 1.8 diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml index 8989e9a54..fb4fb50a4 100644 --- a/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml +++ b/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml @@ -74,8 +74,8 @@ maven-compiler-plugin - 1.5 - 1.5 + 1.8 + 1.8 diff --git a/openjpa-tools/pom.xml b/openjpa-tools/pom.xml index 925518a30..0f29e256b 100644 --- a/openjpa-tools/pom.xml +++ b/openjpa-tools/pom.xml @@ -31,7 +31,6 @@ - org.apache.openjpa openjpa-tools pom diff --git a/openjpa-xmlstore/pom.xml b/openjpa-xmlstore/pom.xml index efdc60752..28b946555 100644 --- a/openjpa-xmlstore/pom.xml +++ b/openjpa-xmlstore/pom.xml @@ -30,7 +30,6 @@ 3.0.1-SNAPSHOT - org.apache.openjpa openjpa-xmlstore jar OpenJPA XML Store diff --git a/pom.xml b/pom.xml index 27166afca..a11a0c3f7 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.apache apache - 18 + 21 org.apache.openjpa @@ -73,23 +73,24 @@ none false - 10.12.1.1 + 10.14.2.0 2.4.1 - 5.1.12 - 9.1-901-1.jdbc4 + 8.0.12 + 42.2.5 - 1.7.21 + 1.7.23 ${java.class.version} ${java.class.version} ${java.testclass.version} ${java.testclass.version} - 2.10.3 + 3.0.1 - 2.19.1 + 2.22.0 1.1.2 + 2.9.0 @@ -229,8 +230,6 @@ **/rat.txt release.properties DEPENDENCIES - - **/internal-repository/** @@ -404,7 +403,6 @@ org.apache.derby derby - ${derby.version} test @@ -475,7 +473,6 @@ org.apache.derby derbyclient - ${derby.version} test @@ -553,6 +550,16 @@ derby ${derby.version} + + org.apache.derby + derbyclient + ${derby.version} + + + mysql + mysql-connector-java + ${mysql.version} + org.apache.commons commons-dbcp2 @@ -574,7 +581,7 @@ ${hsqldb.version} - postgresql + org.postgresql postgresql ${postgresql.version} provided @@ -585,14 +592,19 @@ 1.4 - log4j - log4j - 1.2.17 + org.apache.logging.log4j + log4j-core + 2.11.1 org.slf4j slf4j-api - ${slf4jVersion} + ${slf4j.version} + + + org.slf4j + slf4j-simple + ${slf4j.version} org.apache.ant @@ -602,12 +614,12 @@ org.jmock jmock - 2.8.2 + ${jmock.version} org.jmock jmock-junit4 - 2.8.2 + ${jmock.version} junit @@ -615,9 +627,9 @@ 4.12 - net.sourceforge.findbugs + com.google.code.findbugs annotations - 1.3.2 + 3.0.1 @@ -652,11 +664,10 @@ - org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.8.0 ${compile.class.source} ${compile.class.target} @@ -666,7 +677,7 @@ org.apache.maven.plugins maven-assembly-plugin - 2.6 + 3.1.0 org.apache.maven.plugins @@ -753,7 +764,7 @@ org.codehaus.mojo findbugs-maven-plugin - 2.5.5 + 3.0.5 org.codehaus.mojo @@ -777,12 +788,12 @@ org.apache.rat apache-rat-plugin - 0.11 + 0.12 org.apache.maven.plugins maven-dependency-plugin - 2.10 + 3.1.1 org.apache.maven.plugins @@ -808,12 +819,12 @@ org.apache.maven.plugins maven-antrun-plugin - 1.3 + 1.8 org.apache.ant ant-jsch - 1.7.1 + 1.10.5 ant-contrib @@ -837,24 +848,17 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.3 + 3.2.0 org.apache.maven.plugins maven-checkstyle-plugin - 2.9 - - - org.codehaus.plexus - plexus-velocity - 1.1.5 - - + 3.0.0 org.apache.maven.plugins maven-jar-plugin - 3.0.2 + 3.1.0 default-jar @@ -884,7 +888,7 @@ org.apache.felix maven-bundle-plugin - 2.2.0 + 4.0.0 true @@ -897,7 +901,7 @@ org.apache.karaf.tooling karaf-maven-plugin - 4.2.0 + 4.2.1 org.codehaus.mojo @@ -1103,7 +1107,6 @@ true true true - **/*_.java @@ -1120,10 +1123,10 @@ - [2.2.1,) + [3.3.9,) - [1.6,) + [1.8,) @@ -1173,7 +1176,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.9 + 3.0.0 org.apache.maven.plugins