You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ie...@apache.org on 2020/06/30 22:23:49 UTC
[james-project] branch JAMES-3225-autobuild updated (39a400e ->
168cc76)
This is an automated email from the ASF dual-hosted git repository.
ieugen pushed a change to branch JAMES-3225-autobuild
in repository https://gitbox.apache.org/repos/asf/james-project.git.
discard 39a400e JAMES-3225 #comment First draft of Jenkinsfile
omit fc368f7 JAMES-3260 Fixed the build for mailrepository-memory
omit 5d56fe6 JAMES-3260 Reproducible tests for spring-jpa-tests
omit 66271f8 JAMES-3260 Some more build fixes
omit 2a9ae59 JAMES-3260 Fixed some dependency issues
omit 7fe123d JAMES-3260 Builds with some tests disables
omit 23ee9d1 JAMES-3260 Fixing test compilation and runinng
omit cd3049a JAMES-3260 We have compilation without tests
omit 23d311f JAMES-3260 Builds up to ':james-server:james-server-data-jmap:compileTestJava'
omit fa65831 JAMES-3260 Builds up to :':apache-james-mpt:apache-james-mpt-core:compileJava'.
omit 6789050 JAMES-3260 Builds up to :':apache-james-mpt:apache-james-mpt-core:compileJava'.
omit f0f8f26 JAMES-3260 Builds up to :apache-james-mailbox:apache-james-mailbox-lucene:compileJava
omit 058a90b JAMES-3260 Builds up to :apache-james-mailbox:apache-james-mailbox-jpa:compileJava
omit 4624f5a JAMES-3260 Builds up to :apache-james-mailbox:backup:compileJava
omit 1efa0ef JAMES-3260 Builds up to :apache-james-mailbox:apache-james-mailbox-cassandra:compileTestJava
omit 494cbb7 JAMES-3260 Builds up to :apache-james-mailbox:apache-james-mailbox-tools-quota-recompute:compileJava
omit 48f1c15 JAMES-3260 Builds up to :apache-james-mailbox:apache-james-mailbox-event-memory:compileJava
omit 3745c1f JAMES-3260 server/task-api fails
omit 238c847 JAMES-3260 Fixed builds for core, json and mdn
omit fbf9db5 JAMES-3260 Using Java 11 and removed custom repository
omit 796c31d JAMES-3260 #comment Added gradle config via gradle init
omit b5ac2a0 JAMES-3260 #comment Configured maven build scans
add 01e8055 JAMES-3269 Use moving average in MessageFastViewProjectionHealthCheck
add 0b7d1be JAMES-3269 Use SlidingWindowAverages
add 63287bf JAMES-3277 Don't read outbox mailbox for each message in SetMessagesUpdateProcessor
add d69c7e2 JAMES-3271 Fixing various checkstyle errors in test classes
add 5c87926 JAMES-3277 Rewrite AbstractMessageIdManagerStorageTest::setInMailboxesShouldIgnoreMessagesBelongingToOtherUsers
add 36c7e23 JAMES-3277 Add a test about limiting mailboxes reads for StoreMessageIdManager::setInMailboxes
add 901517e JAMES-3277 QuotaRootResolver should resolve quotaRoot for a mailbox
add 08ffc8e JAMES-3277 Move StoreRightManager::myRights for Mailbox to the API
add 0f5e381 JAMES-3277 Rework MessageIdMapper APIs
add a7fdccb JAMES-3277 Rework StoreMessageIdManager::setInMailboxes to limit mailbox reads
add 5d58792 JAMES-3260 #comment Configured maven build scans
add 9b6f8f5 JAMES-3260 #comment Added gradle config via gradle init
add 0ac0696 JAMES-3260 Using Java 11 and removed custom repository
add ce6d3f7 JAMES-3260 Fixed builds for core, json and mdn
add 477b752 JAMES-3260 server/task-api fails
add 3fb619b JAMES-3260 Builds up to :apache-james-mailbox:apache-james-mailbox-event-memory:compileJava
add 5c35d77 JAMES-3260 Builds up to :apache-james-mailbox:apache-james-mailbox-tools-quota-recompute:compileJava
add 9e1bc57 JAMES-3260 Builds up to :apache-james-mailbox:apache-james-mailbox-cassandra:compileTestJava
add f474d88 JAMES-3260 Builds up to :apache-james-mailbox:backup:compileJava
add 1efac96 JAMES-3260 Builds up to :apache-james-mailbox:apache-james-mailbox-jpa:compileJava
add 25569e7 JAMES-3260 Builds up to :apache-james-mailbox:apache-james-mailbox-lucene:compileJava
add 1df3504 JAMES-3260 Builds up to :':apache-james-mpt:apache-james-mpt-core:compileJava'.
add 2d069d8 JAMES-3260 Builds up to :':apache-james-mpt:apache-james-mpt-core:compileJava'.
add 41d5f07 JAMES-3260 Builds up to ':james-server:james-server-data-jmap:compileTestJava'
add ebfc8f8 JAMES-3260 We have compilation without tests
add fb293ec JAMES-3260 Fixing test compilation and runinng
add 3aa7360 JAMES-3260 Builds with some tests disables
add 37aebcf JAMES-3260 Fixed some dependency issues
add 2152777 JAMES-3260 Some more build fixes
add 2c2f71f JAMES-3260 Reproducible tests for spring-jpa-tests
add d162a20 JAMES-3260 Fixed the build for mailrepository-memory
add 0408607 JAMES-3260 Fixed memory-guice build - removed guava:*-android version
add 91e6618 JAMES-3260 More test fixes
new e29d661 JAMES-3260 Removed guice from api
new 168cc76 JAMES-3225 #comment First draft of Jenkinsfile
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (39a400e)
\
N -- N -- N refs/heads/JAMES-3225-autobuild (168cc76)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cassandra/DockerCassandraSingleton.java | 2 +-
.../apache/james/backends/cassandra/Scenario.java | 3 +-
.../backends/cassandra/utils/PaggingTest.java | 1 +
.../james/backends/es/DockerElasticSearch.java | 2 +
.../backends/es/ElasticSearchClusterExtension.java | 9 +-
.../backends/es/ElasticSearchHealthCheckTest.java | 3 +-
.../backends/rabbitmq/DockerRabbitMQTestRule.java | 2 +-
.../james/backends/rabbitmq/RabbitMQExtension.java | 2 +-
.../rabbitmq/RabbitMQServerVersionTest.java | 1 +
build.gradle | 2 +
.../org/apache/james/core/MailAddressTest.java | 2 +-
gradle/wrapper/gradle-wrapper.properties | 4 +-
.../org/apache/james/dto/FirstDomainObject.java | 8 +-
.../java/org/apache/james/dto/FirstNestedType.java | 10 +-
.../org/apache/james/dto/SecondDomainObject.java | 8 +-
.../org/apache/james/dto/SecondNestedType.java | 8 +-
.../org/apache/james/mailbox/RightManager.java | 14 ++
.../james/mailbox/quota/QuotaRootResolver.java | 2 +
.../james/mailbox/fixture/MailboxFixture.java | 1 +
.../apache/james/mailbox/model/MailboxACLTest.java | 1 +
.../mailbox/backup/ZipArchivesLoaderTest.java | 7 +-
.../apache/james/mailbox/backup/ZipAssertTest.java | 5 +-
.../james/mailbox/backup/ZipEntryTypeContract.java | 2 +-
.../cassandra/mail/CassandraMessageIdMapper.java | 17 +-
.../cassandra/CassandraMailboxManagerTest.java | 2 +-
.../CassandraMessageIdManagerSideEffectTest.java | 27 +++
.../mail/CassandraApplicableFlagDAOTest.java | 1 +
.../cassandra/mail/CassandraMessageDAOTest.java | 2 -
.../cassandra/mail/CassandraMessageIdDAOTest.java | 1 +
.../cassandra/mail/CassandraMessageMapperTest.java | 2 +-
.../SolveMessageInconsistenciesServiceTest.java | 1 -
mailbox/elasticsearch/build.gradle | 8 +
...asticSearchListeningMessageSearchIndexTest.java | 2 +-
.../mailbox/elasticsearch/json/MimePartTest.java | 3 +-
.../query/DateResolutionFormatterTest.java | 2 -
.../events/delivery/InVmEventDeliveryTest.java | 1 -
.../mailbox/events/LocalListenerRegistryTest.java | 12 +-
.../james/mailbox/events/RabbitMQEventBusTest.java | 1 +
.../org/apache/james/event/json/dtos/UserTest.java | 1 -
.../inmemory/mail/InMemoryMessageIdMapper.java | 4 +-
.../InMemoryCombinationManagerTestSystem.java | 1 -
.../inmemory/InMemoryMessageManagerTestSystem.java | 1 -
.../james/vault/metadata/UserPerBucketDAOTest.java | 1 -
.../james/vault/DeletedMessageZipperTest.java | 2 +-
.../blob/BlobStoreDeletedMessageVaultTest.java | 2 +-
.../dto/query/QueryElementSerializerTest.java | 1 +
.../james/vault/dto/query/QueryTranslatorTest.java | 13 +-
.../mailbox/quota/model/QuotaThresholdsTest.java | 1 +
.../elasticsearch/UserRoutingKeyFactoryTest.java | 1 -
.../mailbox/store/MessageMovesWithMailbox.java | 152 +++++++++++++++++
.../james/mailbox/store/StoreMailboxManager.java | 5 +
.../james/mailbox/store/StoreMessageIdManager.java | 186 +++++++++++++--------
.../james/mailbox/store/StoreRightManager.java | 1 +
.../james/mailbox/store/mail/MessageIdMapper.java | 8 +-
.../store/quota/DefaultUserQuotaRootResolver.java | 5 +
.../AbstractMessageIdManagerSideEffectTest.java | 20 +--
.../store/AbstractMessageIdManagerStorageTest.java | 61 ++++---
.../mailbox/store/MessageManagerTestSystem.java | 1 -
.../store/mail/model/MessageIdMapperTest.java | 26 +--
.../ListeningMessageSearchIndexContract.java | 2 +
.../tools/indexer/CassandraReIndexerImplTest.java | 2 +-
.../RecomputeCurrentQuotasServiceContract.java | 5 +
.../transport/mailets/ICALToJsonAttributeTest.java | 3 +-
.../james/transport/matchers/HasExceptionTest.java | 1 -
.../transport/matchers/RecipientIsLocalTest.java | 5 +-
.../java/org/apache/james/metrics/api/Metric.java | 11 ++
.../james/metrics/dropwizard/DropWizardMetric.java | 23 ++-
.../dropwizard/DropWizardMetricFactory.java | 5 +-
.../metrics/dropwizard/DropWizardMetricTest.java | 2 +-
mpt/impl/imap-mailbox/cyrus/build.gradle | 9 +-
mpt/impl/imap-mailbox/external-james/build.gradle | 4 +-
.../cassandra-rabbitmq-object-storage/build.gradle | 1 -
mpt/impl/smtp/cassandra/build.gradle | 3 +-
.../decode/parser/SelectCommandParserTest.java | 1 -
.../AbstractMailboxSelectionRequestTest.java | 2 +-
.../UnpooledStatusResponseFactoryTest.java | 1 -
.../processor/base/SelectedMailboxImplTest.java | 2 +-
.../imap/processor/base/UidMsnConverterTest.java | 3 +-
.../blob/api/BucketDumbBlobStoreContract.java | 1 -
.../blob/api/MetricableBlobStoreContract.java | 1 -
.../blob/api/ReadSaveDumbBlobStoreContract.java | 2 +-
.../blob/cassandra/CassandraBlobStoreTest.java | 1 +
.../blob/cassandra/cache/CachedBlobStoreTest.java | 2 +-
.../cache/CassandraBlobStoreCacheTest.java | 6 +-
.../cache/CassandraCacheConfigurationTest.java | 20 +--
.../blob/cassandra/utils/DataChunkerTest.java | 4 +-
.../james/blob/memory/MemoryBlobStoreTest.java | 1 -
server/blob/blob-objectstorage/build.gradle | 3 +-
server/container/cli-integration/build.gradle | 41 ++---
.../guice/blob-objectstorage-guice/build.gradle | 18 +-
.../org/apache/james/CassandraNodeConfTest.java | 1 +
.../guice/cassandra-rabbitmq-guice/build.gradle | 15 +-
.../cassandra-rabbitmq-ldap-guice/build.gradle | 15 +-
server/container/guice/guice-common/build.gradle | 13 +-
.../org/apache/james/AggregateJunitExtension.java | 1 +
.../org/apache/james/GuiceModuleTestExtension.java | 4 +-
.../apache/james/MailsShouldBeWellReceived.java | 2 +-
server/container/guice/jpa-guice/build.gradle | 4 +
.../container/guice/jpa-smtp-common/build.gradle | 1 +
.../container/guice/jpa-smtp-mariadb/build.gradle | 1 +
server/container/guice/jpa-smtp/build.gradle | 5 +-
server/container/guice/mailbox/build.gradle | 1 -
.../mailbox/PreDeletionHookLoaderImplTest.java | 2 -
server/container/guice/memory-guice/build.gradle | 4 +-
.../dlp/api/DLPConfigurationStoreContract.java | 1 +
.../apache/james/rrt/lib/CanSendFromContract.java | 2 +-
.../apache/james/rrt/lib/DomainRewriterTest.java | 1 -
.../apache/james/rrt/lib/MappingSourceTest.java | 1 -
.../apache/james/rrt/lib/ReplaceRewriterTest.java | 1 -
.../cassandra/CassandraUsersRepositoryTest.java | 2 +-
server/data/data-jmap/build.gradle | 2 +
.../MessageFastViewProjectionHealthCheck.java | 17 +-
.../api/filtering/FilteringAggregateIdTest.java | 1 -
.../MessageFastViewProjectionHealthCheckTest.java | 15 +-
server/data/data-jpa/build.gradle | 1 +
.../rrt/jpa/JPARecipientRewriteTableTest.java | 101 ++++++-----
.../java/org/apache/james/rrt/jpa/JPAStepdefs.java | 1 +
.../james/sieve/jpa/JpaSieveRepositoryTest.java | 1 -
.../james/user/jpa/JpaUsersRepositoryTest.java | 2 +-
.../user/ldap/ReadOnlyUsersLDAPRepositoryTest.java | 2 +-
.../apache/james/rrt/memory/InMemoryStepdefs.java | 1 +
.../user/memory/MemoryUsersRepositoryTest.java | 2 +-
.../apache/james/jdkim/mailets/DKIMSignTest.java | 8 +-
.../apache/james/jdkim/mailets/DKIMVerifyTest.java | 1 -
server/mailet/integration-testing/build.gradle | 5 +-
.../james/mailets/AddDeliveredToHeaderTest.java | 2 +-
.../james/mailets/BounceIntegrationTest.java | 6 +-
.../mailets/CommonMailetConfigurationTest.java | 2 +-
.../apache/james/mailets/DKIMIntegrationTest.java | 2 +-
...ectResolutionRemoteDeliveryIntegrationTest.java | 2 +-
.../GatewayRemoteDeliveryIntegrationTest.java | 2 +-
.../org/apache/james/mailets/MailetErrorsTest.java | 2 +-
.../mailets/NetworkMatcherIntegrationTest.java | 2 +-
.../RecipientRewriteTableIntegrationTest.java | 2 +-
.../james/mailets/RemoteDeliveryErrorTest.java | 2 +-
.../mailets/SenderIsLocalIntegrationTest.java | 2 +-
.../org/apache/james/mailets/SieveDelivery.java | 2 +-
.../james/mailets/SmtpAuthIntegrationTest.java | 2 +-
.../crypto/SMIMEDecryptIntegrationTest.java | 2 +-
.../mailets/crypto/SMIMESignIntegrationTest.java | 2 +-
.../james/smtp/SmtpAuthorizedAddressesTest.java | 2 +-
.../org/apache/james/smtp/SmtpContentTypeTest.java | 2 +-
.../org/apache/james/smtp/SmtpNullSenderTest.java | 2 +-
.../apache/james/smtp/SmtpRandomStoringTest.java | 2 +-
.../james/smtp/extensions/SMTPHeloHooksTest.java | 2 +-
.../james/smtp/extensions/StaticInputChecker.java | 3 +-
.../james/transport/mailets/AddFooterTest.java | 2 +-
.../james/transport/mailets/AliasMappingTest.java | 2 +-
.../mailets/AmqpForwardAttachmentTest.java | 2 +-
.../transport/mailets/ContactExtractorTest.java | 2 +-
.../transport/mailets/DlpIntegrationTest.java | 2 +-
.../james/transport/mailets/DomainMappingTest.java | 2 +-
.../transport/mailets/GroupMappingRelayTest.java | 2 +-
.../james/transport/mailets/GroupMappingTest.java | 2 +-
.../mailets/ICSAttachmentWorkflowTest.java | 2 +-
.../transport/mailets/IsOverQuotaMatcherTest.java | 2 +-
.../mailets/NoClassDefFoundErrorMatcher.java | 1 -
.../james/transport/mailets/SpamAssassinTest.java | 2 +-
.../transport/mailets/StripAttachmentTest.java | 2 +-
.../james/transport/mailets/ToRepositoryTest.java | 2 +-
.../mailets/ToSenderDomainRepositoryTest.java | 2 +-
.../org/apache/james/mock/smtp/server/Fixture.java | 1 +
.../smtp/server/HTTPConfigurationServerTest.java | 2 +-
.../mock/smtp/server/model/ConditionTest.java | 4 +-
.../mailrepository-memory/build.gradle | 10 ++
.../build.gradle | 6 +-
.../build.gradle | 2 +
.../org/apache/james/jmap/MessageAppender.java | 4 +-
.../integration/GetMessageListMethodTest.java | 4 +-
.../methods/integration/SetMessagesMethodTest.java | 2 +-
.../methods/integration/SpamAssassinContract.java | 2 +-
.../methods/integration/SpamAssassinModule.java | 1 -
.../methods/integration/cucumber/MainStepdefs.java | 2 +-
.../build.gradle | 4 +-
.../jmap/memory/MemoryVacationIntegrationTest.java | 4 +-
.../memory/MemoryVacationRelayIntegrationTest.java | 4 +-
.../build.gradle | 10 +-
.../RabbitMQSetMailboxesMethodCucumberTest.java | 1 -
.../RabbitMQSetMessagesMethodCucumberTest.java | 1 -
.../cucumber/awss3/RabbitMQUploadCucumberTest.java | 1 -
server/protocols/jmap-draft/build.gradle | 1 +
server/protocols/jmap-draft/pom.xml | 4 +
.../draft/methods/SetMessagesUpdateProcessor.java | 46 +++--
.../methods/GetVacationResponseMethodTest.java | 2 +-
.../draft/methods/MIMEMessageConverterTest.java | 2 -
.../jmap/draft/methods/RequestHandlerTest.java | 1 -
.../jmap/draft/methods/SetMailboxesMethodTest.java | 2 +-
.../methods/SetVacationResponseMethodTest.java | 3 +-
.../draft/model/mailbox/MailboxNamespaceTest.java | 1 -
.../jmap/draft/utils/FilterToCriteriaTest.java | 72 +++++---
.../jmap/http/JWTAuthenticationStrategyTest.java | 2 +-
.../ExtractMDNOriginalJMAPMessageIdTest.java | 1 -
.../james/jmap/mailet/VacationMailetTest.java | 1 +
.../jmap/mailet/filter/JMAPFilteringTest.java | 1 -
.../build.gradle | 10 +-
.../build.gradle | 1 +
.../build.gradle | 5 +-
server/protocols/jmap-rfc-8621/build.gradle | 1 +
.../build.gradle | 11 +-
.../memory-webadmin-integration-test/build.gradle | 4 +-
.../webadmin-integration-test-common/build.gradle | 3 +-
...ewProjectionHealthCheckIntegrationContract.java | 9 +-
...sandraMappingsSolveInconsistenciesTaskTest.java | 1 +
.../webadmin/authentication/JwtFilterTest.java | 4 +-
.../webadmin/routes/AddressMappingRoutesTest.java | 2 +-
.../james/webadmin/routes/UserRoutesTest.java | 2 +-
.../WebadminApiQuerySerializationContractTest.java | 54 +++---
.../webadmin/webadmin-mailbox/build.gradle | 2 -
...erializableReIndexingExecutionFailuresTest.java | 2 +-
.../routes/MailboxesRoutesNoTasksTest.java | 3 +-
.../james/webadmin/routes/MailboxesRoutesTest.java | 2 +-
.../service/DeleteMailsFromMailQueueTaskTest.java | 2 +-
...mMailQueueTaskAdditionalInformationDTOTest.java | 2 +-
.../james/queue/api/DelayedMailQueueContract.java | 1 +
.../apache/james/queue/api/MailQueueContract.java | 7 +-
.../james/queue/api/MailQueueFactoryTest.java | 2 -
.../queue/rabbitmq/RabbitMQMailQueueTest.java | 1 -
.../rabbitmq/RabbitMqMailQueueFactoryTest.java | 6 -
.../CassandraMailQueueViewTestFactory.java | 1 -
.../view/cassandra/configuration/DTOTest.java | 2 +-
.../james/task/MemoryReferenceWithCounterTask.java | 2 +-
...assandraTaskExecutionDetailsProjectionTest.java | 2 +-
.../RabbitMQWorkQueuePersistenceTest.java | 8 +-
.../EventSourcingTaskManagerTest.java | 13 +-
.../task/eventsourcing/TaskAggregateTest.java | 5 +-
.../TerminationSubscriberContract.java | 1 -
.../org/apache/james/linshare/CombinedDecoder.java | 3 +-
.../james/linshare/LinshareConfigurationTest.java | 8 +-
.../org/apache/james/linshare/LinshareFixture.java | 3 +-
.../org/apache/james/linshare/LinshareTest.java | 2 +-
230 files changed, 963 insertions(+), 600 deletions(-)
create mode 100644 mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageMovesWithMailbox.java
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 02/02: JAMES-3225 #comment First draft of
Jenkinsfile
Posted by ie...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ieugen pushed a commit to branch JAMES-3225-autobuild
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 168cc767ceb1aa6526a61c394bfdcd49e2f94338
Author: Eugen Stan <ie...@apache.org>
AuthorDate: Mon Jun 29 18:07:11 2020 +0300
JAMES-3225 #comment First draft of Jenkinsfile
* Build without tests
* Inspired from
** https://cwiki.apache.org/confluence/display/INFRA/Multibranch+Pipeline+recipes
** https://gitbox.apache.org/repos/asf?p=camel.git;a=blob;f=Jenkinsfile;h=2c6a0ae19e2365a36ae845c5256ea4a8d970150f;hb=HEAD
---
Jenkinsfile | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 78 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..8bafc55
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,78 @@
+#!groovy
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
+def JDK_NAME = env.JDK_NAME ?: 'JDK 11 (latest)'
+
+pipeline {
+
+ agent {
+ label AGENT_LABEL
+ }
+
+ environment {
+ CI=true
+ }
+
+ tools {
+ jdk JDK_NAME
+ }
+
+ options {
+ // Configure an overall timeout for the build of one hour.
+ timeout(time: 1, unit: 'HOURS')
+ // When we have test-fails e.g. we don't need to run the remaining steps
+ skipStagesAfterUnstable()
+ buildDiscarder(
+ logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
+ )
+ disableConcurrentBuilds()
+ }
+
+ stages {
+ stage('Build') {
+ steps {
+ sh "./gradlew clean build -x tests"
+ }
+ }
+ }
+
+ // Do any post build stuff ... such as sending emails depending on the overall build result.
+ post {
+ // If this build failed, send an email to the list.
+ failure {
+ echo "Failed "
+ }
+
+ // If this build didn't fail, but there were failing tests, send an email to the list.
+ unstable {
+ echo "Unstable "
+ }
+
+ // Send an email, if the last build was not successful and this one is.
+ success {
+ echo "Success "
+ }
+
+ always {
+ echo "Build done"
+ }
+ }
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 01/02: JAMES-3260 Removed guice from api
Posted by ie...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ieugen pushed a commit to branch JAMES-3225-autobuild
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit e29d661366781563f3d76814ff6d43a209069697
Author: Eugen Stan <ie...@apache.org>
AuthorDate: Wed Jul 1 01:21:20 2020 +0300
JAMES-3260 Removed guice from api
---
mpt/impl/smtp/cassandra/build.gradle | 3 ++-
.../guice/blob-objectstorage-guice/build.gradle | 16 +++++++++++-----
server/container/guice/guice-common/build.gradle | 3 +--
server/container/guice/jpa-guice/build.gradle | 1 +
server/container/guice/jpa-smtp-common/build.gradle | 1 +
server/container/guice/jpa-smtp-mariadb/build.gradle | 1 +
server/container/guice/jpa-smtp/build.gradle | 5 +++--
server/mailet/integration-testing/build.gradle | 1 +
.../build.gradle | 5 +++--
.../jmap-draft-integration-testing-common/build.gradle | 1 +
.../memory-jmap-draft-integration-testing/build.gradle | 1 +
.../rabbitmq-jmap-draft-integration-testing/build.gradle | 2 +-
.../build.gradle | 2 ++
.../memory-jmap-rfc-8621-integration-tests/build.gradle | 2 ++
.../distributed-webadmin-integration-test/build.gradle | 5 +++--
.../memory-webadmin-integration-test/build.gradle | 2 ++
.../webadmin-integration-test-common/build.gradle | 3 ++-
17 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/mpt/impl/smtp/cassandra/build.gradle b/mpt/impl/smtp/cassandra/build.gradle
index 8e176fe..861b3df 100644
--- a/mpt/impl/smtp/cassandra/build.gradle
+++ b/mpt/impl/smtp/cassandra/build.gradle
@@ -20,8 +20,9 @@ dependencies {
testImplementation project(':james-server:james-server-guice:james-server-guice-jmap')
testImplementation project(':james-server:james-server-util')
+ testImplementation 'com.google.inject:guice:4.2.2'
testImplementation 'org.apache.commons:commons-configuration2:2.7'
-
+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1'
diff --git a/server/container/guice/blob-objectstorage-guice/build.gradle b/server/container/guice/blob-objectstorage-guice/build.gradle
index b64447e..ca21911 100644
--- a/server/container/guice/blob-objectstorage-guice/build.gradle
+++ b/server/container/guice/blob-objectstorage-guice/build.gradle
@@ -11,19 +11,25 @@ configurations {
dependencies {
api project(':james-server:james-server-guice:blob-api-guice')
- api project(':james-server:james-server-blob:blob-objectstorage')
+ api(project(':james-server:james-server-blob:blob-objectstorage')){
+ exclude group: 'com.google.inject.extensions', module: 'guice-multibindings'
+ exclude group: 'com.google.inject', module: 'guice'
+ }
api project(':james-server:james-server-guice:james-server-guice-configuration')
implementation 'com.google.inject:guice:4.2.2'
implementation 'org.apache.commons:commons-configuration2:2.7'
- testImplementation project(path: ':james-server:james-server-blob:blob-objectstorage', configuration: 'tests')
+ testImplementation(project(path: ':james-server:james-server-blob:blob-objectstorage', configuration: 'tests')) {
+ exclude group: 'com.google.inject.extensions', module: 'guice-multibindings'
+ exclude group: 'com.google.inject', module: 'guice'
+ }
testImplementation project(path: ':james-server:james-server-guice:james-server-guice-common', configuration: 'tests')
testImplementation project(':james-server:james-server-testing')
- testImplementation 'com.google.inject:guice:4.2.2'
+// testImplementation 'com.google.inject:guice:4.2.2'
testImplementation 'org.assertj:assertj-core:3.12.2'
- testImplementation 'org.testcontainers:testcontainers:1.12.0'
+ testImplementation 'org.testcontainers:testcontainers:1.14.3'
testImplementation 'org.reactivestreams:reactive-streams:1.0.3'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
@@ -34,7 +40,7 @@ dependencies {
test {
useJUnitPlatform()
// ObjectStorageBlobStoreModuleTest Error in custom provider, java.lang.NoClassDefFoundError: com/google/inject/internal/util/$Maps
- enabled = false
+// enabled = false
}
description = 'Apache James :: Server :: Blob Store in object storage - guice injection'
diff --git a/server/container/guice/guice-common/build.gradle b/server/container/guice/guice-common/build.gradle
index cf4aee4..b056c50 100644
--- a/server/container/guice/guice-common/build.gradle
+++ b/server/container/guice/guice-common/build.gradle
@@ -33,10 +33,9 @@ dependencies {
api project(':metrics:metrics-api')
api project(':metrics:metrics-dropwizard')
- api 'com.google.inject:guice:4.2.2'
-
implementation 'com.github.steveash.guavate:guavate:1.0.0'
implementation 'com.google.guava:guava:25.1-jre'
+ implementation 'com.google.inject:guice:4.2.2'
implementation 'com.github.fge:throwing-lambdas:0.5.0'
implementation 'com.sun.mail:javax.mail:1.6.2'
implementation 'io.dropwizard.metrics:metrics-core:4.1.0'
diff --git a/server/container/guice/jpa-guice/build.gradle b/server/container/guice/jpa-guice/build.gradle
index 7b4cdc4..a008407 100644
--- a/server/container/guice/jpa-guice/build.gradle
+++ b/server/container/guice/jpa-guice/build.gradle
@@ -38,6 +38,7 @@ dependencies {
implementation 'ch.qos.logback:logback-classic:1.2.3'
implementation 'com.linagora:logback-elasticsearch-appender:1.8.0'
+ implementation 'com.google.inject:guice:4.2.2'
implementation 'org.apache.derby:derby:10.14.2.0'
implementation 'org.awaitility:awaitility:3.1.6'
diff --git a/server/container/guice/jpa-smtp-common/build.gradle b/server/container/guice/jpa-smtp-common/build.gradle
index 0c3833a..29b025b 100644
--- a/server/container/guice/jpa-smtp-common/build.gradle
+++ b/server/container/guice/jpa-smtp-common/build.gradle
@@ -21,6 +21,7 @@ dependencies {
implementation project(':james-server:james-server-guice:james-server-guice-webadmin-mailrepository')
implementation project(':james-server:james-server-guice:james-server-jpa-common-guice')
+ implementation 'com.google.inject:guice:4.2.2'
implementation 'com.linagora:logback-elasticsearch-appender:1.8.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
diff --git a/server/container/guice/jpa-smtp-mariadb/build.gradle b/server/container/guice/jpa-smtp-mariadb/build.gradle
index 5f1ca12..38749f5 100644
--- a/server/container/guice/jpa-smtp-mariadb/build.gradle
+++ b/server/container/guice/jpa-smtp-mariadb/build.gradle
@@ -20,6 +20,7 @@ dependencies {
testImplementation project(':james-server:james-server-guice:james-server-guice-smtp')
testImplementation project(':james-server:james-server-guice:james-server-jpa-common-guice')
+ testImplementation 'com.google.inject:guice:4.2.2'
testImplementation 'org.apache.derby:derby:10.14.2.0'
testImplementation 'org.assertj:assertj-core:3.12.2'
testImplementation 'org.testcontainers:mariadb:1.12.0'
diff --git a/server/container/guice/jpa-smtp/build.gradle b/server/container/guice/jpa-smtp/build.gradle
index 4599d7e..a3d3e63 100644
--- a/server/container/guice/jpa-smtp/build.gradle
+++ b/server/container/guice/jpa-smtp/build.gradle
@@ -22,10 +22,11 @@ dependencies {
testImplementation project(':james-server:james-server-guice:james-server-guice-common')
testImplementation project(':james-server:james-server-guice:james-server-guice-smtp')
- testImplementation 'org.apache.openjpa:openjpa:3.1.0'
+ testImplementation 'com.google.inject:guice:4.2.2'
testImplementation 'io.rest-assured:rest-assured:4.0.0'
- testImplementation 'org.awaitility:awaitility:3.1.6'
+ testImplementation 'org.apache.openjpa:openjpa:3.1.0'
testImplementation 'org.assertj:assertj-core:3.12.2'
+ testImplementation 'org.awaitility:awaitility:3.1.6'
testImplementation 'org.mockito:mockito-core:3.0.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
diff --git a/server/mailet/integration-testing/build.gradle b/server/mailet/integration-testing/build.gradle
index 46a1c62..bdcd65f 100644
--- a/server/mailet/integration-testing/build.gradle
+++ b/server/mailet/integration-testing/build.gradle
@@ -39,6 +39,7 @@ dependencies {
testImplementation project(':third-party:apache-james-spamassassin')
testImplementation 'commons-io:commons-io:2.6'
+ testImplementation 'com.google.inject:guice:4.2.2'
testImplementation 'com.jayway.jsonpath:json-path:2.4.0'
testImplementation 'com.rabbitmq:amqp-client:5.7.3'
testImplementation 'io.rest-assured:rest-assured:4.0.0'
diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/build.gradle b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/build.gradle
index bf3aaa7..24fc688 100644
--- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/build.gradle
+++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/build.gradle
@@ -34,17 +34,18 @@ dependencies {
testImplementation project(':james-server:james-server-util')
testImplementation project(':javax-mail-extension')
- testImplementation 'org.apache.james:apache-mime4j-dom:0.8.3'
testImplementation 'com.github.fge:throwing-lambdas:0.5.0'
+ testImplementation 'com.google.inject:guice:4.2.2'
testImplementation 'io.cucumber:cucumber-guice:2.4.0'
testImplementation 'io.cucumber:cucumber-java:2.4.0'
testImplementation 'io.cucumber:cucumber-junit:2.4.0'
testImplementation 'io.rest-assured:rest-assured:4.0.0'
testImplementation 'net.javacrumbs.json-unit:json-unit-assertj:2.8.0'
+ testImplementation 'org.apache.james:apache-mime4j-dom:0.8.3'
testImplementation 'org.apache.pdfbox:pdfbox:2.0.16'
+ testImplementation 'org.assertj:assertj-core:3.12.2'
testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0'
testImplementation 'org.testcontainers:testcontainers:1.12.0'
- testImplementation 'org.assertj:assertj-core:3.12.2'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1'
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/build.gradle b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/build.gradle
index f1ab01a..a603946 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/build.gradle
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/build.gradle
@@ -39,6 +39,7 @@ dependencies {
testImplementation 'com.github.fge:throwing-lambdas:0.5.0'
testImplementation 'com.github.steveash.guavate:guavate:1.0.0'
testImplementation 'com.google.guava:guava:25.1-jre'
+ testImplementation 'com.google.inject:guice:4.2.2'
testImplementation 'commons-io:commons-io:2.6'
testImplementation 'commons-net:commons-net:3.6'
testImplementation 'io.projectreactor:reactor-core:3.3.4.RELEASE'
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/build.gradle b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/build.gradle
index 70072de..de58fcc 100644
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/build.gradle
+++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/build.gradle
@@ -30,6 +30,7 @@ dependencies {
testImplementation project(':javax-mail-extension')
testImplementation project(':third-party:apache-james-spamassassin')
+ testImplementation 'com.google.inject:guice:4.2.2'
testImplementation 'com.google.guava:guava:25.1-jre'
testImplementation 'io.cucumber:cucumber-guice:2.4.0'
testImplementation 'io.cucumber:cucumber-java:2.4.0'
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/build.gradle b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/build.gradle
index 66fa7a4..079f42f 100644
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/build.gradle
+++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/build.gradle
@@ -28,7 +28,7 @@ dependencies {
testImplementation project(':james-server:james-server-testing')
testImplementation 'com.github.fge:throwing-lambdas:0.5.0'
- testImplementation 'com.google.inject:guice:3.0'
+ testImplementation 'com.google.inject:guice:4.2.2'
testImplementation 'io.cucumber:cucumber-guice:2.4.0'
testImplementation 'io.cucumber:cucumber-java:2.4.0'
testImplementation 'io.cucumber:cucumber-junit:2.4.0'
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/build.gradle b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/build.gradle
index fb92251..082b080 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/build.gradle
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/build.gradle
@@ -23,6 +23,8 @@ dependencies {
testImplementation project(':james-server:james-server-testing')
testImplementation project(':james-server:jmap-rfc-8621-integration-tests:jmap-rfc-8621-integration-tests-common')
+ testImplementation 'com.google.inject:guice:4.2.2'
+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1'
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/build.gradle b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/build.gradle
index 84283cc..7ed702c 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/build.gradle
+++ b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/build.gradle
@@ -15,6 +15,8 @@ dependencies {
testImplementation project(':james-server:james-server-guice:james-server-memory-guice')
testImplementation project(':james-server:jmap-rfc-8621-integration-tests:jmap-rfc-8621-integration-tests-common')
+ testImplementation 'com.google.inject:guice:4.2.2'
+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1'
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/build.gradle b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/build.gradle
index 0aa804f..9b3613d 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/build.gradle
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/build.gradle
@@ -27,10 +27,11 @@ dependencies {
testImplementation project(':james-server:james-server-webadmin-cassandra-data')
testImplementation project(':james-server:webadmin-integration-test:james-server-webadmin-integration-test-common')
- testImplementation 'org.apache.james:apache-mime4j-dom:0.8.3'
testImplementation 'com.datastax.cassandra:cassandra-driver-core:3.7.2'
+ testImplementation 'com.google.inject:guice:4.2.2'
testImplementation 'com.github.fge:throwing-lambdas:0.5.0'
testImplementation 'io.rest-assured:rest-assured:4.0.0'
+ testImplementation 'org.apache.james:apache-mime4j-dom:0.8.3'
testImplementation 'org.awaitility:awaitility:3.1.6'
testImplementation 'org.assertj:assertj-core:3.12.2'
@@ -44,7 +45,7 @@ dependencies {
test {
useJUnitPlatform()
failFast = true
- // RabbitMQForwardIntegrationTest Error in custom provider, java.lang.NoClassDefFoundError: com/google/inject/internal/util/$Maps
+ // RabbitMQForwardIntegrationTest Error in custom provider, java.lang.NoClassDefFoundError: com/google/inject/internal/util/$Maps
enabled = false
// maxParallelForks = Runtime.getRuntime().availableProcessors();
}
diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/build.gradle b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/build.gradle
index b58e17b..b0ec0a8 100644
--- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/build.gradle
+++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/build.gradle
@@ -18,6 +18,8 @@ dependencies {
testImplementation project(':james-server:webadmin-integration-test:james-server-webadmin-integration-test-common')
testImplementation project(path: ':james-server:james-server-guice:james-server-mailbox-plugin-deleted-messages-vault-guice', configuration: 'tests')
+ testImplementation 'com.google.inject:guice:4.2.2'
+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1'
diff --git a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/build.gradle b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/build.gradle
index b832b37..a44eebf 100644
--- a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/build.gradle
+++ b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/build.gradle
@@ -31,8 +31,9 @@ dependencies {
api project(':james-server:james-server-webadmin-swagger')
api project(path: ':third-party:apache-james-linshare', configuration: 'tests')
- implementation 'org.awaitility:awaitility:3.1.6'
+ implementation 'com.google.inject:guice:4.2.2'
implementation 'io.rest-assured:rest-assured:4.0.0'
+ implementation 'org.awaitility:awaitility:3.1.6'
implementation 'org.hamcrest:java-hamcrest:2.0.0.0'
implementation 'org.testcontainers:testcontainers:1.12.0'
implementation 'org.assertj:assertj-core:3.12.2'
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org