This is an automated email from the ASF dual-hosted git repository. matthieu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit f325f00869270dc540d86810d3865cd7b64cad40 Author: Rémi Kowalski <[email protected]> AuthorDate: Mon Jul 8 11:10:45 2019 +0200 JAMES-2813 factorize scala version and bump version --- mailbox/event/json/pom.xml | 57 +--------------------- .../scala/org/apache/james/event/json/DTOs.scala | 2 +- .../apache/james/event/json/EventSerializer.scala | 20 ++++---- pom.xml | 39 +++++++++++++++ server/task/pom.xml | 49 ++----------------- .../eventsourcing/EventSourcingTaskManager.scala | 2 +- .../apache/james/task/eventsourcing/Events.scala | 2 +- .../task/eventsourcing/RecentTasksProjection.scala | 2 +- .../eventsourcing/ScalaEventSourcingSystem.scala | 2 +- .../james/task/eventsourcing/TaskAggregate.scala | 2 +- 10 files changed, 61 insertions(+), 116 deletions(-) diff --git a/mailbox/event/json/pom.xml b/mailbox/event/json/pom.xml index 88cb812..1f34acd 100644 --- a/mailbox/event/json/pom.xml +++ b/mailbox/event/json/pom.xml @@ -31,11 +31,6 @@ <name>Apache James :: Mailbox :: Event :: JSON</name> <description>Apache James Mailbox Event JSON Scala Serialization</description> - <properties> - <scala.base>2.12</scala.base> - <scala.version>${scala.base}.7</scala.version> - </properties> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -55,7 +50,7 @@ <dependency> <groupId>com.typesafe.play</groupId> <artifactId>play-json_${scala.base}</artifactId> - <version>2.6.10</version> + <version>2.7.4</version> </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> @@ -80,35 +75,19 @@ <dependency> <groupId>org.julienrf</groupId> <artifactId>play-json-derived-codecs_${scala.base}</artifactId> - <version>4.0.1</version> + <version>6.0.0</version> </dependency> <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> - <version>${scala.version}</version> </dependency> <dependency> <groupId>org.scala-lang.modules</groupId> <artifactId>scala-java8-compat_${scala.base}</artifactId> - <version>0.9.0</version> </dependency> </dependencies> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <version>3.4.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - </plugin> - </plugins> - </pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -121,38 +100,6 @@ <plugin> <groupId>net.alchim31.maven</groupId> <artifactId>scala-maven-plugin</artifactId> - <executions> - <execution> - <id>scala-compile-first</id> - <phase>process-resources</phase> - <goals> - <goal>add-source</goal> - <goal>compile</goal> - </goals> - </execution> - <execution> - <id>scala-test-compile</id> - <phase>process-test-resources</phase> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - <configuration> - <addArgs>-Xlog-implicits</addArgs> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>compile</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> diff --git a/mailbox/event/json/src/main/scala/org/apache/james/event/json/DTOs.scala b/mailbox/event/json/src/main/scala/org/apache/james/event/json/DTOs.scala index ec8bea4..2b12b4c 100644 --- a/mailbox/event/json/src/main/scala/org/apache/james/event/json/DTOs.scala +++ b/mailbox/event/json/src/main/scala/org/apache/james/event/json/DTOs.scala @@ -30,7 +30,7 @@ import org.apache.james.mailbox.acl.{ACLDiff => JavaACLDiff} import org.apache.james.mailbox.model.{MailboxACL, MessageId, MailboxPath => JavaMailboxPath, MessageMetaData => JavaMessageMetaData, Quota => JavaQuota, UpdatedFlags => JavaUpdatedFlags} import org.apache.james.mailbox.{FlagsBuilder, MessageUid} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object DTOs { diff --git a/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala b/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala index 4b01cba..9331b9a 100644 --- a/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala +++ b/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala @@ -27,16 +27,16 @@ import julienrf.json.derived import org.apache.james.core.quota.{QuotaCount, QuotaSize, QuotaValue} import org.apache.james.core.{Domain, User} import org.apache.james.event.json.DTOs.SystemFlag.SystemFlag -import org.apache.james.event.json.DTOs.{ACLDiff, Flags, MailboxPath, Quota, SystemFlag, UserFlag} +import org.apache.james.event.json.DTOs._ import org.apache.james.mailbox.MailboxSession.SessionId +import org.apache.james.mailbox.MessageUid import org.apache.james.mailbox.events.Event.EventId import org.apache.james.mailbox.events.MailboxListener.{Added => JavaAdded, Expunged => JavaExpunged, FlagsUpdated => JavaFlagsUpdated, MailboxACLUpdated => JavaMailboxACLUpdated, MailboxAdded => JavaMailboxAdded, MailboxDeletion => JavaMailboxDeletion, MailboxRenamed => JavaMailboxRenamed, QuotaUsageUpdatedEvent => JavaQuotaUsageUpdatedEvent} -import org.apache.james.mailbox.events.{MessageMoveEvent => JavaMessageMoveEvent, Event => JavaEvent} +import org.apache.james.mailbox.events.{Event => JavaEvent, MessageMoveEvent => JavaMessageMoveEvent} import org.apache.james.mailbox.model.{MailboxId, MessageId, MessageMoves, QuotaRoot, MailboxACL => JavaMailboxACL, MessageMetaData => JavaMessageMetaData, Quota => JavaQuota} -import org.apache.james.mailbox.{MessageUid, events} -import play.api.libs.json.{JsError, JsNull, JsNumber, JsObject, JsResult, JsString, JsSuccess, Json, OFormat, Reads, Writes} +import play.api.libs.json._ -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ private sealed trait Event { def toJava: JavaEvent @@ -73,7 +73,7 @@ private object DTO { user, path.toJava, mailboxId, - new JavaTreeMap[MessageUid, JavaMessageMetaData](added.mapValues(_.toJava).asJava), + new JavaTreeMap[MessageUid, JavaMessageMetaData](added.view.mapValues(_.toJava).toMap.asJava), eventId) } @@ -84,7 +84,7 @@ private object DTO { user, path.toJava, mailboxId, - expunged.mapValues(_.toJava).asJava, + expunged.view.mapValues(_.toJava).toMap.asJava, eventId) } @@ -161,7 +161,7 @@ private object ScalaConverter { user = event.getUser, path = MailboxPath.fromJava(event.getMailboxPath), mailboxId = event.getMailboxId, - added = event.getAdded.asScala.mapValues(DTOs.MessageMetaData.fromJava).toMap) + added = event.getAdded.asScala.view.mapValues(DTOs.MessageMetaData.fromJava).toMap) private def toScala(event: JavaExpunged): DTO.Expunged = DTO.Expunged( eventId = event.getEventId, @@ -169,7 +169,7 @@ private object ScalaConverter { user = event.getUser, path = MailboxPath.fromJava(event.getMailboxPath), mailboxId = event.getMailboxId, - expunged = event.getExpunged.asScala.mapValues(DTOs.MessageMetaData.fromJava).toMap) + expunged = event.getExpunged.asScala.view.mapValues(DTOs.MessageMetaData.fromJava).toMap) private def toScala(event: JavaMessageMoveEvent): DTO.MessageMoveEvent = DTO.MessageMoveEvent( eventId = event.getEventId, @@ -256,7 +256,7 @@ class JsonSerialize(mailboxIdFactory: MailboxId.Factory, messageIdFactory: Messa case _ => JsError() } implicit val sessionIdReads: Reads[SessionId] = { - case JsNumber(id) => JsSuccess(SessionId.of(id.longValue())) + case JsNumber(id) => JsSuccess(SessionId.of(id.longValue)) case _ => JsError() } implicit val userReads: Reads[User] = { diff --git a/pom.xml b/pom.xml index ddd7826..8a9d110 100644 --- a/pom.xml +++ b/pom.xml @@ -663,6 +663,10 @@ <jackrabbit-core.version>2.5.2</jackrabbit-core.version> <jackson1.version>1.9.2</jackson1.version> <logback.version>1.2.3</logback.version> + + <scala.base>2.13</scala.base> + <scala.version>${scala.base}.0</scala.version> + </properties> <dependencyManagement> @@ -2621,6 +2625,16 @@ <version>${org.osgi.core.version}</version> </dependency> <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>${scala.version}</version> + </dependency> + <dependency> + <groupId>org.scala-lang.modules</groupId> + <artifactId>scala-java8-compat_${scala.base}</artifactId> + <version>0.9.0</version> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> <version>${slf4j.version}</version> @@ -2769,6 +2783,31 @@ <version>3.1.7</version> </plugin> <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + <version>3.4.4</version> + <executions> + <execution> + <id>scala-compile-first</id> + <phase>process-resources</phase> + <goals> + <goal>add-source</goal> + <goal>compile</goal> + </goals> + </execution> + <execution> + <id>scala-test-compile</id> + <phase>process-test-resources</phase> + <goals> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + <configuration> + <addArgs>-Xlog-implicits</addArgs> + </configuration> + </plugin> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <version>3.3.0</version> diff --git a/server/task/pom.xml b/server/task/pom.xml index 5d13d58..63c9be4 100644 --- a/server/task/pom.xml +++ b/server/task/pom.xml @@ -31,11 +31,6 @@ <artifactId>james-server-task</artifactId> <name>Apache James :: Server :: Task</name> - <properties> - <scala.base>2.12</scala.base> - <scala.version>${scala.base}.7</scala.version> - </properties> - <dependencies> <dependency> <groupId>${james.groupId}</groupId> @@ -86,56 +81,20 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-java8-compat_${scala.base}</artifactId> - <version>0.9.0</version> - </dependency> - <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> - <version>${scala.version}</version> + </dependency> + <dependency> + <groupId>org.scala-lang.modules</groupId> + <artifactId>scala-java8-compat_${scala.base}</artifactId> </dependency> </dependencies> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <version>3.4.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - </plugin> - </plugins> - </pluginManagement> <plugins> <plugin> <groupId>net.alchim31.maven</groupId> <artifactId>scala-maven-plugin</artifactId> - <executions> - <execution> - <id>scala-compile-first</id> - <phase>process-resources</phase> - <goals> - <goal>add-source</goal> - <goal>compile</goal> - </goals> - </execution> - <execution> - <id>scala-test-compile</id> - <phase>process-test-resources</phase> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - <configuration> - <addArgs>-Xlog-implicits</addArgs> - </configuration> </plugin> </plugins> </build> diff --git a/server/task/src/main/scala/org/apache/james/task/eventsourcing/EventSourcingTaskManager.scala b/server/task/src/main/scala/org/apache/james/task/eventsourcing/EventSourcingTaskManager.scala index 9d6a3fa..f10c614 100644 --- a/server/task/src/main/scala/org/apache/james/task/eventsourcing/EventSourcingTaskManager.scala +++ b/server/task/src/main/scala/org/apache/james/task/eventsourcing/EventSourcingTaskManager.scala @@ -46,7 +46,7 @@ class EventSourcingTaskManager @Inject @VisibleForTesting private[eventsourcing] case _ => } - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ private val loadHistory: AggregateId => History = eventStore.getEventsOfAggregate _ private val eventSourcingSystem = ScalaEventSourcingSystem( diff --git a/server/task/src/main/scala/org/apache/james/task/eventsourcing/Events.scala b/server/task/src/main/scala/org/apache/james/task/eventsourcing/Events.scala index 71f1c8b..2536b38 100644 --- a/server/task/src/main/scala/org/apache/james/task/eventsourcing/Events.scala +++ b/server/task/src/main/scala/org/apache/james/task/eventsourcing/Events.scala @@ -18,7 +18,7 @@ * ***************************************************************/ package org.apache.james.task.eventsourcing -import org.apache.james.eventsourcing.{AggregateId, Event, EventId} +import org.apache.james.eventsourcing.{Event, EventId} import org.apache.james.task.Task import org.apache.james.task.Task.Result diff --git a/server/task/src/main/scala/org/apache/james/task/eventsourcing/RecentTasksProjection.scala b/server/task/src/main/scala/org/apache/james/task/eventsourcing/RecentTasksProjection.scala index fced087..9f3b85c 100644 --- a/server/task/src/main/scala/org/apache/james/task/eventsourcing/RecentTasksProjection.scala +++ b/server/task/src/main/scala/org/apache/james/task/eventsourcing/RecentTasksProjection.scala @@ -25,7 +25,7 @@ import org.apache.james.task.TaskId class RecentTasksProjection() { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ private val tasks = new ConcurrentLinkedDeque[TaskId] diff --git a/server/task/src/main/scala/org/apache/james/task/eventsourcing/ScalaEventSourcingSystem.scala b/server/task/src/main/scala/org/apache/james/task/eventsourcing/ScalaEventSourcingSystem.scala index 16178b3..2271854 100644 --- a/server/task/src/main/scala/org/apache/james/task/eventsourcing/ScalaEventSourcingSystem.scala +++ b/server/task/src/main/scala/org/apache/james/task/eventsourcing/ScalaEventSourcingSystem.scala @@ -22,7 +22,7 @@ import org.apache.james.eventsourcing.eventstore.EventStore import org.apache.james.eventsourcing.{CommandHandler, EventSourcingSystem, Subscriber} object ScalaEventSourcingSystem { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ def apply(handlers: Set[CommandHandler[_]], subscribers: Set[Subscriber], eventStore: EventStore): EventSourcingSystem = new EventSourcingSystem(handlers.asJava, subscribers.asJava, eventStore) } diff --git a/server/task/src/main/scala/org/apache/james/task/eventsourcing/TaskAggregate.scala b/server/task/src/main/scala/org/apache/james/task/eventsourcing/TaskAggregate.scala index 5fd5875..6b27c5f 100644 --- a/server/task/src/main/scala/org/apache/james/task/eventsourcing/TaskAggregate.scala +++ b/server/task/src/main/scala/org/apache/james/task/eventsourcing/TaskAggregate.scala @@ -26,7 +26,7 @@ import org.apache.james.task.Task import org.apache.james.task.Task.Result import org.apache.james.task.TaskManager.Status -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class TaskAggregate private(val aggregateId: TaskAggregateId, private val history: History) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
