Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/99121
Change subject: Remove scala 2.8 annotations ...................................................................... Remove scala 2.8 annotations They conflict with 2.9+ ones since they are basically duplicates used by sbt Change-Id: I3ba2adfacf9dc5dd2d0f47ee53f4c9c91bc74f4c --- A debian/patches/remove_scala_annotations2.8.patch M debian/patches/series 2 files changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/kafka refs/changes/21/99121/1 diff --git a/debian/patches/remove_scala_annotations2.8.patch b/debian/patches/remove_scala_annotations2.8.patch new file mode 100644 index 0000000..f3cf589 --- /dev/null +++ b/debian/patches/remove_scala_annotations2.8.patch @@ -0,0 +1,40 @@ +diff -r -u a/core/src/main/scala/kafka/utils/Annotations_2.8.scala /dev/null +--- a/core/src/main/scala/kafka/utils/Annotations_2.8.scala ++++ /dev/null +@@ -1,36 +0,0 @@ +-/** +- * 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. +- */ +- +-package kafka.utils +- +-/* Some helpful annotations */ +- +-/** +- * Indicates that the annotated class is meant to be threadsafe. For an abstract class it is an part of the interface that an implementation +- * must respect +- */ +-class threadsafe extends StaticAnnotation +- +-/** +- * Indicates that the annotated class is not threadsafe +- */ +-class nonthreadsafe extends StaticAnnotation +- +-/** +- * Indicates that the annotated class is immutable +- */ +-class immutable extends StaticAnnotation diff --git a/debian/patches/series b/debian/patches/series index 8d89416..abaf5c4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ our-own-build-system.patch kafka_data_dirs_fixes.patch logging_to_var_log.patch +remove_scala_annotations2.8.patch -- To view, visit https://gerrit.wikimedia.org/r/99121 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3ba2adfacf9dc5dd2d0f47ee53f4c9c91bc74f4c Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/kafka Gerrit-Branch: debian-0.8.0 Gerrit-Owner: Ottomata <o...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
