Remove armeria-brave module

brave/brave5/build.gradle

@@ -13,13 +13,17 @@ dependencies {
 }
 
 def brave6ProjectDir = "${rootProject.projectDir}/brave/brave6"
-tasks.compileJava.source "${brave6ProjectDir}/src/main/java"
-tasks.processResources.from "${brave6ProjectDir}/src/main/resources"
-tasks.compileTestJava.source "${brave6ProjectDir}/src/test/java"
-tasks.processTestResources.from "${brave6ProjectDir}/src/test/resources"
-tasks.sourcesJar.from "${brave6ProjectDir}/src/main/java"
-tasks.sourcesJar.from "${brave6ProjectDir}/src/main/resources"
-tasks.javadoc.source "${brave6ProjectDir}/src/main/java"
+
+tasks.register('generateSources', Copy.class) {
+    from "${brave6ProjectDir}/src"
+    into "${project.ext.genSrcDir}"
+    exclude '**/package-info.java'
+}
+
+tasks.compileJava.dependsOn(generateSources)
+tasks.processResources.dependsOn(generateSources)
+tasks.compileTestJava.dependsOn(generateSources)
+tasks.processTestResources.dependsOn(generateSources)
 
 ext {
     testThriftSrcDirs = ["$brave6ProjectDir/src/test/thrift"]

brave/brave5/src/main/java/com/linecorp/armeria/client/brave/package-info.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2019 LINE Corporation
+ *
+ * LINE Corporation 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:
+ *
+ *   https://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.
+ */
+
+/**
+ * Distributed tracing services based on <a href="https://github.com/openzipkin/brave">Brave</a>,
+ * a Java tracing library compatible with <a href="http://zipkin.io/">Zipkin</a>.
+ *
+ * @deprecated Use armeria-brave6 module.
+ *             See <a href="https://armeria.dev/release-notes/1.28.0#%EF%B8%8F-breaking-changes">
+ *             1.28 Breaking Changes</a> for more information.
+ */
+@Deprecated
+@NonNullByDefault
+package com.linecorp.armeria.client.brave;
+
+import com.linecorp.armeria.common.annotation.NonNullByDefault;

brave/brave5/src/main/java/com/linecorp/armeria/common/brave/package-info.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2019 LINE Corporation
+ *
+ * LINE Corporation 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:
+ *
+ *   https://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.
+ */
+
+/**
+ * Distributed tracing services based on <a href="https://github.com/openzipkin/brave">Brave</a>,
+ * a Java tracing library compatible with <a href="http://zipkin.io/">Zipkin</a>.
+ *
+ * @deprecated Use armeria-brave6 module.
+ *             See <a href="https://armeria.dev/release-notes/1.28.0#%EF%B8%8F-breaking-changes">
+ *             1.28 Breaking Changes</a> for more information.
+ */
+@Deprecated
+@NonNullByDefault
+package com.linecorp.armeria.common.brave;
+
+import com.linecorp.armeria.common.annotation.NonNullByDefault;

brave/brave5/src/main/java/com/linecorp/armeria/internal/common/brave/package-info.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2019 LINE Corporation
+ *
+ * LINE Corporation 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:
+ *
+ *   https://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.
+ */
+
+/**
+ * Distributed tracing services based on <a href="https://github.com/openzipkin/brave">Brave</a>,
+ * a Java tracing library compatible with <a href="http://zipkin.io/">Zipkin</a>.
+ *
+ * @deprecated Use armeria-brave6 module.
+ *             See <a href="https://armeria.dev/release-notes/1.28.0#%EF%B8%8F-breaking-changes">
+ *             1.28 Breaking Changes</a> for more information.
+ */
+@Deprecated
+@NonNullByDefault
+package com.linecorp.armeria.internal.common.brave;
+
+import com.linecorp.armeria.common.annotation.NonNullByDefault;

brave/brave5/src/main/java/com/linecorp/armeria/server/brave/package-info.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2019 LINE Corporation
+ *
+ * LINE Corporation 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:
+ *
+ *   https://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.
+ */
+
+/**
+ * Distributed tracing services based on <a href="https://github.com/openzipkin/brave">Brave</a>,
+ * a Java tracing library compatible with <a href="http://zipkin.io/">Zipkin</a>.
+ *
+ * @deprecated Use armeria-brave6 module.
+ *             See <a href="https://armeria.dev/release-notes/1.28.0#%EF%B8%8F-breaking-changes">
+ *             1.28 Breaking Changes</a> for more information.
+ */
+@Deprecated
+@NonNullByDefault
+package com.linecorp.armeria.server.brave;
+
+import com.linecorp.armeria.common.annotation.NonNullByDefault;

dependencies.toml

@@ -9,7 +9,7 @@ assertj = "3.25.2"
 awaitility = "4.2.0"
 blockhound = "1.0.8.RELEASE"
 bouncycastle = "1.70"
-brave5 = "5.18.0"
+brave5 = "5.18.1"
 brave6 = "6.0.0"
 brotli4j = "1.15.0"
 bucket4j = "7.6.0"

settings.gradle

@@ -83,8 +83,6 @@ includeWithFlags ':version-catalog',                     'version-catalog'
 
 // Published Java projects
 includeWithFlags ':annotation-processor',                'java', 'publish', 'relocate'
-includeWithFlags ':brave',                               'java', 'publish', 'relocate', 'no_aggregation'
-project(':brave').projectDir = file('brave/brave')
 includeWithFlags ':brave5',                              'java', 'publish', 'relocate', 'no_aggregation'
 project(':brave5').projectDir = file('brave/brave5')
 includeWithFlags ':brave6',                              'java', 'publish', 'relocate', 'native'