ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [05/15] incubator-ignite git commit: ignite-45 - devnotes fix.
Date Mon, 23 Mar 2015 05:27:26 GMT
ignite-45 - devnotes fix.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1e26c78b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1e26c78b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1e26c78b

Branch: refs/heads/ignite-45-330
Commit: 1e26c78b465867aec1999059831fa1a79fb110af
Parents: d6235b6
Author: Dmitiry Setrakyan <dsetrakyan@gridgain.com>
Authored: Sun Mar 22 21:42:51 2015 -0700
Committer: Dmitiry Setrakyan <dsetrakyan@gridgain.com>
Committed: Sun Mar 22 21:42:51 2015 -0700

----------------------------------------------------------------------
 .../org/jetbrains/annotations/package-info.java    |  6 ++++++
 .../src/main/java/org/jsr166/package-info.java     | 17 +++--------------
 pom.xml                                            |  6 +++---
 3 files changed, 12 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e26c78b/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
index e437dd4..02e3be1 100644
--- a/modules/core/src/main/java/org/jetbrains/annotations/package-info.java
+++ b/modules/core/src/main/java/org/jetbrains/annotations/package-info.java
@@ -15,6 +15,12 @@
  * 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.
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e26c78b/modules/core/src/main/java/org/jsr166/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/jsr166/package-info.java b/modules/core/src/main/java/org/jsr166/package-info.java
index 0bd5486..135297c 100644
--- a/modules/core/src/main/java/org/jsr166/package-info.java
+++ b/modules/core/src/main/java/org/jsr166/package-info.java
@@ -1,18 +1,7 @@
 /*
- * 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.
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e26c78b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7460072..41b1b91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -582,9 +582,9 @@
                                         <exclude>**/*.sql</exclude><!--sql
files -->
                                         <!--special excludes-->
                                         <exclude>DEVNOTES.txt</exclude>
-                                        <exclude>src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java</exclude><!--Stanford
University license-->
-                                        <exclude>src/main/java/org/apache/ignite/internal/util/snaptree/*.java</exclude><!--Stanford
University license-->
-                                        <exclude>src/main/java/org/jdk8/backport/*.java</exclude>
+                                        <exclude>src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java</exclude><!--BSD
license-->
+                                        <exclude>src/main/java/org/apache/ignite/internal/util/snaptree/*.java</exclude><!--BSD
license-->
+                                        <exclude>src/main/java/org/jsr166/*.java</exclude>
                                         <exclude>src/test/java/org/apache/ignite/p2p/p2p.properties</exclude><!--test
depends on file content-->
                                         <exclude>src/test/resources/log/ignite.log.tst</exclude><!--test
resource-->
                                         <exclude>src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.incorrefs</exclude><!--test
resource-->


Mime
View raw message