JAMES-2488 update openjpa
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/34c89c28 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/34c89c28 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/34c89c28 Branch: refs/heads/master Commit: 34c89c28ea11f7997f45f5f30d0cf2eb19393bef Parents: bbfc3dc Author: duc <[email protected]> Authored: Fri Jul 20 17:25:49 2018 +0700 Committer: benwa <[email protected]> Committed: Wed Jul 25 09:35:24 2018 +0700 ---------------------------------------------------------------------- backends-common/jpa/pom.xml | 2 +- dockerfiles/run/guice/jpa/Dockerfile | 2 +- mailbox/jpa/pom.xml | 2 +- .../mailbox/jpa/JPAMailboxSessionMapperFactory.java | 4 ++-- .../james/mailbox/jpa/mail/JPAModSeqProvider.java | 4 ++-- .../james/mailbox/jpa/mail/JPAMapperProvider.java | 12 ++++++------ .../mailbox/jpa/mail/TransactionalAnnotationMapper.java | 6 +++--- .../mailbox/jpa/mail/TransactionalMailboxMapper.java | 6 +++--- .../mailbox/jpa/mail/TransactionalMessageMapper.java | 6 +++--- pom.xml | 1 + server/data/data-jpa/pom.xml | 2 +- 11 files changed, 24 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/backends-common/jpa/pom.xml ---------------------------------------------------------------------- diff --git a/backends-common/jpa/pom.xml b/backends-common/jpa/pom.xml index 2d6ed92..3fad710 100644 --- a/backends-common/jpa/pom.xml +++ b/backends-common/jpa/pom.xml @@ -27,7 +27,7 @@ <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> - <version>2.4.2</version> + <version>${apache.openjpa.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/dockerfiles/run/guice/jpa/Dockerfile ---------------------------------------------------------------------- diff --git a/dockerfiles/run/guice/jpa/Dockerfile b/dockerfiles/run/guice/jpa/Dockerfile index bb2e68d..913cfa9 100644 --- a/dockerfiles/run/guice/jpa/Dockerfile +++ b/dockerfiles/run/guice/jpa/Dockerfile @@ -27,4 +27,4 @@ ADD destination/conf /root/conf VOLUME /logs -ENTRYPOINT java -classpath '/root/james-server.jar:/root/james-server-jpa-guice.lib/*' -javaagent:/root/james-server-cli.lib/openjpa-2.4.2.jar -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ org.apache.james.JPAJamesServerMain +ENTRYPOINT java -classpath '/root/james-server.jar:/root/james-server-jpa-guice.lib/*' -javaagent:/root/james-server-cli.lib/openjpa-3.0.0.jar -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ org.apache.james.JPAJamesServerMain http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/mailbox/jpa/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml index f3c696d..e613323 100644 --- a/mailbox/jpa/pom.xml +++ b/mailbox/jpa/pom.xml @@ -111,7 +111,7 @@ <plugin> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-maven-plugin</artifactId> - <version>2.4.2</version> + <version>${apache.openjpa.version}</version> <configuration> <includes>org/apache/james/mailbox/jpa/*/model/**/*.class</includes> <excludes>org/apache/james/mailbox/jpa/mail/model/openjpa/EncryptDecryptHelper.class</excludes> http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java index 09ded1f..ade56a6 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java @@ -22,7 +22,7 @@ import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.jpa.mail.JPAAnnotationMapper; @@ -68,7 +68,7 @@ public class JPAMailboxSessionMapperFactory extends MailboxSessionMapperFactory @Override public MessageIdMapper createMessageIdMapper(MailboxSession session) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("not implemented"); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java index 8d31878..35de142 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java @@ -23,7 +23,7 @@ import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.PersistenceException; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MailboxPathLocker; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; @@ -91,6 +91,6 @@ public class JPAModSeqProvider extends AbstractLockingModSeqProvider { @Override public long highestModSeq(MailboxSession session, MailboxId mailboxId) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("not implemented"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java index dca5583..a3f1b01 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java @@ -24,7 +24,7 @@ import java.util.Random; import javax.persistence.EntityManagerFactory; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.backends.jpa.JpaTestCluster; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; @@ -73,7 +73,7 @@ public class JPAMapperProvider implements MapperProvider { @Override public AttachmentMapper createAttachmentMapper() throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("not implemented"); } @Override @@ -108,22 +108,22 @@ public class JPAMapperProvider implements MapperProvider { @Override public MessageIdMapper createMessageIdMapper() throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("not implemented"); } @Override public MessageUid generateMessageUid() { - throw new NotImplementedException(); + throw new NotImplementedException("not implemented"); } @Override public long generateModSeq(Mailbox mailbox) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("not implemented"); } @Override public long highestModSeq(Mailbox mailbox) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("not implemented"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalAnnotationMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalAnnotationMapper.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalAnnotationMapper.java index 6873e13..4cb9930 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalAnnotationMapper.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalAnnotationMapper.java @@ -22,7 +22,7 @@ package org.apache.james.mailbox.jpa.mail; import java.util.List; import java.util.Set; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxAnnotation; import org.apache.james.mailbox.model.MailboxAnnotationKey; @@ -39,12 +39,12 @@ public class TransactionalAnnotationMapper implements AnnotationMapper { @Override public void endRequest() { - throw new NotImplementedException(); + throw new NotImplementedException("not implemented"); } @Override public <T> T execute(Transaction<T> transaction) { - throw new NotImplementedException(); + throw new NotImplementedException("not implemented"); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java index c1ba844..7f9e6c3 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java @@ -21,7 +21,7 @@ package org.apache.james.mailbox.jpa.mail; import java.util.List; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.acl.ACLDiff; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MailboxNotFoundException; @@ -42,12 +42,12 @@ public class TransactionalMailboxMapper implements MailboxMapper { @Override public void endRequest() { - throw new NotImplementedException(); + throw new NotImplementedException("not implemented"); } @Override public <T> T execute(Transaction<T> transaction) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("not implemented"); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java index a49a598..de8b570 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java @@ -26,7 +26,7 @@ import java.util.Optional; import javax.mail.Flags; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxCounters; @@ -48,7 +48,7 @@ public class TransactionalMessageMapper implements MessageMapper { @Override public void endRequest() { - throw new NotImplementedException(); + throw new NotImplementedException("not implemented"); } @Override @@ -66,7 +66,7 @@ public class TransactionalMessageMapper implements MessageMapper { @Override public <T> T execute(Transaction<T> transaction) throws MailboxException { - throw new NotImplementedException(); + throw new NotImplementedException("not implemented"); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 75fee3b..b518ab4 100644 --- a/pom.xml +++ b/pom.xml @@ -585,6 +585,7 @@ <james.protocols.groupId>${james.groupId}.protocols</james.protocols.groupId> <activemq.version>5.15.4</activemq.version> <apache-mime4j.version>0.8.2</apache-mime4j.version> + <apache.openjpa.version>3.0.0</apache.openjpa.version> <camel.version>2.22.0</camel.version> <derby.version>10.9.1.0</derby.version> <hadoop.version>1.1.1</hadoop.version> http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/server/data/data-jpa/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml index 2f828c2..23a7742 100644 --- a/server/data/data-jpa/pom.xml +++ b/server/data/data-jpa/pom.xml @@ -147,7 +147,7 @@ <plugin> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-maven-plugin</artifactId> - <version>2.4.2</version> + <version>${apache.openjpa.version}</version> <configuration> <includes>org/apache/james/user/jpa/model/JPAUser.class, org/apache/james/rrt/jpa/model/JPARecipientRewrite.class, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
