ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject ignite git commit: IGNITE-3323 Get rid of copypasted JB annotations, use dependency instead.
Date Tue, 26 Jul 2016 10:04:48 GMT
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 <jchoffmann@gmail.com>
Authored: Tue Jul 26 13:04:38 2016 +0300
Committer: Anton Vinogradov <av@apache.org>
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 @@
         </dependency>
 
         <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>${jetbrains.annotations.version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j-tools</artifactId>
             <version>3.0.1</version>

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 <code>null</code> value is <em>forbidden</em>
- * 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 <code>null</code> value is perfectly
<em>valid</em>
- * 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 @@
         <jackson2.version>2.7.5</jackson2.version>
         <javax.cache.bundle.version>1.0.0_1</javax.cache.bundle.version>
         <javax.cache.version>1.0.0</javax.cache.version>
+        <jetbrains.annotations.version>15.0</jetbrains.annotations.version>
         <jetty.version>9.2.11.v20150529</jetty.version>
         <jms.spec.version>1.1.1</jms.spec.version>
         <jsch.bundle.version>0.1.53_1</jsch.bundle.version>


Mime
View raw message