Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OPENJPA-2752] libraries are updated to most recent versions

This commit is contained in:
Maxim Solodovnik 2018-10-18 12:38:31 +07:00
parent 1413c369be
commit 9a5096308c
60 changed files with 223 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openjpa-all/pom.xml
View File

@ -31,7 +31,6 @@
<version>3.0.1-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId> <artifactId>openjpa-all</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OpenJPA Aggregate Jar with Dependencies</name> <name>OpenJPA Aggregate Jar with Dependencies</name>

2
openjpa-examples/image-gallery/pom.xml
View File

@ -54,12 +54,10 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>${slf4jVersion}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<version>${slf4jVersion}</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
openjpa-examples/openbooks/build.properties
View File

@ -21,7 +21,7 @@
# Directory location of maven repository # Directory location of maven repository
maven.repos=${user.home}/.m2/repository maven.repos=${user.home}/.m2/repository
# OpenJPA runtime artifact # OpenJPA runtime artifact
openjpa.version=2.3.0-SNAPSHOT openjpa.version=3.0.1-SNAPSHOT
# This is the variable of interest. # This is the variable of interest.
# Notice that the variable points to a directory, not a *.jar file. # Notice that the variable points to a directory, not a *.jar file.

2
openjpa-examples/openbooks/build.xml
View File

@ -211,7 +211,7 @@
<!-- accounted for by customizing Java2HTMLConverter accordingly --> <!-- accounted for by customizing Java2HTMLConverter accordingly -->
<!-- see the respective target's options to notice the difference --> <!-- see the respective target's options to notice the difference -->
<target name="generate-source" depends="check-env" if="antlr.exists"> <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"/> <include name="openbook/tools/**/*.java"/>
<exclude name="openbook/tools/**/Test*.java"/> <exclude name="openbook/tools/**/Test*.java"/>
<classpath refid="code.generation.classpath"/> <classpath refid="code.generation.classpath"/>

20
openjpa-examples/openbooks/pom.xml
View File

@ -58,7 +58,6 @@
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId> <artifactId>ant</artifactId>
<version>1.8.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -70,7 +69,6 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.12</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -124,14 +122,14 @@
<id>genmodel</id> <id>genmodel</id>
<phase>process-resources</phase> <phase>process-resources</phase>
<configuration> <configuration>
<tasks> <target>
<echo>Running OpenBooks genmodel</echo> <echo>Running OpenBooks genmodel</echo>
<property name="openjpa.version" value="${project.version}" /> <property name="openjpa.version" value="${project.version}" />
<property name="maven.repos" value="${settings.localRepository}" /> <property name="maven.repos" value="${settings.localRepository}" />
<ant antfile="${basedir}/build.xml"> <ant antfile="${basedir}/build.xml">
<target name="generate-canonical-model" /> <target name="generate-canonical-model" />
</ant> </ant>
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
@ -141,14 +139,14 @@
<id>enhance</id> <id>enhance</id>
<phase>process-classes</phase> <phase>process-classes</phase>
<configuration> <configuration>
<tasks> <target>
<echo>Running OpenBooks Enhance</echo> <echo>Running OpenBooks Enhance</echo>
<property name="openjpa.version" value="${project.version}" /> <property name="openjpa.version" value="${project.version}" />
<property name="maven.repos" value="${settings.localRepository}" /> <property name="maven.repos" value="${settings.localRepository}" />
<ant antfile="${basedir}/build.xml"> <ant antfile="${basedir}/build.xml">
<target name="enhance" /> <target name="enhance" />
</ant> </ant>
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
@ -158,7 +156,7 @@
<id>generate-source</id> <id>generate-source</id>
<phase>prepare-package</phase> <phase>prepare-package</phase>
<configuration> <configuration>
<tasks> <target>
<echo>Running OpenBooks Generate Source</echo> <echo>Running OpenBooks Generate Source</echo>
<property name="openjpa.version" value="${project.version}" /> <property name="openjpa.version" value="${project.version}" />
<property name="maven.repos" value="${settings.localRepository}" /> <property name="maven.repos" value="${settings.localRepository}" />
@ -170,7 +168,7 @@
<fileset dir="${basedir}" includes="*.txt" /> <fileset dir="${basedir}" includes="*.txt" />
<fileset dir="${basedir}" includes="run.*" /> <fileset dir="${basedir}" includes="run.*" />
</copy> </copy>
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
@ -186,7 +184,7 @@
<id>bin</id> <id>bin</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>attached</goal> <goal>single</goal>
</goals> </goals>
<configuration> <configuration>
<descriptors> <descriptors>
@ -213,14 +211,14 @@
<id>run</id> <id>run</id>
<phase>test</phase> <phase>test</phase>
<configuration> <configuration>
<tasks> <target>
<echo>Launching OpenBooks</echo> <echo>Launching OpenBooks</echo>
<property name="openjpa.version" value="${project.version}" /> <property name="openjpa.version" value="${project.version}" />
<property name="maven.repos" value="${settings.localRepository}" /> <property name="maven.repos" value="${settings.localRepository}" />
<ant antfile="run.xml" dir="${basedir}/target"> <ant antfile="run.xml" dir="${basedir}/target">
<target name="run" /> <target name="run" />
</ant> </ant>
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>

1
openjpa-examples/pom.xml
View File

@ -31,7 +31,6 @@
<version>3.0.1-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-examples</artifactId> <artifactId>openjpa-examples</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>

5
openjpa-integration/daytrader/pom.xml
View File

@ -37,6 +37,7 @@
<properties> <properties>
<checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location> <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> <daytrader.version>2.2-SNAPSHOT</daytrader.version>
<dbcp.maxActive>10</dbcp.maxActive> <dbcp.maxActive>10</dbcp.maxActive>
<dbcp.maxIdle>5</dbcp.maxIdle> <dbcp.maxIdle>5</dbcp.maxIdle>
@ -119,7 +120,7 @@
<execution> <execution>
<phase>test-compile</phase> <phase>test-compile</phase>
<configuration> <configuration>
<tasks> <target>
<ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true"> <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
<property name="maven.test.skip" value="${maven.test.skip}" /> <property name="maven.test.skip" value="${maven.test.skip}" />
<property name="test" value="${test}" /> <property name="test" value="${test}" />
@ -128,7 +129,7 @@
<property name="openjpa.Log" value="${openjpa.Log}" /> <property name="openjpa.Log" value="${openjpa.Log}" />
<property name="build.enhance" value="${build.enhance}" /> <property name="build.enhance" value="${build.enhance}" />
</ant> </ant>
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>

6
openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountDataBean.java
View File

@ -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.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.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", 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_eager", query = "SELECT a FROM accountejb a LEFT JOIN FETCH a.profile"
@NamedQuery(name = "accountejb.findByAccountid_eagerholdings", query = "SELECT a FROM accountejb a LEFT JOIN FETCH a.holdings WHERE a.accountID = :accountid"), + " 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.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") @NamedQuery(name = "accountejb.findByLogincount", query = "SELECT a FROM accountejb a WHERE a.loginCount = :logincount")
}) })

6
openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/OrderDataBean.java
View File

@ -55,8 +55,10 @@ import javax.persistence.Transient;
@NamedQuery(name = "orderejb.findByQuoteSymbol", query = "SELECT o FROM orderejb o WHERE o.quote.symbol = :quoteSymbol"), @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. // 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.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.closedOrders", query = "SELECT o FROM orderejb o WHERE o.orderStatus = 'closed'"
@NamedQuery(name = "orderejb.completeClosedOrders", query = "UPDATE orderejb o SET o.orderStatus = 'completed' WHERE o.orderStatus = 'closed' AND o.account.profile.userID = :userID") + " 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 public class OrderDataBean implements Serializable
{ {

4
openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/QuoteDataBean.java
View File

@ -47,8 +47,8 @@ import javax.persistence.Table;
@NamedQuery(name = "quoteejb.findByChange1", query = "SELECT q FROM quoteejb q WHERE q.change1 = :change1") @NamedQuery(name = "quoteejb.findByChange1", query = "SELECT q FROM quoteejb q WHERE q.change1 = :change1")
}) })
@NamedNativeQueries({ @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"
@NamedNativeQuery(name="quoteejb.quoteForUpdate", query="select * from quoteejb q where q.symbol=? for update",resultClass=org.apache.openjpa.integration.daytrader.QuoteDataBean.class) , resultClass=org.apache.openjpa.integration.daytrader.QuoteDataBean.class)
}) })
public class QuoteDataBean implements Serializable { public class QuoteDataBean implements Serializable {

3
openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeAction.java
View File

@ -456,4 +456,5 @@ public class TradeAction extends TradeJPADirect {
sb.append(System.getProperty("line.separator")); sb.append(System.getProperty("line.separator"));
} }
} }
} }

42
openjpa-integration/examples/pom.xml
View File

@ -40,7 +40,6 @@
<version>3.0.1-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration-examples</artifactId> <artifactId>openjpa-integration-examples</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>OpenJPA Integration Tests - Examples</name> <name>OpenJPA Integration Tests - Examples</name>
@ -62,31 +61,30 @@
<id>run-examples</id> <id>run-examples</id>
<phase>integration-test</phase> <phase>integration-test</phase>
<configuration> <configuration>
<tasks> <target>
<echo>Running OpenJPA Examples</echo> <echo>Running OpenJPA Examples</echo>
<property name="examples.base" value="${basedir}/target/examples" /> <property name="examples.base" value="${basedir}/target/examples" />
<delete dir="${examples.base}" quiet="true" /> <delete dir="${examples.base}" quiet="true" />
<mkdir dir="${examples.base}" /> <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"> <path id="assembly.classpath">
<fileset dir="${examples.base}"> <fileset dir="${examples.base}">
<include name="**/openjpa-all-${project.version}.jar" /> <include name="**/openjpa-all-${project.version}.jar" />
</fileset> </fileset>
</path> </path>
<available classname="org.apache.openjpa.conf.OpenJPAVersion" classpathref="assembly.classpath" property="unzip.success" /> <available classname="org.apache.openjpa.conf.OpenJPAVersion" classpathref="assembly.classpath" property="unzip.success" />
<fail unless="unzip.success"> <fail unless="unzip.success">
Could not extract assembly. Could not extract assembly.
</fail> </fail>
<!-- FIXME: Only tests simple examples for now --> <!-- FIXME: Only tests simple examples for now -->
<subant inheritAll="false" failonerror="true"> <subant inheritAll="false" failonerror="true">
<fileset dir="${examples.base}" includes="*/examples/simple/*/build.xml" /> <fileset dir="${examples.base}" includes="*/examples/simple/*/build.xml" />
</subant> </subant>
</target>
</tasks>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>

3
openjpa-integration/jmx/pom.xml
View File

@ -38,6 +38,7 @@
<properties> <properties>
<checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location> <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 --> <!-- Enable the JMX platform MBean provider -->
<test.jvm.jmxprovider>com.sun.management.jmxremote</test.jvm.jmxprovider> <test.jvm.jmxprovider>com.sun.management.jmxremote</test.jvm.jmxprovider>
<!-- Disable JMX platform MBean authentication --> <!-- Disable JMX platform MBean authentication -->
@ -62,12 +63,10 @@
<dependency> <dependency>
<groupId>org.apache.bval</groupId> <groupId>org.apache.bval</groupId>
<artifactId>org.apache.bval.bundle</artifactId> <artifactId>org.apache.bval.bundle</artifactId>
<version>0.3-incubating</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<version>${slf4jVersion}</version>
</dependency> </dependency>
</dependencies> </dependencies>

1
openjpa-integration/pom.xml
View File

@ -31,7 +31,6 @@
<version>3.0.1-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration</artifactId> <artifactId>openjpa-integration</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>OpenJPA Integration Tests</name> <name>OpenJPA Integration Tests</name>

5
openjpa-integration/slf4j/pom.xml
View File

@ -37,6 +37,7 @@
<properties> <properties>
<checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location> <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 --> <!-- use SLF4JLogFactory for logging -->
<openjpa.Log>slf4j</openjpa.Log> <openjpa.Log>slf4j</openjpa.Log>
</properties> </properties>
@ -45,12 +46,10 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>${slf4jVersion}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<version>${slf4jVersion}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
@ -123,12 +122,10 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>${slf4jVersion}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<version>${slf4jVersion}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>

18
openjpa-integration/tck/pom.xml
View File

@ -78,7 +78,6 @@
<version>3.0.1-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration-tck</artifactId> <artifactId>openjpa-integration-tck</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>OpenJPA Integration Tests - JPA TCK</name> <name>OpenJPA Integration Tests - JPA TCK</name>
@ -109,7 +108,7 @@
<configuration> <configuration>
<rules> <rules>
<requireJavaVersion> <requireJavaVersion>
<version>[1.6,)</version> <version>[1.8,)</version>
</requireJavaVersion> </requireJavaVersion>
</rules> </rules>
</configuration> </configuration>
@ -124,7 +123,7 @@
<id>tckinit</id> <id>tckinit</id>
<phase>pre-integration-test</phase> <phase>pre-integration-test</phase>
<configuration> <configuration>
<tasks> <target>
<echo>Running Sun JPA 2.0 TCK Init</echo> <echo>Running Sun JPA 2.0 TCK Init</echo>
<property name="tck.base" value="${basedir}/target/tck" /> <property name="tck.base" value="${basedir}/target/tck" />
<property name="tck.dir" value="${tck.base}/jpatck" /> <property name="tck.dir" value="${tck.base}/jpatck" />
@ -132,7 +131,7 @@
<ant antfile="${basedir}/tck2-${tck2.level}.xml"> <ant antfile="${basedir}/tck2-${tck2.level}.xml">
<target name="init" /> <target name="init" />
</ant> </ant>
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
@ -142,7 +141,7 @@
<id>run-tck</id> <id>run-tck</id>
<phase>integration-test</phase> <phase>integration-test</phase>
<configuration> <configuration>
<tasks> <target>
<echo>Running Sun JPA 2.0 TCK</echo> <echo>Running Sun JPA 2.0 TCK</echo>
<property name="tck.base" value="${basedir}/target/tck" /> <property name="tck.base" value="${basedir}/target/tck" />
@ -192,7 +191,7 @@
<property name="connection.username" value="${connection.username}" /> <property name="connection.username" value="${connection.username}" />
<property name="connection.password" value="${connection.password}" /> <property name="connection.password" value="${connection.password}" />
</ant> </ant>
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
@ -214,7 +213,7 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<version>${slf4jVersion}</version> <version>${slf4j.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -240,7 +239,7 @@
<id>run-tck</id> <id>run-tck</id>
<phase>integration-test</phase> <phase>integration-test</phase>
<configuration> <configuration>
<tasks> <target>
<echo>Running Sun JPA 1.0b TCK</echo> <echo>Running Sun JPA 1.0b TCK</echo>
<property name="tck.zip" value="${settings.localRepository}/../privaterepos/jpa-1_0b-tck.zip" /> <property name="tck.zip" value="${settings.localRepository}/../privaterepos/jpa-1_0b-tck.zip" />
@ -431,7 +430,7 @@ databaseName=${db.name}
<!-- else --> <!-- else -->
<echo>JPA TCK Passed 100%!</echo> <echo>JPA TCK Passed 100%!</echo>
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
@ -548,7 +547,6 @@ databaseName=${db.name}
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <artifactId>derby</artifactId>
<version>${derby.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>

12
openjpa-integration/validation/pom.xml
View File

@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration-validation</artifactId> <artifactId>openjpa-integration-validation</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OpenJPA Integration Tests - Bean Validation</name> <name>OpenJPA Integration Tests - Bean Validation</name>
@ -38,6 +37,7 @@
<properties> <properties>
<checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location> <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> </properties>
<profiles> <profiles>
@ -110,13 +110,13 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.5.6</version> <version>${slf4j.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.5.6</version> <version>${slf4j.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -165,12 +165,10 @@
<dependency> <dependency>
<groupId>org.apache.bval</groupId> <groupId>org.apache.bval</groupId>
<artifactId>org.apache.bval.bundle</artifactId> <artifactId>org.apache.bval.bundle</artifactId>
<version>0.3-incubating</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<version>${slf4jVersion}</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -210,7 +208,7 @@
<execution> <execution>
<phase>process-test-classes</phase> <phase>process-test-classes</phase>
<configuration> <configuration>
<tasks> <target>
<ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true"> <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
<property name="maven.test.skip" value="${maven.test.skip}" /> <property name="maven.test.skip" value="${maven.test.skip}" />
<property name="test" value="${test}" /> <property name="test" value="${test}" />
@ -219,7 +217,7 @@
<property name="openjpa.Log" value="${openjpa.Log}" /> <property name="openjpa.Log" value="${openjpa.Log}" />
<property name="build.enhance" value="${build.enhance}" /> <property name="build.enhance" value="${build.enhance}" />
</ant> </ant>
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>

3
openjpa-jdbc/pom.xml
View File

@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jdbc</artifactId> <artifactId>openjpa-jdbc</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OpenJPA JDBC</name> <name>OpenJPA JDBC</name>
@ -60,7 +59,7 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>postgresql</groupId> <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

21
openjpa-jest/pom.xml
View File

@ -31,7 +31,6 @@
<version>3.0.1-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jest</artifactId> <artifactId>openjpa-jest</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OpenJPA JEST</name> <name>OpenJPA JEST</name>
@ -63,16 +62,16 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>httpunit</groupId> <groupId>org.httpunit</groupId>
<artifactId>httpunit</artifactId> <artifactId>httpunit</artifactId>
<version>1.7</version> <version>1.7.3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-jci-rhino</artifactId> <artifactId>commons-jci-rhino</artifactId>
<version>1.0</version> <version>1.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -85,7 +84,7 @@
<execution> <execution>
<phase>process-test-classes</phase> <phase>process-test-classes</phase>
<configuration> <configuration>
<tasks> <target>
<ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true"> <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
<property name="maven.test.skip" value="${maven.test.skip}" /> <property name="maven.test.skip" value="${maven.test.skip}" />
<property name="test" value="${test}" /> <property name="test" value="${test}" />
@ -93,7 +92,7 @@
<property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" /> <property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
<property name="openjpa.Log" value="${openjpa.Log}" /> <property name="openjpa.Log" value="${openjpa.Log}" />
</ant> </ant>
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>

BIN
openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar
View File

Binary file not shown.

1
openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar.md5
View File

@ -1 +0,0 @@
1c04cfd6dff604d4270156224d741c0e

1
openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar.sha1
View File

@ -1 +0,0 @@
ee2f4edf04371ba20e7ba9ebb1a55846fba4a5ab

45
openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom
View File

@ -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>

1
openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom.md5
View File

@ -1 +0,0 @@
095278fb41358599450220f918c1f0d3

1
openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom.sha1
View File

@ -1 +0,0 @@
58422cdc01d008740e58c0687684e1d979b9dd95

11
openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/maven-metadata.xml
View File

@ -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>

1
openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/maven-metadata.xml.md5
View File

@ -1 +0,0 @@
9f808e8e78bdb70e3a57e9e5cd22c39a

1
openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/maven-metadata.xml.sha1
View File

@ -1 +0,0 @@
a89fd2b9dd1d41deafc9936146b268451a394939

27
openjpa-kernel/pom.xml
View File

@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId> <artifactId>openjpa-kernel</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OpenJPA Kernel</name> <name>OpenJPA Kernel</name>
@ -56,8 +55,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.ibm.websphere</groupId> <groupId>com.ibm.websphere</groupId>
<artifactId>websphere_uow_api</artifactId> <artifactId>uow_api</artifactId>
<version>0.0.1</version> <version>6</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -76,7 +75,7 @@
<dependency> <dependency>
<groupId>org.apache.xbean</groupId> <groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm6-shaded</artifactId> <artifactId>xbean-asm6-shaded</artifactId>
<version>4.8</version> <version>4.10</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -92,7 +91,7 @@
<phase>generate-sources</phase> <phase>generate-sources</phase>
<configuration> <configuration>
<buildNodeFiles>false</buildNodeFiles> <buildNodeFiles>false</buildNodeFiles>
<jdkVersion>1.6</jdkVersion> <jdkVersion>${java.class.version}</jdkVersion>
</configuration> </configuration>
<goals> <goals>
<goal>jjtree-javacc</goal> <goal>jjtree-javacc</goal>
@ -108,9 +107,9 @@
<id>add-was-interfaces</id> <id>add-was-interfaces</id>
<phase>process-classes</phase> <phase>process-classes</phase>
<configuration> <configuration>
<tasks> <target>
<java classname="org.apache.openjpa.ee.WASManagedRuntime" classpathref="maven.runtime.classpath" /> <java classname="org.apache.openjpa.ee.WASManagedRuntime" classpathref="maven.runtime.classpath" />
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
@ -120,11 +119,11 @@
<id>generate-standard-sco-proxies</id> <id>generate-standard-sco-proxies</id>
<phase>process-classes</phase> <phase>process-classes</phase>
<configuration> <configuration>
<tasks> <target>
<java classname="org.apache.openjpa.util.ProxyManagerImpl" classpathref="maven.runtime.classpath"> <java classname="org.apache.openjpa.util.ProxyManagerImpl" classpathref="maven.runtime.classpath">
<arg line="-utils 5" /> <arg line="-utils 5" />
</java> </java>
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
@ -165,14 +164,10 @@
</build> </build>
<repositories> <repositories>
<!--
Internal (in SVN) repository which contains jar files that are not
publicly available and cannot be re-distributed.
-->
<repository> <repository>
<id>openjpa-internal</id> <id>seasar-repo</id>
<name>Internal repository</name> <name>seasar repository</name>
<url>file://${basedir}/internal-repository</url> <url>https://www.seasar.org/maven/maven2</url>
</repository> </repository>
</repositories> </repositories>
</project> </project>

9
openjpa-lib/pom.xml
View File

@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-lib</artifactId> <artifactId>openjpa-lib</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OpenJPA Utilities Library</name> <name>OpenJPA Utilities Library</name>
@ -50,8 +49,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j-core</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -96,7 +95,7 @@
<id>set subversion revision</id> <id>set subversion revision</id>
<phase>compile</phase> <phase>compile</phase>
<configuration> <configuration>
<tasks> <target>
<property name="tmpdir" value="${java.io.tmpdir}/openjpamvntmp" /> <property name="tmpdir" value="${java.io.tmpdir}/openjpamvntmp" />
<condition property="outdir" value="${project.build.outputDirectory}"> <condition property="outdir" value="${project.build.outputDirectory}">
<available type="dir" file="${project.build.outputDirectory}" /> <available type="dir" file="${project.build.outputDirectory}" />
@ -131,7 +130,7 @@ openjpa.version=${project.version}
openjpa.enhancer.revision=${pcenhancer.LastChangedRev} openjpa.enhancer.revision=${pcenhancer.LastChangedRev}
</echo> </echo>
<delete dir="${tmpdir}" /> <delete dir="${tmpdir}" />
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>

17
openjpa-lib/src/main/java/org/apache/openjpa/lib/log/Log4JLogFactory.java
View File

@ -18,9 +18,8 @@
*/ */
package org.apache.openjpa.lib.log; package org.apache.openjpa.lib.log;
import org.apache.log4j.Level; import org.apache.logging.log4j.LogManager;
import org.apache.log4j.LogManager; import org.apache.logging.log4j.Logger;
import org.apache.log4j.Logger;
/** /**
* {@link LogFactory} implementation that delegates to the Log4J framework. * {@link LogFactory} implementation that delegates to the Log4J framework.
@ -31,7 +30,7 @@ public class Log4JLogFactory extends LogFactoryAdapter {
@Override @Override
protected Log newLogAdapter(String channel) { 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 @Override
public boolean isTraceEnabled() { public boolean isTraceEnabled() {
return _log.isEnabledFor(Level.DEBUG); return _log.isTraceEnabled();
} }
@Override @Override
public boolean isInfoEnabled() { public boolean isInfoEnabled() {
return _log.isEnabledFor(Level.INFO); return _log.isInfoEnabled();
} }
@Override @Override
public boolean isWarnEnabled() { public boolean isWarnEnabled() {
return _log.isEnabledFor(Level.WARN); return _log.isWarnEnabled();
} }
@Override @Override
public boolean isErrorEnabled() { public boolean isErrorEnabled() {
return _log.isEnabledFor(Level.ERROR); return _log.isErrorEnabled();
} }
@Override @Override
public boolean isFatalEnabled() { public boolean isFatalEnabled() {
return _log.isEnabledFor(Level.FATAL); return _log.isFatalEnabled();
} }
@Override @Override

7
openjpa-persistence-jdbc/pom.xml
View File

@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId> <artifactId>openjpa-persistence-jdbc</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OpenJPA Persistence JDBC</name> <name>OpenJPA Persistence JDBC</name>
@ -875,7 +874,7 @@
<dependency> <dependency>
<groupId>simple-jndi</groupId> <groupId>simple-jndi</groupId>
<artifactId>simple-jndi</artifactId> <artifactId>simple-jndi</artifactId>
<version>0.11.4</version> <version>0.11.4.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -889,7 +888,7 @@
<execution> <execution>
<phase>process-test-classes</phase> <phase>process-test-classes</phase>
<configuration> <configuration>
<tasks> <target>
<ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true"> <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
<property name="maven.test.skip" value="${maven.test.skip}" /> <property name="maven.test.skip" value="${maven.test.skip}" />
<property name="test" value="${test}" /> <property name="test" value="${test}" />
@ -898,7 +897,7 @@
<property name="openjpa.Log" value="${openjpa.Log}" /> <property name="openjpa.Log" value="${openjpa.Log}" />
<property name="build.enhance" value="${build.enhance}" /> <property name="build.enhance" value="${build.enhance}" />
</ant> </ant>
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>

3
openjpa-persistence-jdbc/src/main/resources/org/apache/openjpa/persistence/jdbc/localizer.properties
View File

@ -62,4 +62,5 @@ implicit-non-default-fk: While parsing "{0}" from "{1}", found a @ForeignKey \
non-default value for an implicit ForeignKey. non-default value for an implicit ForeignKey.
table-not-allowed: You have specified Table annotation or XML descriptor element \ table-not-allowed: You have specified Table annotation or XML descriptor element \
for MappedSuperclass "{0}". A class designated as a mapped superclass can not \ for MappedSuperclass "{0}". A class designated as a mapped superclass can not \
have a separate table defined for it. have a separate table defined for it.

5
openjpa-persistence-locking/pom.xml
View File

@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-locking</artifactId> <artifactId>openjpa-persistence-locking</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OpenJPA Persistence Locking Tests</name> <name>OpenJPA Persistence Locking Tests</name>
@ -836,7 +835,7 @@
<execution> <execution>
<phase>process-test-classes</phase> <phase>process-test-classes</phase>
<configuration> <configuration>
<tasks> <target>
<ant antfile="src/test/ant/enhancer.xml" target="enhance" inheritRefs="true"> <ant antfile="src/test/ant/enhancer.xml" target="enhance" inheritRefs="true">
<property name="maven.test.skip" value="${maven.test.skip}" /> <property name="maven.test.skip" value="${maven.test.skip}" />
<property name="test" value="${test}" /> <property name="test" value="${test}" />
@ -845,7 +844,7 @@
<property name="openjpa.Log" value="${openjpa.Log}" /> <property name="openjpa.Log" value="${openjpa.Log}" />
<property name="build.enhance" value="${build.enhance}" /> <property name="build.enhance" value="${build.enhance}" />
</ant> </ant>
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>

1
openjpa-persistence/pom.xml
View File

@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence</artifactId> <artifactId>openjpa-persistence</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OpenJPA Persistence</name> <name>OpenJPA Persistence</name>

3
openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/criteria/localizer.properties
View File

@ -24,4 +24,5 @@ select-undefined: No terms is selected for criteria query. \
projection terms for the query. projection terms for the query.
select-no-ctor: You have specified selection term to construct an instance of \ 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 \ "{0}" with argument types "{1}". But "{0}" has no constructor with such \
argument types. argument types.

3
openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties
View File

@ -256,4 +256,5 @@ EntityManagers this property should not be used because these EntityManagers may
time. time.
shared-cache-mode-take-precedence: The DataCache is set to {0} while the shared-cache-mode Element or \ 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. 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. id-class-not-serializable: The composite identity class "{0}" for entity "{1}" is not serializable.

2
openjpa-project/assembly.xml
View File

@ -143,7 +143,7 @@
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include> <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.geronimo.specs:geronimo-validation_1.0_spec</include>
<include>org.apache.bval:org.apache.bval.bundle</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> </includes>
</dependencySet> </dependencySet>
</dependencySets> </dependencySets>

2
openjpa-project/bin-assembly.xml
View File

@ -82,7 +82,7 @@
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include> <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.geronimo.specs:geronimo-validation_1.0_spec</include>
<include>org.apache.bval:org.apache.bval.bundle</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> </includes>
</dependencySet> </dependencySet>
</dependencySets> </dependencySets>

26
openjpa-project/pom.xml
View File

@ -42,7 +42,6 @@
<version>3.0.1-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>apache-openjpa</artifactId> <artifactId>apache-openjpa</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>OpenJPA Project Docs and Assemblies</name> <name>OpenJPA Project Docs and Assemblies</name>
@ -135,13 +134,12 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>bin</id> <id>bin</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>attached</goal> <goal>single</goal>
</goals> </goals>
<configuration> <configuration>
<descriptors> <descriptors>
@ -313,25 +311,11 @@
</executions> </executions>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.docbook</groupId> <groupId>net.sf.docbook</groupId>
<artifactId>docbook-xml</artifactId> <artifactId>docbook-xml</artifactId>
<version>4.4</version> <version>5.0</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </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> </dependencies>
</plugin> </plugin>
</plugins> </plugins>
@ -366,7 +350,7 @@
<execution> <execution>
<phase>package</phase> <phase>package</phase>
<configuration> <configuration>
<tasks> <target>
<ant antfile="upload.xml" target="upload" inheritRefs="true"> <ant antfile="upload.xml" target="upload" inheritRefs="true">
<property name="nightly.user.name" value="${nightly.user.name}" /> <property name="nightly.user.name" value="${nightly.user.name}" />
<property name="nightly.password" value="${nightly.password}" /> <property name="nightly.password" value="${nightly.password}" />
@ -375,7 +359,7 @@
<property name="nightly.version" value="${nightly.version}" /> <property name="nightly.version" value="${nightly.version}" />
<property name="project.version" value="${project.version}" /> <property name="project.version" value="${project.version}" />
</ant> </ant>
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>

2
openjpa-project/suppressions.xml
View File

@ -10,4 +10,6 @@
<suppress checks="RegexpSinglelineJava" files=".*src\\test.*java" /> <suppress checks="RegexpSinglelineJava" files=".*src\\test.*java" />
<suppress checks="RegexpSinglelineJava" files=".*src.test.*java" /> <suppress checks="RegexpSinglelineJava" files=".*src.test.*java" />
<suppress checks="RegexpSinglelineJava" files="Main.java" /> <suppress checks="RegexpSinglelineJava" files="Main.java" />
<suppress checks=".*" files=".*generated-sources.*[.]java" />
<suppress checks=".*" files=".*_[.]java" />
</suppressions> </suppressions>

5
openjpa-slice/pom.xml
View File

@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-slice</artifactId> <artifactId>openjpa-slice</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OpenJPA Slice</name> <name>OpenJPA Slice</name>
@ -110,7 +109,7 @@
<execution> <execution>
<phase>process-test-classes</phase> <phase>process-test-classes</phase>
<configuration> <configuration>
<tasks> <target>
<ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true"> <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
<property name="maven.test.skip" value="${maven.test.skip}" /> <property name="maven.test.skip" value="${maven.test.skip}" />
<property name="test" value="${test}" /> <property name="test" value="${test}" />
@ -118,7 +117,7 @@
<property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" /> <property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
<property name="openjpa.Log" value="${openjpa.Log}" /> <property name="openjpa.Log" value="${openjpa.Log}" />
</ant> </ant>
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>

3
openjpa-slice/src/main/resources/org/apache/openjpa/slice/localizer.properties
View File

@ -27,4 +27,5 @@ multithreaded-false: Configuration property "{0}" is set to "false". \
operations per slice in parallel in different threads, setting "{0}" to \ operations per slice in parallel in different threads, setting "{0}" to \
"false" may cause unpredictable behavior. "false" may cause unpredictable behavior.
unknown-impl-data: Encountered unrecognized internal data "{0}" of "{1}" \ unknown-impl-data: Encountered unrecognized internal data "{0}" of "{1}" \
associated with persistent instance "{2}". associated with persistent instance "{2}".

3
openjpa-slice/src/main/resources/org/apache/openjpa/slice/transaction/localizer.properties
View File

@ -16,4 +16,5 @@
# under the License. # under the License.
no-txn-on-thread: No transaction is associated with current thread "{0}" 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 \ 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} commit during the first phase of a two-phase commit protocol due to {0}

5
openjpa-tools/openjpa-fetch-statistics-was/pom.xml
View File

@ -27,6 +27,10 @@
<description> OpenJPA tool to capture the fetching statistic data for the persistent fields .</description> <description> OpenJPA tool to capture the fetching statistic data for the persistent fields .</description>
<inceptionYear>2012</inceptionYear> <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> <dependencies>
<dependency> <dependency>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
@ -80,7 +84,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>1.7.1</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>

4
openjpa-tools/openjpa-fetch-statistics/pom.xml
View File

@ -27,6 +27,10 @@
<description> OpenJPA tool to capture the fetching statistic data for the persistent fields .</description> <description> OpenJPA tool to capture the fetching statistic data for the persistent fields .</description>
<inceptionYear>2012</inceptionYear> <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> <dependencies>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>

30
openjpa-tools/openjpa-maven-plugin/pom.xml
View File

@ -40,9 +40,13 @@
Apache maven (see http://maven.apache.org). Apache maven (see http://maven.apache.org).
</description> </description>
<inceptionYear>2011</inceptionYear> <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> <prerequisites>
<maven>2.0.6</maven> <maven>${min.maven.version}</maven>
</prerequisites> </prerequisites>
<developers> <developers>
@ -71,23 +75,23 @@
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId> <artifactId>maven-plugin-api</artifactId>
<version>2.0.6</version> <version>${min.maven.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId> <artifactId>maven-compat</artifactId>
<version>2.0.6</version> <version>${min.maven.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.plugin-tools</groupId> <groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId> <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 --> <scope>provided</scope> <!-- annotations are only needed to build the plugin -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId> <artifactId>plexus-utils</artifactId>
<version>1.5.7</version> <version>3.1.0</version>
</dependency> </dependency>
<!-- dependencies for OpenJPA itself --> <!-- dependencies for OpenJPA itself -->
@ -126,8 +130,8 @@
<artifactId>org.apache.bval.bundle</artifactId> <artifactId>org.apache.bval.bundle</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j-core</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
@ -135,7 +139,7 @@
<dependency> <dependency>
<groupId>org.apache.maven.plugin-testing</groupId> <groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId> <artifactId>maven-plugin-testing-harness</artifactId>
<version>1.2</version> <version>3.3.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -153,7 +157,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId> <artifactId>maven-plugin-plugin</artifactId>
<version>3.4</version>
<configuration> <configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration> </configuration>
@ -183,11 +186,10 @@
<pomIncludes> <pomIncludes>
<pomInclude>*/pom.xml</pomInclude> <pomInclude>*/pom.xml</pomInclude>
</pomIncludes> </pomIncludes>
<goals>
<goal>install</goal>
</goals>
<postBuildHookScript>verify</postBuildHookScript> <postBuildHookScript>verify</postBuildHookScript>
</configuration> </configuration>
<dependencies>
</dependencies>
<executions> <executions>
<execution> <execution>
<id>integration-test</id> <id>integration-test</id>

4
openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml
View File

@ -103,8 +103,8 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.5</source> <source>1.8</source>
<target>1.5</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

4
openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjA/pom.xml
View File

@ -40,8 +40,8 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.5</source> <source>1.8</source>
<target>1.5</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

4
openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/pom.xml
View File

@ -84,8 +84,8 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.5</source> <source>1.8</source>
<target>1.5</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

4
openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/pom.xml
View File

@ -73,8 +73,8 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.5</source> <source>1.8</source>
<target>1.5</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

4
openjpa-tools/openjpa-maven-plugin/src/it/modifyDatabase/pom.xml.disabled
View File

@ -52,8 +52,8 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.5</source> <source>1.8</source>
<target>1.5</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>

4
openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml
View File

@ -87,8 +87,8 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.5</source> <source>1.8</source>
<target>1.5</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

15
openjpa-tools/openjpa-maven-plugin/src/it/settings.xml
View File

@ -22,7 +22,18 @@
<repositories> <repositories>
<repository> <repository>
<id>local.central</id> <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> <releases>
<enabled>true</enabled> <enabled>true</enabled>
</releases> </releases>
@ -34,7 +45,7 @@
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
<id>local.central</id> <id>local.central</id>
<url>file:///@localRepository@</url> <url>file:@localRepository@</url>
<releases> <releases>
<enabled>true</enabled> <enabled>true</enabled>
</releases> </releases>

4
openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/pom.xml
View File

@ -115,8 +115,8 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.5</source> <source>1.8</source>
<target>1.5</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>

4
openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjA/pom.xml
View File

@ -31,8 +31,8 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.5</source> <source>1.8</source>
<target>1.5</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

4
openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml
View File

@ -74,8 +74,8 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.5</source> <source>1.8</source>
<target>1.5</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

1
openjpa-tools/pom.xml
View File

@ -31,7 +31,6 @@
<!-- <relativePath>../pom.xml</relativePath>--> <!-- <relativePath>../pom.xml</relativePath>-->
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-tools</artifactId> <artifactId>openjpa-tools</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>

1
openjpa-xmlstore/pom.xml
View File

@ -30,7 +30,6 @@
<version>3.0.1-SNAPSHOT</version> <version>3.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-xmlstore</artifactId> <artifactId>openjpa-xmlstore</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OpenJPA XML Store</name> <name>OpenJPA XML Store</name>

91
pom.xml
View File

@ -27,7 +27,7 @@
<parent> <parent>
<groupId>org.apache</groupId> <groupId>org.apache</groupId>
<artifactId>apache</artifactId> <artifactId>apache</artifactId>
<version>18</version> <version>21</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
@ -73,23 +73,24 @@
<createSource>none</createSource> <createSource>none</createSource>
<createSources>false</createSources> <createSources>false</createSources>
<!-- common JDBC driver versions --> <!-- 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> <hsqldb.version>2.4.1</hsqldb.version>
<mysql.version>5.1.12</mysql.version> <mysql.version>8.0.12</mysql.version>
<postgresql.version>9.1-901-1.jdbc4</postgresql.version> <postgresql.version>42.2.5</postgresql.version>
<!-- other common versions --> <!-- other common versions -->
<slf4jVersion>1.7.21</slf4jVersion> <slf4j.version>1.7.23</slf4j.version>
<!-- Compile Java source/target class level --> <!-- Compile Java source/target class level -->
<compile.class.source>${java.class.version}</compile.class.source> <compile.class.source>${java.class.version}</compile.class.source>
<compile.class.target>${java.class.version}</compile.class.target> <compile.class.target>${java.class.version}</compile.class.target>
<compile.testclass.source>${java.testclass.version}</compile.testclass.source> <compile.testclass.source>${java.testclass.version}</compile.testclass.source>
<compile.testclass.target>${java.testclass.version}</compile.testclass.target> <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 /> <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> <bval.version>1.1.2</bval.version>
<jmock.version>2.9.0</jmock.version>
</properties> </properties>
<licenses> <licenses>
@ -229,8 +230,6 @@
<exclude>**/rat.txt</exclude> <exclude>**/rat.txt</exclude>
<exclude>release.properties</exclude> <exclude>release.properties</exclude>
<exclude>DEPENDENCIES</exclude> <exclude>DEPENDENCIES</exclude>
<!-- Exclude internal build-only repository -->
<exclude>**/internal-repository/**</exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>
@ -404,7 +403,6 @@
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <artifactId>derby</artifactId>
<version>${derby.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -475,7 +473,6 @@
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId> <artifactId>derbyclient</artifactId>
<version>${derby.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -553,6 +550,16 @@
<artifactId>derby</artifactId> <artifactId>derby</artifactId>
<version>${derby.version}</version> <version>${derby.version}</version>
</dependency> </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> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId> <artifactId>commons-dbcp2</artifactId>
@ -574,7 +581,7 @@
<version>${hsqldb.version}</version> <version>${hsqldb.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>postgresql</groupId> <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
<version>${postgresql.version}</version> <version>${postgresql.version}</version>
<scope>provided</scope> <scope>provided</scope>
@ -585,14 +592,19 @@
<version>1.4</version> <version>1.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j-core</artifactId>
<version>1.2.17</version> <version>2.11.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <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>
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.apache.ant</groupId>
@ -602,12 +614,12 @@
<dependency> <dependency>
<groupId>org.jmock</groupId> <groupId>org.jmock</groupId>
<artifactId>jmock</artifactId> <artifactId>jmock</artifactId>
<version>2.8.2</version> <version>${jmock.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jmock</groupId> <groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId> <artifactId>jmock-junit4</artifactId>
<version>2.8.2</version> <version>${jmock.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -615,9 +627,9 @@
<version>4.12</version> <version>4.12</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sourceforge.findbugs</groupId> <groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId> <artifactId>annotations</artifactId>
<version>1.3.2</version> <version>3.0.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -652,11 +664,10 @@
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<!-- apache-7.pom default of 2.0.2 fails for JDK5 testing -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version> <version>3.8.0</version>
<configuration> <configuration>
<source>${compile.class.source}</source> <source>${compile.class.source}</source>
<target>${compile.class.target}</target> <target>${compile.class.target}</target>
@ -666,7 +677,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version> <version>3.1.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -753,7 +764,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId> <artifactId>findbugs-maven-plugin</artifactId>
<version>2.5.5</version> <version>3.0.5</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
@ -777,12 +788,12 @@
<plugin> <plugin>
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
<version>0.11</version> <version>0.12</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version> <version>3.1.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -808,12 +819,12 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.3</version> <version>1.8</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.apache.ant</groupId>
<artifactId>ant-jsch</artifactId> <artifactId>ant-jsch</artifactId>
<version>1.7.1</version> <version>1.10.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ant-contrib</groupId> <groupId>ant-contrib</groupId>
@ -837,24 +848,17 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version> <version>3.2.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9</version> <version>3.0.0</version>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
<version>1.1.5</version>
</dependency>
</dependencies>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version> <version>3.1.0</version>
<executions> <executions>
<execution> <execution>
<id>default-jar</id> <id>default-jar</id>
@ -884,7 +888,7 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>2.2.0</version> <version>4.0.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>
@ -897,7 +901,7 @@
<plugin> <plugin>
<groupId>org.apache.karaf.tooling</groupId> <groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId> <artifactId>karaf-maven-plugin</artifactId>
<version>4.2.0</version> <version>4.2.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
@ -1103,7 +1107,6 @@
<failsOnError>true</failsOnError> <failsOnError>true</failsOnError>
<consoleOutput>true</consoleOutput> <consoleOutput>true</consoleOutput>
<includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestSourceDirectory>true</includeTestSourceDirectory>
<excludes>**/*_.java</excludes>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@ -1120,10 +1123,10 @@
<configuration> <configuration>
<rules> <rules>
<requireMavenVersion> <requireMavenVersion>
<version>[2.2.1,)</version> <version>[3.3.9,)</version>
</requireMavenVersion> </requireMavenVersion>
<requireJavaVersion> <requireJavaVersion>
<version>[1.6,)</version> <version>[1.8,)</version>
</requireJavaVersion> </requireJavaVersion>
</rules> </rules>
</configuration> </configuration>
@ -1173,7 +1176,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId> <artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.9</version> <version>3.0.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>