aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/network-common/pom.xml2
-rw-r--r--common/network-shuffle/pom.xml2
-rw-r--r--common/network-yarn/pom.xml2
-rw-r--r--common/sketch/pom.xml2
-rw-r--r--common/tags/pom.xml6
-rw-r--r--common/tags/src/main/java/org/apache/spark/tags/DockerTest.java (renamed from common/tags/src/test/java/org/apache/spark/tags/DockerTest.java)0
-rw-r--r--common/tags/src/main/java/org/apache/spark/tags/ExtendedHiveTest.java (renamed from common/tags/src/test/java/org/apache/spark/tags/ExtendedHiveTest.java)0
-rw-r--r--common/tags/src/main/java/org/apache/spark/tags/ExtendedYarnTest.java (renamed from common/tags/src/test/java/org/apache/spark/tags/ExtendedYarnTest.java)0
-rw-r--r--common/tags/src/main/scala/org/apache/spark/annotation/Since.scala30
-rw-r--r--common/tags/src/main/scala/org/apache/spark/annotation/package-info.java23
-rw-r--r--common/tags/src/main/scala/org/apache/spark/annotation/package.scala25
-rw-r--r--common/unsafe/pom.xml2
12 files changed, 8 insertions, 86 deletions
diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml
index 5444ae6d70..bd507c2cb6 100644
--- a/common/network-common/pom.xml
+++ b/common/network-common/pom.xml
@@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-tags_${scala.binary.version}</artifactId>
+ <artifactId>spark-test-tags_${scala.binary.version}</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml
index e736436aec..810ec10ca0 100644
--- a/common/network-shuffle/pom.xml
+++ b/common/network-shuffle/pom.xml
@@ -80,7 +80,7 @@
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-tags_${scala.binary.version}</artifactId>
+ <artifactId>spark-test-tags_${scala.binary.version}</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml
index 1fd3af2e6e..bc83ef24c3 100644
--- a/common/network-yarn/pom.xml
+++ b/common/network-yarn/pom.xml
@@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-tags_${scala.binary.version}</artifactId>
+ <artifactId>spark-test-tags_${scala.binary.version}</artifactId>
</dependency>
<!-- Provided dependencies -->
diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml
index bbbb0bd5aa..8bc1f52798 100644
--- a/common/sketch/pom.xml
+++ b/common/sketch/pom.xml
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-tags_${scala.binary.version}</artifactId>
+ <artifactId>spark-test-tags_${scala.binary.version}</artifactId>
</dependency>
</dependencies>
diff --git a/common/tags/pom.xml b/common/tags/pom.xml
index 14e94eca93..8e702b4fef 100644
--- a/common/tags/pom.xml
+++ b/common/tags/pom.xml
@@ -27,12 +27,12 @@
</parent>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-tags_2.11</artifactId>
+ <artifactId>spark-test-tags_2.11</artifactId>
<packaging>jar</packaging>
- <name>Spark Project Tags</name>
+ <name>Spark Project Test Tags</name>
<url>http://spark.apache.org/</url>
<properties>
- <sbt.project.name>tags</sbt.project.name>
+ <sbt.project.name>test-tags</sbt.project.name>
</properties>
<dependencies>
diff --git a/common/tags/src/test/java/org/apache/spark/tags/DockerTest.java b/common/tags/src/main/java/org/apache/spark/tags/DockerTest.java
index 0fecf3b8f9..0fecf3b8f9 100644
--- a/common/tags/src/test/java/org/apache/spark/tags/DockerTest.java
+++ b/common/tags/src/main/java/org/apache/spark/tags/DockerTest.java
diff --git a/common/tags/src/test/java/org/apache/spark/tags/ExtendedHiveTest.java b/common/tags/src/main/java/org/apache/spark/tags/ExtendedHiveTest.java
index 83279e5e93..83279e5e93 100644
--- a/common/tags/src/test/java/org/apache/spark/tags/ExtendedHiveTest.java
+++ b/common/tags/src/main/java/org/apache/spark/tags/ExtendedHiveTest.java
diff --git a/common/tags/src/test/java/org/apache/spark/tags/ExtendedYarnTest.java b/common/tags/src/main/java/org/apache/spark/tags/ExtendedYarnTest.java
index 108300168e..108300168e 100644
--- a/common/tags/src/test/java/org/apache/spark/tags/ExtendedYarnTest.java
+++ b/common/tags/src/main/java/org/apache/spark/tags/ExtendedYarnTest.java
diff --git a/common/tags/src/main/scala/org/apache/spark/annotation/Since.scala b/common/tags/src/main/scala/org/apache/spark/annotation/Since.scala
deleted file mode 100644
index af483e361e..0000000000
--- a/common/tags/src/main/scala/org/apache/spark/annotation/Since.scala
+++ /dev/null
@@ -1,30 +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 org.apache.spark.annotation
-
-import scala.annotation.StaticAnnotation
-import scala.annotation.meta._
-
-/**
- * A Scala annotation that specifies the Spark version when a definition was added.
- * Different from the `@since` tag in JavaDoc, this annotation does not require explicit JavaDoc and
- * hence works for overridden methods that inherit API documentation directly from parents.
- * The limitation is that it does not show up in the generated Java API documentation.
- */
-@param @field @getter @setter @beanGetter @beanSetter
-private[spark] class Since(version: String) extends StaticAnnotation
diff --git a/common/tags/src/main/scala/org/apache/spark/annotation/package-info.java b/common/tags/src/main/scala/org/apache/spark/annotation/package-info.java
deleted file mode 100644
index 9efdccf6b0..0000000000
--- a/common/tags/src/main/scala/org/apache/spark/annotation/package-info.java
+++ /dev/null
@@ -1,23 +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.
- */
-
-/**
- * Spark annotations to mark an API experimental or intended only for advanced usages by developers.
- * This package consist of these annotations, which are used project wide and are reflected in
- * Scala and Java docs.
- */
-package org.apache.spark.annotation;
diff --git a/common/tags/src/main/scala/org/apache/spark/annotation/package.scala b/common/tags/src/main/scala/org/apache/spark/annotation/package.scala
deleted file mode 100644
index c3f4026a29..0000000000
--- a/common/tags/src/main/scala/org/apache/spark/annotation/package.scala
+++ /dev/null
@@ -1,25 +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 org.apache.spark
-
-/**
- * Spark annotations to mark an API experimental or intended only for advanced usages by developers.
- * This package consist of these annotations, which are used project wide and are reflected in
- * Scala and Java docs.
- */
-package object annotation
diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml
index 6f3bd39491..93b9580f26 100644
--- a/common/unsafe/pom.xml
+++ b/common/unsafe/pom.xml
@@ -61,7 +61,7 @@
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-tags_${scala.binary.version}</artifactId>
+ <artifactId>spark-test-tags_${scala.binary.version}</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-07 14:16:05 +0000