Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B14DF200B4F for ; Tue, 26 Jul 2016 12:04:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AFE01160A75; Tue, 26 Jul 2016 10:04:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D0752160A56 for ; Tue, 26 Jul 2016 12:04:49 +0200 (CEST) Received: (qmail 31573 invoked by uid 500); 26 Jul 2016 10:04:48 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 31564 invoked by uid 99); 26 Jul 2016 10:04:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Jul 2016 10:04:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BECE1E08E8; Tue, 26 Jul 2016 10:04:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: av@apache.org To: commits@ignite.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-3323 Get rid of copypasted JB annotations, use dependency instead. Date: Tue, 26 Jul 2016 10:04:48 +0000 (UTC) archived-at: Tue, 26 Jul 2016 10:04:50 -0000 Repository: ignite Updated Branches: refs/heads/master fb884ec37 -> 3af756d71 IGNITE-3323 Get rid of copypasted JB annotations, use dependency instead. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3af756d7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3af756d7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3af756d7 Branch: refs/heads/master Commit: 3af756d71a68ad195d48bcced50ea92ba3078fad Parents: fb884ec Author: Jens Hoffmann Authored: Tue Jul 26 13:04:38 2016 +0300 Committer: Anton Vinogradov Committed: Tue Jul 26 13:04:38 2016 +0300 ---------------------------------------------------------------------- modules/core/pom.xml | 6 ++++ .../java/org/jetbrains/annotations/NotNull.java | 38 -------------------- .../org/jetbrains/annotations/Nullable.java | 33 ----------------- .../org/jetbrains/annotations/package-info.java | 27 -------------- parent/pom.xml | 1 + 5 files changed, 7 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3af756d7/modules/core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 5e32caf..7eefa4a 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -69,6 +69,12 @@ + org.jetbrains + annotations + ${jetbrains.annotations.version} + + + mx4j mx4j-tools 3.0.1 http://git-wip-us.apache.org/repos/asf/ignite/blob/3af756d7/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java b/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java deleted file mode 100644 index 66c66f3..0000000 --- a/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2000-2012 JetBrains s.r.o. - * - * Licensed 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.jetbrains.annotations; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * An element annotated with NotNull claims null value is forbidden - * to return (for methods), pass to (parameters) and hold (local variables and fields). - * Apart from documentation purposes this annotation is intended to be used by static analysis tools - * to validate against probable runtime errors and element contract violations. - * - * @author max - */ -@Documented -@Retention(RetentionPolicy.CLASS) -@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE}) -public @interface NotNull { - String value() default ""; -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/3af756d7/modules/core/src/main/java/org/jetbrains/annotations/Nullable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/jetbrains/annotations/Nullable.java b/modules/core/src/main/java/org/jetbrains/annotations/Nullable.java deleted file mode 100644 index defd5d8..0000000 --- a/modules/core/src/main/java/org/jetbrains/annotations/Nullable.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * Licensed 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.jetbrains.annotations; - -import java.lang.annotation.*; - -/** - * An element annotated with Nullable claims null value is perfectly valid - * to return (for methods), pass to (parameters) and hold (local variables and fields). - * Apart from documentation purposes this annotation is intended to be used by static analysis tools - * to validate against probable runtime errors and element contract violations. - * @author max - */ -@Documented -@Retention(RetentionPolicy.CLASS) -@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE}) -public @interface Nullable { - String value() default ""; -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/3af756d7/modules/core/src/main/java/org/jetbrains/annotations/package-info.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/jetbrains/annotations/package-info.java b/modules/core/src/main/java/org/jetbrains/annotations/package-info.java deleted file mode 100644 index 02e3be1..0000000 --- a/modules/core/src/main/java/org/jetbrains/annotations/package-info.java +++ /dev/null @@ -1,27 +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. - */ - -/* - * This software includes code from IntelliJ IDEA Community Edition - * Copyright (C) JetBrains s.r.o. - * https://www.jetbrains.com/idea/ - */ - -/** - * {@code Nullable} and {@code NotNull} annotations. - */ -package org.jetbrains.annotations; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/3af756d7/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index ebd6bf0..17f66c9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -78,6 +78,7 @@ 2.7.5 1.0.0_1 1.0.0 + 15.0 9.2.11.v20150529 1.1.1 0.1.53_1