You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2019/04/16 20:29:16 UTC
[streams] branch master updated: resolves STREAMS-642
This is an automated email from the ASF dual-hosted git repository.
sblackmon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/streams.git
The following commit(s) were added to refs/heads/master by this push:
new b792b30 resolves STREAMS-642
b792b30 is described below
commit b792b304b326c8db687420229d4fb61740f223d8
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
AuthorDate: Tue Apr 16 15:29:05 2019 -0500
resolves STREAMS-642
---
pom.xml | 6 +++---
src/license/licenses.xml | 17 +++++++++++++++++
.../org/apache/streams/core/util/ExecutorUtils.java | 19 +++++++++++++++++++
.../java/org/apache/streams/core/util/QueueUtils.java | 19 +++++++++++++++++++
.../src/main/jsonschema/address.json | 5 +++++
.../src/main/jsonschema/calendar.json | 5 +++++
.../src/main/jsonschema/card.json | 5 +++++
.../src/main/jsonschema/geo.json | 5 +++++
8 files changed, 78 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index daaf720..222f400 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>19</version>
+ <version>21</version>
</parent>
<groupId>org.apache.streams</groupId>
@@ -326,7 +326,7 @@
</release.repository.url>
<!-- Plugin and Plugin Dependency Versions -->
- <apache-rat.plugin.version>0.12</apache-rat.plugin.version>
+ <apache-rat.plugin.version>0.13</apache-rat.plugin.version>
<build-helper.plugin.version>1.8</build-helper.plugin.version>
<bundle.plugin.version>1.4.3</bundle.plugin.version>
<checkstyle.plugin.version>2.17</checkstyle.plugin.version>
@@ -1533,7 +1533,7 @@
<exclude>**/src/license/*</exclude>
<exclude>**/src/license/licenses/*</exclude>
<exclude>**/src/site/resources/**/*</exclude>
- <exclude>**/.gitignore</exclude>
+ <exclude>**/target/**</exclude>
<exclude>apache-maven-*/**/*</exclude>
</excludes>
</configuration>
diff --git a/src/license/licenses.xml b/src/license/licenses.xml
index 6f89dc9..8bb1e3c 100644
--- a/src/license/licenses.xml
+++ b/src/license/licenses.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ ~ 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
+ ~
+ ~ 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.
+ -->
<licenseSummary>
<dependencies>
<dependency>
diff --git a/streams-core/src/main/java/org/apache/streams/core/util/ExecutorUtils.java b/streams-core/src/main/java/org/apache/streams/core/util/ExecutorUtils.java
index 4fe29c5..73a7441 100644
--- a/streams-core/src/main/java/org/apache/streams/core/util/ExecutorUtils.java
+++ b/streams-core/src/main/java/org/apache/streams/core/util/ExecutorUtils.java
@@ -1,3 +1,22 @@
+/*
+ * 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.streams.core.util;
import org.apache.streams.config.StreamsConfigurator;
diff --git a/streams-core/src/main/java/org/apache/streams/core/util/QueueUtils.java b/streams-core/src/main/java/org/apache/streams/core/util/QueueUtils.java
index bbb7ea7..337f345 100644
--- a/streams-core/src/main/java/org/apache/streams/core/util/QueueUtils.java
+++ b/streams-core/src/main/java/org/apache/streams/core/util/QueueUtils.java
@@ -1,3 +1,22 @@
+/*
+ * 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.streams.core.util;
import org.apache.streams.core.StreamsDatum;
diff --git a/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/address.json b/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/address.json
index 074d34e..5edd538 100644
--- a/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/address.json
+++ b/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/address.json
@@ -1,4 +1,9 @@
{
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "$license": [
+ "https://creativecommons.org/licenses/by-sa/3.0/legalcode",
+ "http://www.apache.org/licenses/LICENSE-2.0"
+ ],
"description" : "An Address following the convention of http://microformats.org/wiki/hcard",
"type" : "object",
"properties" : {
diff --git a/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/calendar.json b/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/calendar.json
index be6e885..6f928d4 100644
--- a/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/calendar.json
+++ b/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/calendar.json
@@ -1,4 +1,9 @@
{
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "$license": [
+ "https://creativecommons.org/licenses/by-sa/3.0/legalcode",
+ "http://www.apache.org/licenses/LICENSE-2.0"
+ ],
"description" : "A representation of an event",
"type" : "object",
"properties" : {
diff --git a/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/card.json b/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/card.json
index 48dd3de..7fbc613 100644
--- a/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/card.json
+++ b/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/card.json
@@ -1,4 +1,9 @@
{
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "$license": [
+ "https://creativecommons.org/licenses/by-sa/3.0/legalcode",
+ "http://www.apache.org/licenses/LICENSE-2.0"
+ ],
"description":"A representation of a person, company, organization, or place",
"type":"object",
"properties":{
diff --git a/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/geo.json b/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/geo.json
index 73ac7e5..cd636d1 100644
--- a/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/geo.json
+++ b/streams-schemas/streams-schema-jsonschemaorg/src/main/jsonschema/geo.json
@@ -1,4 +1,9 @@
{
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "$license": [
+ "https://creativecommons.org/licenses/by-sa/3.0/legalcode",
+ "http://www.apache.org/licenses/LICENSE-2.0"
+ ],
"description" : "A geographical coordinate",
"type" : "object",
"properties" : {