This is an automated email from the ASF dual-hosted git repository.
shanedell pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-vscode.git
The following commit(s) were added to refs/heads/main by this push:
new 43672e8 Fix DeltaXML Licensing
43672e8 is described below
commit 43672e8cf07880ebf53295465d59f8a18b52b01f
Author: Michael Hoke <[email protected]>
AuthorDate: Mon Aug 7 11:21:29 2023 -0400
Fix DeltaXML Licensing
---
build.sbt | 3 +-
build/package/LICENSE | 32 ++++++++++++++++++++++
project/Rat.scala | 6 ++++
src/language/semantics/dfdlExt.ts | 20 +++-----------
src/language/semantics/documentChangeHandler.ts | 20 +++-----------
src/language/semantics/functionData.ts | 20 +++-----------
.../semantics/xPathDocumentChangeHandler.ts | 20 +++-----------
src/language/semantics/xpLexer.ts | 20 +++-----------
src/language/semantics/xslLexer.ts | 20 +++-----------
src/language/semantics/xsltTokenDiagnostics.ts | 20 +++-----------
10 files changed, 68 insertions(+), 113 deletions(-)
diff --git a/build.sbt b/build.sbt
index 4aadccc..05f71ce 100644
--- a/build.sbt
+++ b/build.sbt
@@ -63,7 +63,8 @@ lazy val commonSettings =
lazy val ratSettings = Seq(
ratLicenses := Seq(
("MIT ", Rat.MIT_LICENSE_NAME, Rat.MIT_LICENSE_TEXT_MICROSOFT),
- ("CC0 ", Rat.CREATIVE_COMMONS_LICENSE_NAME,
Rat.CREATIVE_COMMONS_LICENSE_TEXT)
+ ("CC0 ", Rat.CREATIVE_COMMONS_LICENSE_NAME,
Rat.CREATIVE_COMMONS_LICENSE_TEXT),
+ ("MIT ", Rat.MIT_LICENSE_NAME, Rat.MIT_LICENSE_TEXT_DELTAXML)
),
ratLicenseFamilies := Seq(
Rat.MIT_LICENSE_NAME,
diff --git a/build/package/LICENSE b/build/package/LICENSE
index 6455645..1aa7013 100644
--- a/build/package/LICENSE
+++ b/build/package/LICENSE
@@ -3641,3 +3641,35 @@ conditions of the following licenses.
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
+
+- src/language/semantics/dfdlExt.ts
+- src/language/semantics/documentChangeHandler.ts
+- src/language/semantics/functionData.ts
+- src/language/semantics/xPathDocumentChangeHandler.ts
+- src/language/semantics/xpLexer.ts
+- src/language/semantics/xslLexer.ts
+- src/language/semantics/xsltTokenDiagnostics.ts
+ This product modifies and bundles the above files from the 'XSLT/XPath for
Visual Studio Code' extension.
(https://github.com/DeltaXML/vscode-xslt-tokenizer)
+ These files are available under the MIT License:
+
+ MIT License
+
+ Copyright (c) 2020 DeltaXML Ltd
+
+ Permission is hereby granted, free of charge, to any person obtaining a
copy
+ of this software and associated documentation files (the "Software"), to
deal
+ in the Software without restriction, including without limitation the
rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE
+ SOFTWARE.
diff --git a/project/Rat.scala b/project/Rat.scala
index 3b49450..b8237e3 100644
--- a/project/Rat.scala
+++ b/project/Rat.scala
@@ -65,6 +65,12 @@ object Rat {
"""
Copyright (c) Microsoft Corporation. All rights reserved.
Licensed under the MIT License. See License.txt in the project root for
license information.
+"""
+
+ lazy val MIT_LICENSE_TEXT_DELTAXML =
+ """
+Copyright (c) 2020 DeltaXML Ltd. All rights reserved.
+Licensed under the MIT License. See License.txt in the project root for
license information.
"""
lazy val CREATIVE_COMMONS_LICENSE_NAME = "Creative Commons CC0 1.0 Universal"
diff --git a/src/language/semantics/dfdlExt.ts
b/src/language/semantics/dfdlExt.ts
index 495988e..18c5496 100644
--- a/src/language/semantics/dfdlExt.ts
+++ b/src/language/semantics/dfdlExt.ts
@@ -1,19 +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.
- */
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) 2020 DeltaXML Ltd. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
license information.
+
*--------------------------------------------------------------------------------------------*/
import * as vscode from 'vscode'
import {
diff --git a/src/language/semantics/documentChangeHandler.ts
b/src/language/semantics/documentChangeHandler.ts
index b694197..3b62411 100644
--- a/src/language/semantics/documentChangeHandler.ts
+++ b/src/language/semantics/documentChangeHandler.ts
@@ -1,19 +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.
- */
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) 2020 DeltaXML Ltd. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
license information.
+
*--------------------------------------------------------------------------------------------*/
import * as vscode from 'vscode'
import { XPathDocumentChangeHandler } from './xPathDocumentChangeHandler'
diff --git a/src/language/semantics/functionData.ts
b/src/language/semantics/functionData.ts
index 87b5614..211154c 100644
--- a/src/language/semantics/functionData.ts
+++ b/src/language/semantics/functionData.ts
@@ -1,19 +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.
- */
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) 2020 DeltaXML Ltd. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
license information.
+
*--------------------------------------------------------------------------------------------*/
export enum XSLTnamespaces {
NotDefined,
diff --git a/src/language/semantics/xPathDocumentChangeHandler.ts
b/src/language/semantics/xPathDocumentChangeHandler.ts
index 7d540b2..de4d356 100644
--- a/src/language/semantics/xPathDocumentChangeHandler.ts
+++ b/src/language/semantics/xPathDocumentChangeHandler.ts
@@ -1,19 +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.
- */
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) 2020 DeltaXML Ltd. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
license information.
+
*--------------------------------------------------------------------------------------------*/
import * as vscode from 'vscode'
import { Data } from './xpLexer'
diff --git a/src/language/semantics/xpLexer.ts
b/src/language/semantics/xpLexer.ts
index 9753f33..9779634 100644
--- a/src/language/semantics/xpLexer.ts
+++ b/src/language/semantics/xpLexer.ts
@@ -1,19 +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.
- */
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) 2020 DeltaXML Ltd. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
license information.
+
*--------------------------------------------------------------------------------------------*/
export enum CharLevelState {
init, // 0 initial state
diff --git a/src/language/semantics/xslLexer.ts
b/src/language/semantics/xslLexer.ts
index f5ed6ca..75df660 100644
--- a/src/language/semantics/xslLexer.ts
+++ b/src/language/semantics/xslLexer.ts
@@ -1,19 +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.
- */
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) 2020 DeltaXML Ltd. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
license information.
+
*--------------------------------------------------------------------------------------------*/
import {
BaseToken,
diff --git a/src/language/semantics/xsltTokenDiagnostics.ts
b/src/language/semantics/xsltTokenDiagnostics.ts
index 18ecd90..954cb49 100644
--- a/src/language/semantics/xsltTokenDiagnostics.ts
+++ b/src/language/semantics/xsltTokenDiagnostics.ts
@@ -1,19 +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.
- */
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) 2020 DeltaXML Ltd. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
license information.
+
*--------------------------------------------------------------------------------------------*/
import * as vscode from 'vscode'
import {