Resolve conflict with master

Author: trnguyencflt

.semaphore/semaphore.yml

@@ -37,14 +37,16 @@ blocks:
       jobs:
         - name: Test
           commands:
-            - . ci-tools ci-update-version
+            - . sem-pint -c
+            - ci-tools ci-update-version
             - mvn -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode --no-transfer-progress clean verify install dependency:analyze validate
             - . cache-maven store
       epilogue:
         always:
           commands:
             - . publish-test-results
             - artifact push workflow target/test-results
+            - artifact push workflow target
 
   - name: Release
     dependencies: ["Test"]
@@ -54,16 +56,11 @@ blocks:
       jobs:
         - name: Release
           commands:
-            - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-            - git fetch --unshallow || true
-            - pip install -q confluent-release-tools
-            - pint merge --check-all
-            - . ci-tools ci-update-version
-            - . ci-tools ci-push-tag
-            - mvn -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode -Pjenkins -DaltDeploymentRepository=confluent-codeartifact-internal::default::https://confluent-519856050701.d.codeartifact.us-west-2.amazonaws.com/maven/maven-snapshots/
+            - ci-tools ci-update-version
+            - ci-tools ci-push-tag
+            - mvn -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode -DaltDeploymentRepository=confluent-codeartifact-internal::default::https://confluent-519856050701.d.codeartifact.us-west-2.amazonaws.com/maven/maven-snapshots/
               -DrepositoryId=confluent-codeartifact-internal deploy -DskipTests
 
-
 after_pipeline:
   task:
     agent:
@@ -80,7 +77,8 @@ after_pipeline:
         commands:
           - checkout
           - sem-version java 11
-          - emit-sonarqube-data -a test-results
+          - artifact pull workflow target
+          - emit-sonarqube-data --run_only_sonar_scan
       - name: Trigger downstream projects
         commands:
           - >-

checkstyle/import_control.xml

@@ -130,20 +130,25 @@
   <allow class="javax.security.auth.login.Configuration" />
   <allow class="scala.Option" />
   <allow class="scala.collection.JavaConverters" />
+  <allow class="scala.collection.Seq" />
   <!-- b. Non-public Apache Kafka APIs -->
   <allow class="org.apache.kafka.clients.CommonClientConfigs" />
   <allow class="org.apache.kafka.common.config.types.Password" />
   <allow class="org.apache.kafka.common.network.ListenerName" />
   <allow class="org.apache.kafka.common.protocol.Errors" />
   <allow class="org.apache.kafka.common.security.JaasUtils" />
+  <allow class="org.apache.kafka.metadata.authorizer.StandardAuthorizer" />
   <allow class="org.apache.kafka.test.TestSslUtils" />
   <!-- c. Non-public Confluent Community Kafka APIs -->
   <allow class="kafka.admin.AclCommand" />
   <allow class="kafka.security.authorizer.AclAuthorizer" />
   <allow class="kafka.server.KafkaConfig" />
   <allow class="kafka.server.KafkaServer" />
+  <allow class="kafka.server.KafkaBroker" />
+  <allow class="kafka.server.QuorumTestHarness" />
   <allow class="kafka.utils.CoreUtils" />
   <allow class="kafka.utils.TestUtils" />
+  <allow class="kafka.utils.TestInfoUtils" />
   <allow class="kafka.zk.EmbeddedZookeeper" />
 
 </import-control>

kafka-rest/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-rest-parent</artifactId>
-        <version>7.6.1-0</version>
+        <version>7.7.0-0</version>
     </parent>
 
     <artifactId>kafka-rest</artifactId>
@@ -111,6 +111,11 @@
             <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka_${kafka.scala.version}</artifactId>
@@ -173,6 +178,11 @@
             <artifactId>jersey-apache-connector</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.xerial.snappy</groupId>
+            <artifactId>snappy-java</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 
@@ -235,16 +245,16 @@
                 </configuration>
             </plugin>
 
-	    <plugin>
-	        <groupId>com.diffplug.spotless</groupId>
-	        <artifactId>spotless-maven-plugin</artifactId>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
                 <executions>
-	            <execution>
-		        <goals>
-		            <goal>check</goal>
-		        </goals>
-		    </execution>
-	        </executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

kafka-rest/src/main/java/io/confluent/kafkarest/KafkaRestConfig.java

@@ -959,17 +959,25 @@ public KafkaRestConfig(Properties props) {
     this(config, props);
   }
 
+  public KafkaRestConfig(Properties props, boolean doLog) {
+    this(config, props, doLog);
+  }
+
   public KafkaRestConfig(ConfigDef configDef, Properties props) {
-    super(configDef, props);
-    metricsContext =
-        new KafkaRestMetricsContext(
-            getString(METRICS_JMX_PREFIX_CONFIG), originalsWithPrefix(METRICS_CONTEXT_PREFIX));
+    this(configDef, props, true);
   }
 
   public KafkaRestConfig(ConfigDef configDef, Properties props, Time time) {
     this(configDef, props);
   }
 
+  public KafkaRestConfig(ConfigDef configDef, Properties props, boolean doLog) {
+    super(configDef, props, doLog);
+    metricsContext =
+        new KafkaRestMetricsContext(
+            getString(METRICS_JMX_PREFIX_CONFIG), originalsWithPrefix(METRICS_CONTEXT_PREFIX));
+  }
+
   /**
    * Callers of this function are advised to use the return value as a configuration object as it
    * can hide sensitive information in logging.