diff options
author | Yin Huai <yhuai@databricks.com> | 2016-04-28 19:57:41 -0700 |
---|---|---|
committer | Yin Huai <yhuai@databricks.com> | 2016-04-28 19:57:41 -0700 |
commit | 9c7c42bc6a35679cfffcdfb6feb26af834fec2e1 (patch) | |
tree | aa6d78de55cc9107f26e0eee8ddaaf84da5436f2 /common/tags | |
parent | 2398e3d69c9a675d651c192107953de8e6c2aecd (diff) | |
download | spark-9c7c42bc6a35679cfffcdfb6feb26af834fec2e1.tar.gz spark-9c7c42bc6a35679cfffcdfb6feb26af834fec2e1.tar.bz2 spark-9c7c42bc6a35679cfffcdfb6feb26af834fec2e1.zip |
Revert "[SPARK-14613][ML] Add @Since into the matrix and vector classes in spark-mllib-local"
This reverts commit dae538a4d7c36191c1feb02ba87ffc624ab960dc.
Diffstat (limited to 'common/tags')
-rw-r--r-- | common/tags/pom.xml | 6 | ||||
-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.scala | 30 | ||||
-rw-r--r-- | common/tags/src/main/scala/org/apache/spark/annotation/package-info.java | 23 | ||||
-rw-r--r-- | common/tags/src/main/scala/org/apache/spark/annotation/package.scala | 25 |
7 files changed, 3 insertions, 81 deletions
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 |