Skip to content

Commit

Permalink
chore(project): adjust imports to new packages
Browse files Browse the repository at this point in the history
- Move everything from io.zeebe to io.camunda.zeebe
- Disable sonarcloud from CI pipeline until its associated with new package id
- Copies some client creation code from test container into the test
  classes in IT and update tests, until test container is released with new package ids
  • Loading branch information
menski committed May 3, 2021
1 parent 77e4a13 commit 1edfe4f
Show file tree
Hide file tree
Showing 2,547 changed files with 14,277 additions and 14,227 deletions.
7 changes: 4 additions & 3 deletions Jenkinsfile
Expand Up @@ -100,7 +100,7 @@ pipeline {
// to simplify building the Docker image, we copy the distribution to a fixed
// filename that doesn't include the version
runMavenContainerCommand('cp dist/target/camunda-cloud-zeebe-*.tar.gz camunda-cloud-zeebe.tar.gz')
stash name: "zeebe-build", includes: "m2-repository/io/zeebe/*/${VERSION}/*"
stash name: "zeebe-build", includes: "m2-repository/io/camunda/zeebe/*/${VERSION}/*"
stash name: "zeebe-distro", includes: "camunda-cloud-zeebe.tar.gz"
}
}
Expand Down Expand Up @@ -132,6 +132,7 @@ pipeline {
when { not { expression { params.SKIP_VERIFY } } }
parallel {
stage('Analyse') {
when { expression { return false } } // disable SonarCloud until new artifact id is linked to project
steps {
timeout(time: longTimeoutMinutes, unit: 'MINUTES') {
runMavenContainerCommand('.ci/scripts/distribution/analyse-java.sh')
Expand Down Expand Up @@ -543,9 +544,9 @@ def checkCodeCoverage() {
execPattern: '**/*.exec',
classPattern: '**/target/classes',
sourcePattern: '**/src/main/java,**/generated-sources/protobuf/java,**/generated-sources/assertj-assertions,**/generated-sources/sbe',
exclusionPattern: '**/io/zeebe/gateway/protocol/**,'
exclusionPattern: '**/io/camunda/zeebe/gateway/protocol/**,'
+ '**/*Encoder.class,**/*Decoder.class,**/MetaAttribute.class,'
+ '**/io/zeebe/protocol/record/**/*Assert.class,**/io/zeebe/protocol/record/Assertions.class,', // classes from generated resources
+ '**/io/camunda/zeebe/protocol/record/**/*Assert.class,**/io/camunda/zeebe/protocol/record/Assertions.class,', // classes from generated resources
runAlways: true
)
zip zipFile: "test-coverage-reports.zip", archive: true, glob: '**/target/site/jacoco/**'
Expand Down
2 changes: 1 addition & 1 deletion README.md
@@ -1,7 +1,7 @@
# Zeebe.io - Workflow Engine for Microservices Orchestration


[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.zeebe/camunda-cloud-zeebe/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.zeebe/camunda-cloud-zeebe)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.camunda.zeebe/camunda-cloud-zeebe/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.camunda.zeebe/camunda-cloud-zeebe)

Zeebe provides visibility into and control over business processes that span multiple microservices.

Expand Down
16 changes: 8 additions & 8 deletions atomix/cluster/pom.xml
Expand Up @@ -22,22 +22,22 @@
<dependencies>
<dependency>
<artifactId>atomix-utils</artifactId>
<groupId>io.zeebe</groupId>
<groupId>io.camunda.zeebe</groupId>
</dependency>
<dependency>
<artifactId>zeebe-util</artifactId>
<groupId>io.zeebe</groupId>
<groupId>io.camunda.zeebe</groupId>
</dependency>
<dependency>
<artifactId>zeebe-protocol</artifactId>
<groupId>io.zeebe</groupId>
<groupId>io.camunda.zeebe</groupId>
</dependency>
<dependency>
<groupId>io.zeebe</groupId>
<groupId>io.camunda.zeebe</groupId>
<artifactId>zeebe-snapshots</artifactId>
</dependency>
<dependency>
<groupId>io.zeebe</groupId>
<groupId>io.camunda.zeebe</groupId>
<artifactId>zeebe-journal</artifactId>
</dependency>
<dependency>
Expand Down Expand Up @@ -110,7 +110,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.zeebe</groupId>
<groupId>io.camunda.zeebe</groupId>
<artifactId>zeebe-test-util</artifactId>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -172,7 +172,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.zeebe</groupId>
<groupId>io.camunda.zeebe</groupId>
<artifactId>zeebe-journal</artifactId>
<scope>test</scope>
<version>${parent.version}</version>
Expand All @@ -186,7 +186,7 @@

<parent>
<artifactId>atomix-parent</artifactId>
<groupId>io.zeebe</groupId>
<groupId>io.camunda.zeebe</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>

Expand Down
Expand Up @@ -24,7 +24,7 @@
import io.atomix.raft.storage.log.RaftLog;
import io.atomix.raft.storage.log.RaftLogReader;
import io.atomix.raft.storage.log.RaftLogReader.Mode;
import io.zeebe.snapshots.SnapshotChunkReader;
import io.camunda.zeebe.snapshots.SnapshotChunkReader;
import java.nio.ByteBuffer;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
import org.slf4j.LoggerFactory;
Expand Down
Expand Up @@ -56,8 +56,8 @@
import io.atomix.utils.concurrent.ThreadContext;
import io.atomix.utils.logging.ContextualLoggerFactory;
import io.atomix.utils.logging.LoggerContext;
import io.zeebe.snapshots.PersistedSnapshot;
import io.zeebe.snapshots.ReceivableSnapshotStore;
import io.camunda.zeebe.snapshots.PersistedSnapshot;
import io.camunda.zeebe.snapshots.ReceivableSnapshotStore;
import java.time.Duration;
import java.util.Objects;
import java.util.Random;
Expand Down
Expand Up @@ -40,7 +40,7 @@
import io.atomix.utils.memory.MemorySize;
import io.atomix.utils.serializer.Namespace;
import io.atomix.utils.serializer.Namespaces;
import io.zeebe.snapshots.ReceivableSnapshotStoreFactory;
import io.camunda.zeebe.snapshots.ReceivableSnapshotStoreFactory;
import java.io.File;
import java.time.Duration;
import java.util.ArrayList;
Expand Down
Expand Up @@ -18,7 +18,7 @@

import com.esotericsoftware.kryo.serializers.FieldSerializer.Optional;
import io.atomix.utils.memory.MemorySize;
import io.zeebe.snapshots.ReceivableSnapshotStoreFactory;
import io.camunda.zeebe.snapshots.ReceivableSnapshotStoreFactory;

/** Raft storage configuration. */
public class RaftStorageConfig {
Expand Down
Expand Up @@ -39,8 +39,8 @@
import io.atomix.utils.logging.ContextualLoggerFactory;
import io.atomix.utils.logging.LoggerContext;
import io.atomix.utils.serializer.Serializer;
import io.zeebe.snapshots.PersistedSnapshotStore;
import io.zeebe.snapshots.ReceivableSnapshotStore;
import io.camunda.zeebe.snapshots.PersistedSnapshotStore;
import io.camunda.zeebe.snapshots.ReceivableSnapshotStore;
import java.io.IOException;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
Expand Down
Expand Up @@ -36,9 +36,9 @@
import io.atomix.raft.storage.log.PersistedRaftRecord;
import io.atomix.utils.logging.ContextualLoggerFactory;
import io.atomix.utils.logging.LoggerContext;
import io.zeebe.snapshots.PersistedSnapshot;
import io.zeebe.snapshots.SnapshotChunk;
import io.zeebe.snapshots.SnapshotChunkReader;
import io.camunda.zeebe.snapshots.PersistedSnapshot;
import io.camunda.zeebe.snapshots.SnapshotChunk;
import io.camunda.zeebe.snapshots.SnapshotChunkReader;
import java.io.UncheckedIOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
Expand Down
Expand Up @@ -50,8 +50,8 @@
import io.atomix.raft.zeebe.ZeebeLogAppender;
import io.atomix.utils.concurrent.Futures;
import io.atomix.utils.concurrent.Scheduled;
import io.zeebe.journal.JournalException;
import io.zeebe.snapshots.PersistedSnapshotListener;
import io.camunda.zeebe.journal.JournalException;
import io.camunda.zeebe.snapshots.PersistedSnapshotListener;
import java.nio.ByteBuffer;
import java.time.Duration;
import java.time.Instant;
Expand Down
Expand Up @@ -37,12 +37,12 @@
import io.atomix.raft.storage.log.RaftLog;
import io.atomix.raft.storage.log.RaftLogReader;
import io.atomix.utils.concurrent.ThreadContext;
import io.zeebe.journal.JournalException;
import io.zeebe.journal.JournalException.InvalidChecksum;
import io.zeebe.journal.JournalException.InvalidIndex;
import io.zeebe.snapshots.PersistedSnapshot;
import io.zeebe.snapshots.PersistedSnapshotListener;
import io.zeebe.snapshots.ReceivedSnapshot;
import io.camunda.zeebe.journal.JournalException;
import io.camunda.zeebe.journal.JournalException.InvalidChecksum;
import io.camunda.zeebe.journal.JournalException.InvalidIndex;
import io.camunda.zeebe.snapshots.PersistedSnapshot;
import io.camunda.zeebe.snapshots.PersistedSnapshotListener;
import io.camunda.zeebe.snapshots.ReceivedSnapshot;
import java.nio.ByteBuffer;
import java.util.concurrent.CompletableFuture;
import org.agrona.concurrent.UnsafeBuffer;
Expand Down
Expand Up @@ -7,10 +7,10 @@
*/
package io.atomix.raft.snapshot;

import io.zeebe.protocol.record.MessageHeaderDecoder;
import io.zeebe.protocol.record.MessageHeaderEncoder;
import io.zeebe.util.buffer.BufferReader;
import io.zeebe.util.buffer.BufferWriter;
import io.camunda.zeebe.protocol.record.MessageHeaderDecoder;
import io.camunda.zeebe.protocol.record.MessageHeaderEncoder;
import io.camunda.zeebe.util.buffer.BufferReader;
import io.camunda.zeebe.util.buffer.BufferWriter;
import java.nio.ByteBuffer;
import org.agrona.DirectBuffer;
import org.agrona.MutableDirectBuffer;
Expand Down
Expand Up @@ -17,8 +17,8 @@
package io.atomix.raft.snapshot.impl;

import io.atomix.raft.snapshot.SbeBufferWriterReader;
import io.zeebe.snapshots.SnapshotChunk;
import io.zeebe.util.buffer.BufferUtil;
import io.camunda.zeebe.snapshots.SnapshotChunk;
import io.camunda.zeebe.util.buffer.BufferUtil;
import org.agrona.DirectBuffer;
import org.agrona.MutableDirectBuffer;
import org.agrona.concurrent.UnsafeBuffer;
Expand Down
Expand Up @@ -22,8 +22,8 @@

import io.atomix.raft.storage.log.RaftLog;
import io.atomix.raft.storage.system.MetaStore;
import io.zeebe.snapshots.PersistedSnapshotStore;
import io.zeebe.snapshots.ReceivableSnapshotStore;
import io.camunda.zeebe.snapshots.PersistedSnapshotStore;
import io.camunda.zeebe.snapshots.ReceivableSnapshotStore;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
Expand Down
Expand Up @@ -20,7 +20,7 @@

import io.atomix.raft.storage.log.entry.ApplicationEntry;
import io.atomix.raft.storage.log.entry.RaftEntry;
import io.zeebe.journal.JournalRecord;
import io.camunda.zeebe.journal.JournalRecord;
import java.util.Objects;

/** Indexed journal entry. */
Expand Down
Expand Up @@ -15,7 +15,7 @@
*/
package io.atomix.raft.storage.log;

import io.zeebe.journal.JournalRecord;
import io.camunda.zeebe.journal.JournalRecord;
import org.agrona.DirectBuffer;
import org.agrona.concurrent.UnsafeBuffer;

Expand Down
Expand Up @@ -23,8 +23,8 @@
import io.atomix.raft.storage.log.entry.RaftLogEntry;
import io.atomix.raft.storage.serializer.RaftEntrySBESerializer;
import io.atomix.raft.storage.serializer.RaftEntrySerializer;
import io.zeebe.journal.Journal;
import io.zeebe.journal.JournalRecord;
import io.camunda.zeebe.journal.Journal;
import io.camunda.zeebe.journal.JournalRecord;
import java.io.Closeable;
import org.agrona.CloseHelper;
import org.agrona.ExpandableArrayBuffer;
Expand Down
Expand Up @@ -15,9 +15,9 @@
*/
package io.atomix.raft.storage.log;

import io.zeebe.journal.Journal;
import io.zeebe.journal.file.SegmentedJournal;
import io.zeebe.journal.file.SegmentedJournalBuilder;
import io.camunda.zeebe.journal.Journal;
import io.camunda.zeebe.journal.file.SegmentedJournal;
import io.camunda.zeebe.journal.file.SegmentedJournalBuilder;
import java.io.File;

public class RaftLogBuilder implements io.atomix.utils.Builder<RaftLog> {
Expand Down
Expand Up @@ -19,8 +19,8 @@
import io.atomix.raft.storage.log.entry.RaftLogEntry;
import io.atomix.raft.storage.serializer.RaftEntrySBESerializer;
import io.atomix.raft.storage.serializer.RaftEntrySerializer;
import io.zeebe.journal.JournalReader;
import io.zeebe.journal.JournalRecord;
import io.camunda.zeebe.journal.JournalReader;
import io.camunda.zeebe.journal.JournalRecord;
import java.util.NoSuchElementException;

/** Raft log reader. */
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
package io.atomix.cluster.messaging.impl;

import static io.zeebe.test.util.TestUtil.waitUntil;
import static io.camunda.zeebe.test.util.TestUtil.waitUntil;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;

Expand Down
Expand Up @@ -31,7 +31,7 @@
import io.atomix.cluster.messaging.MessagingConfig;
import io.atomix.cluster.messaging.MessagingService;
import io.atomix.utils.net.Address;
import io.zeebe.test.util.socket.SocketUtil;
import io.camunda.zeebe.test.util.socket.SocketUtil;
import java.net.ConnectException;
import java.time.Duration;
import java.util.Arrays;
Expand Down
Expand Up @@ -24,7 +24,7 @@
import io.atomix.cluster.messaging.ManagedUnicastService;
import io.atomix.cluster.messaging.MessagingConfig;
import io.atomix.utils.net.Address;
import io.zeebe.test.util.socket.SocketUtil;
import io.camunda.zeebe.test.util.socket.SocketUtil;
import net.jodah.concurrentunit.ConcurrentTestCase;
import org.junit.After;
import org.junit.Before;
Expand Down
Expand Up @@ -29,7 +29,7 @@
import io.atomix.raft.storage.log.RaftLogReader.Mode;
import io.atomix.raft.zeebe.NoopEntryValidator;
import io.atomix.raft.zeebe.ZeebeLogAppender.AppendListener;
import io.zeebe.util.collection.Tuple;
import io.camunda.zeebe.util.collection.Tuple;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
Expand Down
8 changes: 4 additions & 4 deletions atomix/cluster/src/test/java/io/atomix/raft/RaftRule.java
Expand Up @@ -40,10 +40,10 @@
import io.atomix.utils.AbstractIdentifier;
import io.atomix.utils.concurrent.SingleThreadContext;
import io.atomix.utils.concurrent.ThreadContext;
import io.zeebe.snapshots.PersistedSnapshot;
import io.zeebe.snapshots.PersistedSnapshotListener;
import io.zeebe.snapshots.PersistedSnapshotStore;
import io.zeebe.util.FileUtil;
import io.camunda.zeebe.snapshots.PersistedSnapshot;
import io.camunda.zeebe.snapshots.PersistedSnapshotListener;
import io.camunda.zeebe.snapshots.PersistedSnapshotStore;
import io.camunda.zeebe.util.FileUtil;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
Expand Down
4 changes: 2 additions & 2 deletions atomix/cluster/src/test/java/io/atomix/raft/RaftTest.java
Expand Up @@ -51,8 +51,8 @@
import io.atomix.raft.zeebe.ZeebeLogAppender;
import io.atomix.utils.concurrent.SingleThreadContext;
import io.atomix.utils.concurrent.ThreadContext;
import io.zeebe.journal.file.LogCorrupter;
import io.zeebe.journal.file.record.CorruptedLogException;
import io.camunda.zeebe.journal.file.LogCorrupter;
import io.camunda.zeebe.journal.file.record.CorruptedLogException;
import java.io.File;
import java.nio.ByteBuffer;
import java.nio.file.Path;
Expand Down
Expand Up @@ -16,7 +16,7 @@
package io.atomix.raft;

import io.atomix.cluster.MemberId;
import io.zeebe.util.FileUtil;
import io.camunda.zeebe.util.FileUtil;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
Expand Down
Expand Up @@ -22,7 +22,7 @@
import io.atomix.raft.storage.log.entry.InitialEntry;
import io.atomix.raft.zeebe.EntryValidator;
import io.atomix.raft.zeebe.ValidationResult;
import io.zeebe.test.util.TestUtil;
import io.camunda.zeebe.test.util.TestUtil;
import java.util.Collection;
import java.util.function.BiFunction;
import org.junit.Rule;
Expand Down
Expand Up @@ -18,7 +18,7 @@

import io.atomix.cluster.MemberId;
import io.atomix.utils.concurrent.Futures;
import io.zeebe.util.collection.Tuple;
import io.camunda.zeebe.util.collection.Tuple;
import java.net.ConnectException;
import java.util.LinkedList;
import java.util.Map;
Expand Down
Expand Up @@ -40,8 +40,8 @@
import io.atomix.raft.zeebe.ZeebeLogAppender.AppendListener;
import io.atomix.raft.zeebe.util.TestAppender;
import io.atomix.utils.concurrent.SingleThreadContext;
import io.zeebe.journal.JournalException;
import io.zeebe.snapshots.ReceivableSnapshotStore;
import io.camunda.zeebe.journal.JournalException;
import io.camunda.zeebe.snapshots.ReceivableSnapshotStore;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.time.Duration;
Expand Down
Expand Up @@ -31,10 +31,10 @@
import io.atomix.raft.storage.log.IndexedRaftLogEntry;
import io.atomix.raft.storage.log.PersistedRaftRecord;
import io.atomix.raft.storage.log.RaftLog;
import io.zeebe.journal.JournalException;
import io.zeebe.journal.JournalException.InvalidChecksum;
import io.zeebe.snapshots.PersistedSnapshot;
import io.zeebe.snapshots.ReceivableSnapshotStore;
import io.camunda.zeebe.journal.JournalException;
import io.camunda.zeebe.journal.JournalException.InvalidChecksum;
import io.camunda.zeebe.snapshots.PersistedSnapshot;
import io.camunda.zeebe.snapshots.ReceivableSnapshotStore;
import java.io.IOException;
import java.util.List;
import java.util.Optional;
Expand Down

0 comments on commit 1edfe4f

Please sign in to comment.