You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2016/06/14 07:16:48 UTC

[1/2] marmotta git commit: added some missing license headers

Repository: marmotta
Updated Branches:
  refs/heads/develop 6d1c6a60b -> 45a68a210


added some missing license headers


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/84727254
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/84727254
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/84727254

Branch: refs/heads/develop
Commit: 8472725469069960c11ba095098b21a83b4c3020
Parents: 6d1c6a6
Author: Sergio Fern�ndez <wi...@apache.org>
Authored: Tue Jun 14 09:00:30 2016 +0200
Committer: Sergio Fern�ndez <wi...@apache.org>
Committed: Tue Jun 14 09:16:17 2016 +0200

----------------------------------------------------------------------
 launchers/marmotta-webapp/src/docker/entrypoint.sh | 15 +++++++++++++++
 .../sparql/optimizer/NativeFilterOptimizer.java    | 17 +++++++++++++++++
 .../core/test/triplestore/ContextServiceTest.java  | 17 +++++++++++++++++
 3 files changed, 49 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/84727254/launchers/marmotta-webapp/src/docker/entrypoint.sh
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/docker/entrypoint.sh b/launchers/marmotta-webapp/src/docker/entrypoint.sh
index 2769a28..c5215e1 100755
--- a/launchers/marmotta-webapp/src/docker/entrypoint.sh
+++ b/launchers/marmotta-webapp/src/docker/entrypoint.sh
@@ -1,5 +1,20 @@
 #!/usr/bin/env bash
 
+# 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
+
 # SIGTERM-handler
 sigterm_handler() {
   service tomcat7 stop

http://git-wip-us.apache.org/repos/asf/marmotta/blob/84727254/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/optimizer/NativeFilterOptimizer.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/optimizer/NativeFilterOptimizer.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/optimizer/NativeFilterOptimizer.java
index 5cde939..88f645c 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/optimizer/NativeFilterOptimizer.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/optimizer/NativeFilterOptimizer.java
@@ -1,3 +1,20 @@
+/*
+ * 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.marmotta.kiwi.sparql.optimizer;
 
 import org.apache.marmotta.kiwi.sparql.function.NativeFunctionRegistry;

http://git-wip-us.apache.org/repos/asf/marmotta/blob/84727254/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/triplestore/ContextServiceTest.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/triplestore/ContextServiceTest.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/triplestore/ContextServiceTest.java
index 9599180..aa74c1d 100644
--- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/triplestore/ContextServiceTest.java
+++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/triplestore/ContextServiceTest.java
@@ -1,3 +1,20 @@
+/*
+ * 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.marmotta.platform.core.test.triplestore;
 
 import com.google.common.base.Function;


[2/2] marmotta git commit: some basic rat configuration updates

Posted by wi...@apache.org.
some basic rat configuration updates


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/45a68a21
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/45a68a21
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/45a68a21

Branch: refs/heads/develop
Commit: 45a68a210d5c9113406d9105a35223f3926ee7cc
Parents: 8472725
Author: Sergio Fern�ndez <wi...@apache.org>
Authored: Tue Jun 14 09:16:42 2016 +0200
Committer: Sergio Fern�ndez <wi...@apache.org>
Committed: Tue Jun 14 09:16:42 2016 +0200

----------------------------------------------------------------------
 launchers/marmotta-webapp/pom.xml | 2 +-
 libraries/ostrich/pom.xml         | 9 +++++++++
 pom.xml                           | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/45a68a21/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index e02e44a..82470d6 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -191,8 +191,8 @@
                 <artifactId>apache-rat-plugin</artifactId>
                 <configuration>
                     <excludes>
-                        <!-- Simple placeholder -->
                         <exclude>src/deb/home/marmotta.txt</exclude>
+                        <exclude>README.md</exclude>
                     </excludes>
                 </configuration>
             </plugin>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/45a68a21/libraries/ostrich/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ostrich/pom.xml b/libraries/ostrich/pom.xml
index 108706c..46832ff 100644
--- a/libraries/ostrich/pom.xml
+++ b/libraries/ostrich/pom.xml
@@ -39,6 +39,15 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>README.md</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

http://git-wip-us.apache.org/repos/asf/marmotta/blob/45a68a21/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2c59dc3..1553ed6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,6 +253,7 @@
                         <exclude>.gitignore</exclude>
                         <exclude>.idea/**</exclude>
                         <exclude>atlassian-ide-plugin.xml</exclude>
+                        <exclude>**/.dockerignore</exclude>
                     </excludes>
                 </configuration>
             </plugin>