You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by so...@apache.org on 2018/10/18 05:38:52 UTC
[openjpa] branch OPENJPA-2751-library-update created (now 9a50963)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch OPENJPA-2751-library-update
in repository https://gitbox.apache.org/repos/asf/openjpa.git.
at 9a50963 [OPENJPA-2752] libraries are updated to most recent versions
This branch includes the following new commits:
new 9a50963 [OPENJPA-2752] libraries are updated to most recent versions
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[openjpa] 01/01: [OPENJPA-2752] libraries are updated to most
recent versions
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch OPENJPA-2751-library-update
in repository https://gitbox.apache.org/repos/asf/openjpa.git
commit 9a5096308c29e278cd59253922110bdf3464951f
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Oct 18 12:38:31 2018 +0700
[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 +-
.../integration/daytrader/AccountDataBean.java | 6 +-
.../integration/daytrader/OrderDataBean.java | 6 +-
.../integration/daytrader/QuoteDataBean.java | 4 +-
.../openjpa/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/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 +-
.../apache/openjpa/lib/log/Log4JLogFactory.java | 17 ++--
openjpa-persistence-jdbc/pom.xml | 7 +-
.../openjpa/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 +-
.../org/apache/openjpa/slice/localizer.properties | 3 +-
.../openjpa/slice/transaction/localizer.properties | 3 +-
openjpa-tools/openjpa-fetch-statistics-was/pom.xml | 5 +-
openjpa-tools/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(-)
diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml
index 93cf796..28c221e 100644
--- a/openjpa-all/pom.xml
+++ b/openjpa-all/pom.xml
@@ -31,7 +31,6 @@
<version>3.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
<packaging>jar</packaging>
<name>OpenJPA Aggregate Jar with Dependencies</name>
diff --git a/openjpa-examples/image-gallery/pom.xml b/openjpa-examples/image-gallery/pom.xml
index c56c358..b8c5cd7 100644
--- a/openjpa-examples/image-gallery/pom.xml
+++ b/openjpa-examples/image-gallery/pom.xml
@@ -54,12 +54,10 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4jVersion}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>${slf4jVersion}</version>
</dependency>
</dependencies>
diff --git a/openjpa-examples/openbooks/build.properties b/openjpa-examples/openbooks/build.properties
index 67bb7e0..1bd8783 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 83f7ad1..8d4d000 100644
--- a/openjpa-examples/openbooks/build.xml
+++ b/openjpa-examples/openbooks/build.xml
@@ -211,7 +211,7 @@
<!-- accounted for by customizing Java2HTMLConverter accordingly -->
<!-- see the respective target's options to notice the difference -->
<target name="generate-source" depends="check-env" if="antlr.exists">
- <javac srcdir="${src.dir}" destdir="${classes.dir}">
+ <javac fork="true" srcdir="${src.dir}" destdir="${classes.dir}">
<include name="openbook/tools/**/*.java"/>
<exclude name="openbook/tools/**/Test*.java"/>
<classpath refid="code.generation.classpath"/>
diff --git a/openjpa-examples/openbooks/pom.xml b/openjpa-examples/openbooks/pom.xml
index 2a3be1b..71ad8ce 100644
--- a/openjpa-examples/openbooks/pom.xml
+++ b/openjpa-examples/openbooks/pom.xml
@@ -58,7 +58,6 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.8.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -70,7 +69,6 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.12</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -124,14 +122,14 @@
<id>genmodel</id>
<phase>process-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Running OpenBooks genmodel</echo>
<property name="openjpa.version" value="${project.version}" />
<property name="maven.repos" value="${settings.localRepository}" />
<ant antfile="${basedir}/build.xml">
<target name="generate-canonical-model" />
</ant>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -141,14 +139,14 @@
<id>enhance</id>
<phase>process-classes</phase>
<configuration>
- <tasks>
+ <target>
<echo>Running OpenBooks Enhance</echo>
<property name="openjpa.version" value="${project.version}" />
<property name="maven.repos" value="${settings.localRepository}" />
<ant antfile="${basedir}/build.xml">
<target name="enhance" />
</ant>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -158,7 +156,7 @@
<id>generate-source</id>
<phase>prepare-package</phase>
<configuration>
- <tasks>
+ <target>
<echo>Running OpenBooks Generate Source</echo>
<property name="openjpa.version" value="${project.version}" />
<property name="maven.repos" value="${settings.localRepository}" />
@@ -170,7 +168,7 @@
<fileset dir="${basedir}" includes="*.txt" />
<fileset dir="${basedir}" includes="run.*" />
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -186,7 +184,7 @@
<id>bin</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<configuration>
<descriptors>
@@ -213,14 +211,14 @@
<id>run</id>
<phase>test</phase>
<configuration>
- <tasks>
+ <target>
<echo>Launching OpenBooks</echo>
<property name="openjpa.version" value="${project.version}" />
<property name="maven.repos" value="${settings.localRepository}" />
<ant antfile="run.xml" dir="${basedir}/target">
<target name="run" />
</ant>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/openjpa-examples/pom.xml b/openjpa-examples/pom.xml
index 6aea232..dcee16e 100644
--- a/openjpa-examples/pom.xml
+++ b/openjpa-examples/pom.xml
@@ -31,7 +31,6 @@
<version>3.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-examples</artifactId>
<packaging>pom</packaging>
diff --git a/openjpa-integration/daytrader/pom.xml b/openjpa-integration/daytrader/pom.xml
index e33a3d2..7d888a6 100644
--- a/openjpa-integration/daytrader/pom.xml
+++ b/openjpa-integration/daytrader/pom.xml
@@ -37,6 +37,7 @@
<properties>
<checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
+ <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
<daytrader.version>2.2-SNAPSHOT</daytrader.version>
<dbcp.maxActive>10</dbcp.maxActive>
<dbcp.maxIdle>5</dbcp.maxIdle>
@@ -119,7 +120,7 @@
<execution>
<phase>test-compile</phase>
<configuration>
- <tasks>
+ <target>
<ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
<property name="maven.test.skip" value="${maven.test.skip}" />
<property name="test" value="${test}" />
@@ -128,7 +129,7 @@
<property name="openjpa.Log" value="${openjpa.Log}" />
<property name="build.enhance" value="${build.enhance}" />
</ant>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
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 a5dfedf..465c220 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 27c8d62..cb3b8b9 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 b29eea1..d2567d2 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 b20aa00..a9f8424 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 2c983d3..965262a 100644
--- a/openjpa-integration/examples/pom.xml
+++ b/openjpa-integration/examples/pom.xml
@@ -40,7 +40,6 @@
<version>3.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration-examples</artifactId>
<packaging>pom</packaging>
<name>OpenJPA Integration Tests - Examples</name>
@@ -62,31 +61,30 @@
<id>run-examples</id>
<phase>integration-test</phase>
<configuration>
- <tasks>
- <echo>Running OpenJPA Examples</echo>
+ <target>
+ <echo>Running OpenJPA Examples</echo>
- <property name="examples.base" value="${basedir}/target/examples" />
- <delete dir="${examples.base}" quiet="true" />
- <mkdir dir="${examples.base}" />
+ <property name="examples.base" value="${basedir}/target/examples" />
+ <delete dir="${examples.base}" quiet="true" />
+ <mkdir dir="${examples.base}" />
- <unzip overwrite="false" dest="${examples.base}" src="${settings.localRepository}/org/apache/openjpa/apache-openjpa/${project.version}/apache-openjpa-${project.version}-binary.zip" />
+ <unzip overwrite="false" dest="${examples.base}" src="${settings.localRepository}/org/apache/openjpa/apache-openjpa/${project.version}/apache-openjpa-${project.version}-binary.zip" />
- <path id="assembly.classpath">
- <fileset dir="${examples.base}">
- <include name="**/openjpa-all-${project.version}.jar" />
- </fileset>
- </path>
- <available classname="org.apache.openjpa.conf.OpenJPAVersion" classpathref="assembly.classpath" property="unzip.success" />
- <fail unless="unzip.success">
- Could not extract assembly.
- </fail>
+ <path id="assembly.classpath">
+ <fileset dir="${examples.base}">
+ <include name="**/openjpa-all-${project.version}.jar" />
+ </fileset>
+ </path>
+ <available classname="org.apache.openjpa.conf.OpenJPAVersion" classpathref="assembly.classpath" property="unzip.success" />
+ <fail unless="unzip.success">
+ Could not extract assembly.
+ </fail>
- <!-- FIXME: Only tests simple examples for now -->
- <subant inheritAll="false" failonerror="true">
- <fileset dir="${examples.base}" includes="*/examples/simple/*/build.xml" />
- </subant>
-
- </tasks>
+ <!-- FIXME: Only tests simple examples for now -->
+ <subant inheritAll="false" failonerror="true">
+ <fileset dir="${examples.base}" includes="*/examples/simple/*/build.xml" />
+ </subant>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/openjpa-integration/jmx/pom.xml b/openjpa-integration/jmx/pom.xml
index 430f579..76ad5c4 100644
--- a/openjpa-integration/jmx/pom.xml
+++ b/openjpa-integration/jmx/pom.xml
@@ -38,6 +38,7 @@
<properties>
<checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
+ <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
<!-- Enable the JMX platform MBean provider -->
<test.jvm.jmxprovider>com.sun.management.jmxremote</test.jvm.jmxprovider>
<!-- Disable JMX platform MBean authentication -->
@@ -62,12 +63,10 @@
<dependency>
<groupId>org.apache.bval</groupId>
<artifactId>org.apache.bval.bundle</artifactId>
- <version>0.3-incubating</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>${slf4jVersion}</version>
</dependency>
</dependencies>
diff --git a/openjpa-integration/pom.xml b/openjpa-integration/pom.xml
index cbbc719..cd57637 100644
--- a/openjpa-integration/pom.xml
+++ b/openjpa-integration/pom.xml
@@ -31,7 +31,6 @@
<version>3.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration</artifactId>
<packaging>pom</packaging>
<name>OpenJPA Integration Tests</name>
diff --git a/openjpa-integration/slf4j/pom.xml b/openjpa-integration/slf4j/pom.xml
index 3b7dbe0..be6407f 100644
--- a/openjpa-integration/slf4j/pom.xml
+++ b/openjpa-integration/slf4j/pom.xml
@@ -37,6 +37,7 @@
<properties>
<checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
+ <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
<!-- use SLF4JLogFactory for logging -->
<openjpa.Log>slf4j</openjpa.Log>
</properties>
@@ -45,12 +46,10 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4jVersion}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>${slf4jVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
@@ -123,12 +122,10 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4jVersion}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>${slf4jVersion}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/openjpa-integration/tck/pom.xml b/openjpa-integration/tck/pom.xml
index 5bce7d8..9e25499 100644
--- a/openjpa-integration/tck/pom.xml
+++ b/openjpa-integration/tck/pom.xml
@@ -78,7 +78,6 @@
<version>3.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration-tck</artifactId>
<packaging>pom</packaging>
<name>OpenJPA Integration Tests - JPA TCK</name>
@@ -109,7 +108,7 @@
<configuration>
<rules>
<requireJavaVersion>
- <version>[1.6,)</version>
+ <version>[1.8,)</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -124,7 +123,7 @@
<id>tckinit</id>
<phase>pre-integration-test</phase>
<configuration>
- <tasks>
+ <target>
<echo>Running Sun JPA 2.0 TCK Init</echo>
<property name="tck.base" value="${basedir}/target/tck" />
<property name="tck.dir" value="${tck.base}/jpatck" />
@@ -132,7 +131,7 @@
<ant antfile="${basedir}/tck2-${tck2.level}.xml">
<target name="init" />
</ant>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -142,7 +141,7 @@
<id>run-tck</id>
<phase>integration-test</phase>
<configuration>
- <tasks>
+ <target>
<echo>Running Sun JPA 2.0 TCK</echo>
<property name="tck.base" value="${basedir}/target/tck" />
@@ -192,7 +191,7 @@
<property name="connection.username" value="${connection.username}" />
<property name="connection.password" value="${connection.password}" />
</ant>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -214,7 +213,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>${slf4jVersion}</version>
+ <version>${slf4j.version}</version>
</dependency>
</dependencies>
@@ -240,7 +239,7 @@
<id>run-tck</id>
<phase>integration-test</phase>
<configuration>
- <tasks>
+ <target>
<echo>Running Sun JPA 1.0b TCK</echo>
<property name="tck.zip" value="${settings.localRepository}/../privaterepos/jpa-1_0b-tck.zip" />
@@ -431,7 +430,7 @@ databaseName=${db.name}
<!-- else -->
<echo>JPA TCK Passed 100%!</echo>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -548,7 +547,6 @@ databaseName=${db.name}
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>${derby.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml
index 36b6d30..d1e76fd 100644
--- a/openjpa-integration/validation/pom.xml
+++ b/openjpa-integration/validation/pom.xml
@@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration-validation</artifactId>
<packaging>jar</packaging>
<name>OpenJPA Integration Tests - Bean Validation</name>
@@ -38,6 +37,7 @@
<properties>
<checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
+ <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
</properties>
<profiles>
@@ -110,13 +110,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.6</version>
+ <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
+ <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -165,12 +165,10 @@
<dependency>
<groupId>org.apache.bval</groupId>
<artifactId>org.apache.bval.bundle</artifactId>
- <version>0.3-incubating</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>${slf4jVersion}</version>
</dependency>
</dependencies>
@@ -210,7 +208,7 @@
<execution>
<phase>process-test-classes</phase>
<configuration>
- <tasks>
+ <target>
<ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
<property name="maven.test.skip" value="${maven.test.skip}" />
<property name="test" value="${test}" />
@@ -219,7 +217,7 @@
<property name="openjpa.Log" value="${openjpa.Log}" />
<property name="build.enhance" value="${build.enhance}" />
</ant>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/openjpa-jdbc/pom.xml b/openjpa-jdbc/pom.xml
index a407ae4..7c3e4a7 100644
--- a/openjpa-jdbc/pom.xml
+++ b/openjpa-jdbc/pom.xml
@@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jdbc</artifactId>
<packaging>jar</packaging>
<name>OpenJPA JDBC</name>
@@ -60,7 +59,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>postgresql</groupId>
+ <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/openjpa-jest/pom.xml b/openjpa-jest/pom.xml
index 4583ded..69ba3c4 100644
--- a/openjpa-jest/pom.xml
+++ b/openjpa-jest/pom.xml
@@ -31,7 +31,6 @@
<version>3.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jest</artifactId>
<packaging>jar</packaging>
<name>OpenJPA JEST</name>
@@ -63,16 +62,16 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>httpunit</groupId>
- <artifactId>httpunit</artifactId>
- <version>1.7</version>
- <scope>test</scope>
+ <groupId>org.httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.7.3</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jci-rhino</artifactId>
- <version>1.0</version>
- <scope>test</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jci-rhino</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -85,7 +84,7 @@
<execution>
<phase>process-test-classes</phase>
<configuration>
- <tasks>
+ <target>
<ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
<property name="maven.test.skip" value="${maven.test.skip}" />
<property name="test" value="${test}" />
@@ -93,7 +92,7 @@
<property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
<property name="openjpa.Log" value="${openjpa.Log}" />
</ant>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
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 8b9def9..0000000
Binary files a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar and /dev/null differ
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 1ff2244..0000000
--- 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 dc1ea7a..0000000
--- 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 cbacdc8..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.ibm.websphere</groupId>
- <artifactId>websphere_uow_api</artifactId>
- <version>0.0.1</version>
- <name>WebSphere UOW API</name>
- <packaging>jar</packaging>
- <licenses>
- <license>
- <!--
- The contents of license.txt are included here in the
- comments tag. The full text file may be found in the
- websphere_uow_api jar file in the root directory.
-
- As I understand it the jar file may only be distributed
- with Apache OpenJPA (ie OpenJPA is the application mentioned
- below)
- -->
- <comments>
- 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 .
- </comments>
- </license>
- </licenses>
-</project>
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 b49e1b0..0000000
--- 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 b9a70cb..0000000
--- 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 a474011..0000000
--- a/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/maven-metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
- <groupId>com.ibm.websphere</groupId>
- <artifactId>websphere_uow_api</artifactId>
- <version>0.0.1</version>
- <versioning>
- <versions>
- <version>0.0.1</version>
- </versions>
- <lastUpdated>20080429183654</lastUpdated>
- </versioning>
-</metadata>
\ 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 73b1062..0000000
--- 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 b7520c2..0000000
--- 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 6e6c917..49a4916 100644
--- a/openjpa-kernel/pom.xml
+++ b/openjpa-kernel/pom.xml
@@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
<packaging>jar</packaging>
<name>OpenJPA Kernel</name>
@@ -56,8 +55,8 @@
</dependency>
<dependency>
<groupId>com.ibm.websphere</groupId>
- <artifactId>websphere_uow_api</artifactId>
- <version>0.0.1</version>
+ <artifactId>uow_api</artifactId>
+ <version>6</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -76,7 +75,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm6-shaded</artifactId>
- <version>4.8</version>
+ <version>4.10</version>
</dependency>
</dependencies>
@@ -92,7 +91,7 @@
<phase>generate-sources</phase>
<configuration>
<buildNodeFiles>false</buildNodeFiles>
- <jdkVersion>1.6</jdkVersion>
+ <jdkVersion>${java.class.version}</jdkVersion>
</configuration>
<goals>
<goal>jjtree-javacc</goal>
@@ -108,9 +107,9 @@
<id>add-was-interfaces</id>
<phase>process-classes</phase>
<configuration>
- <tasks>
+ <target>
<java classname="org.apache.openjpa.ee.WASManagedRuntime" classpathref="maven.runtime.classpath" />
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -120,11 +119,11 @@
<id>generate-standard-sco-proxies</id>
<phase>process-classes</phase>
<configuration>
- <tasks>
+ <target>
<java classname="org.apache.openjpa.util.ProxyManagerImpl" classpathref="maven.runtime.classpath">
<arg line="-utils 5" />
</java>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -165,14 +164,10 @@
</build>
<repositories>
- <!--
- Internal (in SVN) repository which contains jar files that are not
- publicly available and cannot be re-distributed.
- -->
<repository>
- <id>openjpa-internal</id>
- <name>Internal repository</name>
- <url>file://${basedir}/internal-repository</url>
+ <id>seasar-repo</id>
+ <name>seasar repository</name>
+ <url>https://www.seasar.org/maven/maven2</url>
</repository>
</repositories>
</project>
diff --git a/openjpa-lib/pom.xml b/openjpa-lib/pom.xml
index 6ddb909..370cc3e 100644
--- a/openjpa-lib/pom.xml
+++ b/openjpa-lib/pom.xml
@@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-lib</artifactId>
<packaging>jar</packaging>
<name>OpenJPA Utilities Library</name>
@@ -50,8 +49,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -96,7 +95,7 @@
<id>set subversion revision</id>
<phase>compile</phase>
<configuration>
- <tasks>
+ <target>
<property name="tmpdir" value="${java.io.tmpdir}/openjpamvntmp" />
<condition property="outdir" value="${project.build.outputDirectory}">
<available type="dir" file="${project.build.outputDirectory}" />
@@ -131,7 +130,7 @@ openjpa.version=${project.version}
openjpa.enhancer.revision=${pcenhancer.LastChangedRev}
</echo>
<delete dir="${tmpdir}" />
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
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 e087328..dd2651c 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 0956b8c..4f075a5 100644
--- a/openjpa-persistence-jdbc/pom.xml
+++ b/openjpa-persistence-jdbc/pom.xml
@@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<packaging>jar</packaging>
<name>OpenJPA Persistence JDBC</name>
@@ -875,7 +874,7 @@
<dependency>
<groupId>simple-jndi</groupId>
<artifactId>simple-jndi</artifactId>
- <version>0.11.4</version>
+ <version>0.11.4.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -889,7 +888,7 @@
<execution>
<phase>process-test-classes</phase>
<configuration>
- <tasks>
+ <target>
<ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
<property name="maven.test.skip" value="${maven.test.skip}" />
<property name="test" value="${test}" />
@@ -898,7 +897,7 @@
<property name="openjpa.Log" value="${openjpa.Log}" />
<property name="build.enhance" value="${build.enhance}" />
</ant>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
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 73957c2..f31c6de 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 2600802..0d78490 100644
--- a/openjpa-persistence-locking/pom.xml
+++ b/openjpa-persistence-locking/pom.xml
@@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-locking</artifactId>
<packaging>jar</packaging>
<name>OpenJPA Persistence Locking Tests</name>
@@ -836,7 +835,7 @@
<execution>
<phase>process-test-classes</phase>
<configuration>
- <tasks>
+ <target>
<ant antfile="src/test/ant/enhancer.xml" target="enhance" inheritRefs="true">
<property name="maven.test.skip" value="${maven.test.skip}" />
<property name="test" value="${test}" />
@@ -845,7 +844,7 @@
<property name="openjpa.Log" value="${openjpa.Log}" />
<property name="build.enhance" value="${build.enhance}" />
</ant>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/openjpa-persistence/pom.xml b/openjpa-persistence/pom.xml
index 8c06d4f..af6da3a 100644
--- a/openjpa-persistence/pom.xml
+++ b/openjpa-persistence/pom.xml
@@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence</artifactId>
<packaging>jar</packaging>
<name>OpenJPA Persistence</name>
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 7cfeb38..5a961a2 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 f9da719..40610bd 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 7e8edf0..75b17b6 100644
--- a/openjpa-project/assembly.xml
+++ b/openjpa-project/assembly.xml
@@ -143,7 +143,7 @@
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
<include>org.apache.bval:org.apache.bval.bundle</include>
- <include>org.apache.xbean:xbean-asm5-shaded</include>
+ <include>org.apache.xbean:xbean-asm6-shaded</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/openjpa-project/bin-assembly.xml b/openjpa-project/bin-assembly.xml
index c3a5090..c0e6c4a 100644
--- a/openjpa-project/bin-assembly.xml
+++ b/openjpa-project/bin-assembly.xml
@@ -82,7 +82,7 @@
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
<include>org.apache.bval:org.apache.bval.bundle</include>
- <include>org.apache.xbean:xbean-asm5-shaded</include>
+ <include>org.apache.xbean:xbean-asm6-shaded</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml
index b976cd0..c03a5a2 100644
--- a/openjpa-project/pom.xml
+++ b/openjpa-project/pom.xml
@@ -42,7 +42,6 @@
<version>3.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>apache-openjpa</artifactId>
<packaging>pom</packaging>
<name>OpenJPA Project Docs and Assemblies</name>
@@ -135,13 +134,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.6</version>
<executions>
<execution>
<id>bin</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<configuration>
<descriptors>
@@ -313,25 +311,11 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.docbook</groupId>
+ <groupId>net.sf.docbook</groupId>
<artifactId>docbook-xml</artifactId>
- <version>4.4</version>
+ <version>5.0</version>
<scope>runtime</scope>
</dependency>
-<!-- As far as I did test we do not need JAI for generating our docs.
- <dependency>
- <groupId>${jai.groupId}</groupId>
- <artifactId>jai_core</artifactId>
- <version>${jai.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>${jai.groupId}</groupId>
- <artifactId>jai_codec</artifactId>
- <version>${jai.version}</version>
- <scope>runtime</scope>
- </dependency>
--->
</dependencies>
</plugin>
</plugins>
@@ -366,7 +350,7 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<ant antfile="upload.xml" target="upload" inheritRefs="true">
<property name="nightly.user.name" value="${nightly.user.name}" />
<property name="nightly.password" value="${nightly.password}" />
@@ -375,7 +359,7 @@
<property name="nightly.version" value="${nightly.version}" />
<property name="project.version" value="${project.version}" />
</ant>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/openjpa-project/suppressions.xml b/openjpa-project/suppressions.xml
index 4c237ec..e7541ef 100644
--- a/openjpa-project/suppressions.xml
+++ b/openjpa-project/suppressions.xml
@@ -10,4 +10,6 @@
<suppress checks="RegexpSinglelineJava" files=".*src\\test.*java" />
<suppress checks="RegexpSinglelineJava" files=".*src.test.*java" />
<suppress checks="RegexpSinglelineJava" files="Main.java" />
+ <suppress checks=".*" files=".*generated-sources.*[.]java" />
+ <suppress checks=".*" files=".*_[.]java" />
</suppressions>
diff --git a/openjpa-slice/pom.xml b/openjpa-slice/pom.xml
index 3aed910..4746a0c 100644
--- a/openjpa-slice/pom.xml
+++ b/openjpa-slice/pom.xml
@@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-slice</artifactId>
<packaging>jar</packaging>
<name>OpenJPA Slice</name>
@@ -110,7 +109,7 @@
<execution>
<phase>process-test-classes</phase>
<configuration>
- <tasks>
+ <target>
<ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
<property name="maven.test.skip" value="${maven.test.skip}" />
<property name="test" value="${test}" />
@@ -118,7 +117,7 @@
<property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
<property name="openjpa.Log" value="${openjpa.Log}" />
</ant>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
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 bfda382..cd4db57 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 c8d8c8a..255ce95 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 46210d0..cad880c 100644
--- a/openjpa-tools/openjpa-fetch-statistics-was/pom.xml
+++ b/openjpa-tools/openjpa-fetch-statistics-was/pom.xml
@@ -27,6 +27,10 @@
<description> OpenJPA tool to capture the fetching statistic data for the persistent fields .</description>
<inceptionYear>2012</inceptionYear>
+ <properties>
+ <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
@@ -80,7 +84,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.7.1</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/openjpa-tools/openjpa-fetch-statistics/pom.xml b/openjpa-tools/openjpa-fetch-statistics/pom.xml
index b33faa3..66a6d64 100644
--- a/openjpa-tools/openjpa-fetch-statistics/pom.xml
+++ b/openjpa-tools/openjpa-fetch-statistics/pom.xml
@@ -27,6 +27,10 @@
<description> OpenJPA tool to capture the fetching statistic data for the persistent fields .</description>
<inceptionYear>2012</inceptionYear>
+ <properties>
+ <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/openjpa-tools/openjpa-maven-plugin/pom.xml b/openjpa-tools/openjpa-maven-plugin/pom.xml
index 3d986e8..80ab6f7 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).
</description>
<inceptionYear>2011</inceptionYear>
-
+ <properties>
+ <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
+ <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
+ <min.maven.version>3.3.9</min.maven.version>
+ </properties>
<prerequisites>
- <maven>2.0.6</maven>
+ <maven>${min.maven.version}</maven>
</prerequisites>
<developers>
@@ -71,23 +75,23 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0.6</version>
+ <version>${min.maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.6</version>
+ <artifactId>maven-compat</artifactId>
+ <version>${min.maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.4</version>
+ <version>3.5.2</version>
<scope>provided</scope> <!-- annotations are only needed to build the plugin -->
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.7</version>
+ <version>3.1.0</version>
</dependency>
<!-- dependencies for OpenJPA itself -->
@@ -126,8 +130,8 @@
<artifactId>org.apache.bval.bundle</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<scope>runtime</scope>
</dependency>
@@ -135,7 +139,7 @@
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.2</version>
+ <version>3.3.0</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -153,7 +157,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.4</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
@@ -183,11 +186,10 @@
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
- <goals>
- <goal>install</goal>
- </goals>
<postBuildHookScript>verify</postBuildHookScript>
</configuration>
+ <dependencies>
+ </dependencies>
<executions>
<execution>
<id>integration-test</id>
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 c9847e8..c41368a 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 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
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 47df633..5d5110e 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 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
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 932ae1f..4a9e2b8 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 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
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 d5f6d08..6b170e3 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 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
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 1638586..26fe129 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 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
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 a4fc45b..e4633be 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 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/settings.xml b/openjpa-tools/openjpa-maven-plugin/src/it/settings.xml
index 47f559e..0c00055 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 @@
<repositories>
<repository>
<id>local.central</id>
- <url>file:///@localRepository@</url>
+ <url>file:@localRepository@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <!-- This repo is added to prevent download of snapshots -->
+ <id>apache.snapshots</id>
+ <url>file:@localRepository@</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -34,7 +45,7 @@
<pluginRepositories>
<pluginRepository>
<id>local.central</id>
- <url>file:///@localRepository@</url>
+ <url>file:@localRepository@</url>
<releases>
<enabled>true</enabled>
</releases>
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 cce1721..8126eb8 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 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
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 195acca..871d3af 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 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
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 8989e9a..fb4fb50 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 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
diff --git a/openjpa-tools/pom.xml b/openjpa-tools/pom.xml
index 925518a..0f29e25 100644
--- a/openjpa-tools/pom.xml
+++ b/openjpa-tools/pom.xml
@@ -31,7 +31,6 @@
<!-- <relativePath>../pom.xml</relativePath>-->
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-tools</artifactId>
<packaging>pom</packaging>
diff --git a/openjpa-xmlstore/pom.xml b/openjpa-xmlstore/pom.xml
index efdc607..28b9465 100644
--- a/openjpa-xmlstore/pom.xml
+++ b/openjpa-xmlstore/pom.xml
@@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-xmlstore</artifactId>
<packaging>jar</packaging>
<name>OpenJPA XML Store</name>
diff --git a/pom.xml b/pom.xml
index 27166af..a11a0c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>18</version>
+ <version>21</version>
</parent>
<groupId>org.apache.openjpa</groupId>
@@ -73,23 +73,24 @@
<createSource>none</createSource>
<createSources>false</createSources>
<!-- common JDBC driver versions -->
- <derby.version>10.12.1.1</derby.version>
+ <derby.version>10.14.2.0</derby.version>
<hsqldb.version>2.4.1</hsqldb.version>
- <mysql.version>5.1.12</mysql.version>
- <postgresql.version>9.1-901-1.jdbc4</postgresql.version>
+ <mysql.version>8.0.12</mysql.version>
+ <postgresql.version>42.2.5</postgresql.version>
<!-- other common versions -->
- <slf4jVersion>1.7.21</slf4jVersion>
+ <slf4j.version>1.7.23</slf4j.version>
<!-- Compile Java source/target class level -->
<compile.class.source>${java.class.version}</compile.class.source>
<compile.class.target>${java.class.version}</compile.class.target>
<compile.testclass.source>${java.testclass.version}</compile.testclass.source>
<compile.testclass.target>${java.testclass.version}</compile.testclass.target>
- <maven.javadoc.version>2.10.3</maven.javadoc.version>
+ <maven.javadoc.version>3.0.1</maven.javadoc.version>
<javadoc.additionalparam />
- <maven.surefire.version>2.19.1</maven.surefire.version>
+ <maven.surefire.version>2.22.0</maven.surefire.version>
<bval.version>1.1.2</bval.version>
+ <jmock.version>2.9.0</jmock.version>
</properties>
<licenses>
@@ -229,8 +230,6 @@
<exclude>**/rat.txt</exclude>
<exclude>release.properties</exclude>
<exclude>DEPENDENCIES</exclude>
- <!-- Exclude internal build-only repository -->
- <exclude>**/internal-repository/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -404,7 +403,6 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>${derby.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -475,7 +473,6 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -554,6 +551,16 @@
<version>${derby.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyclient</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.5.0</version>
@@ -574,7 +581,7 @@
<version>${hsqldb.version}</version>
</dependency>
<dependency>
- <groupId>postgresql</groupId>
+ <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
<scope>provided</scope>
@@ -585,14 +592,19 @@
<version>1.4</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>2.11.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4jVersion}</version>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
@@ -602,12 +614,12 @@
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
- <version>2.8.2</version>
+ <version>${jmock.version}</version>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
- <version>2.8.2</version>
+ <version>${jmock.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -615,9 +627,9 @@
<version>4.12</version>
</dependency>
<dependency>
- <groupId>net.sourceforge.findbugs</groupId>
+ <groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
- <version>1.3.2</version>
+ <version>3.0.1</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -652,11 +664,10 @@
<pluginManagement>
<plugins>
- <!-- apache-7.pom default of 2.0.2 fails for JDK5 testing -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>3.8.0</version>
<configuration>
<source>${compile.class.source}</source>
<target>${compile.class.target}</target>
@@ -666,7 +677,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.6</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -753,7 +764,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.5</version>
+ <version>3.0.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -777,12 +788,12 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
+ <version>0.12</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
+ <version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -808,12 +819,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>1.8</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jsch</artifactId>
- <version>1.7.1</version>
+ <version>1.10.5</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
@@ -837,24 +848,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.3</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-velocity</artifactId>
- <version>1.1.5</version>
- </dependency>
- </dependencies>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version>
+ <version>3.1.0</version>
<executions>
<execution>
<id>default-jar</id>
@@ -884,7 +888,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.2.0</version>
+ <version>4.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -897,7 +901,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>4.2.0</version>
+ <version>4.2.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -1103,7 +1107,6 @@
<failsOnError>true</failsOnError>
<consoleOutput>true</consoleOutput>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- <excludes>**/*_.java</excludes>
</configuration>
</execution>
</executions>
@@ -1120,10 +1123,10 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>[2.2.1,)</version>
+ <version>[3.3.9,)</version>
</requireMavenVersion>
<requireJavaVersion>
- <version>[1.6,)</version>
+ <version>[1.8,)</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -1173,7 +1176,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.9</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>