You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2021/12/10 13:56:59 UTC

[cayenne] branch STABLE-4.1 updated (c10b5c4 -> e1cc7a7)

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a change to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git.


    from c10b5c4  Update SQLServer docker image name
     new b924c87  Missing licences
     new e1cc7a7  Allow "https:" link in the license header

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/cayenne/commitlog/db/AuditableChild1x.java | 19 +++++++++++++++++++
 .../testdo/inheritance_vertical/IvGenKeyRoot.java     | 19 +++++++++++++++++++
 .../testdo/inheritance_vertical/IvGenKeySub.java      | 19 +++++++++++++++++++
 pom.xml                                               |  8 ++++++++
 4 files changed, 65 insertions(+)

[cayenne] 01/02: Missing licences

Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit b924c874e6e6fba6df01e206fbb9a367a14c4065
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Fri Dec 10 16:56:05 2021 +0300

    Missing licences
---
 .../apache/cayenne/commitlog/db/AuditableChild1x.java | 19 +++++++++++++++++++
 .../testdo/inheritance_vertical/IvGenKeyRoot.java     | 19 +++++++++++++++++++
 .../testdo/inheritance_vertical/IvGenKeySub.java      | 19 +++++++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/cayenne-commitlog/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild1x.java b/cayenne-commitlog/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild1x.java
index 7d8c4a6..ea0842c 100644
--- a/cayenne-commitlog/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild1x.java
+++ b/cayenne-commitlog/src/test/java/org/apache/cayenne/commitlog/db/AuditableChild1x.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
+ *
+ *    https://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.cayenne.commitlog.db;
 
 import org.apache.cayenne.commitlog.db.auto._AuditableChild1x;
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/IvGenKeyRoot.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/IvGenKeyRoot.java
index c407be3..4ef21e3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/IvGenKeyRoot.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/IvGenKeyRoot.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
+ *
+ *    https://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.cayenne.testdo.inheritance_vertical;
 
 import org.apache.cayenne.testdo.inheritance_vertical.auto._IvGenKeyRoot;
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/IvGenKeySub.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/IvGenKeySub.java
index c58b953..3578a8d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/IvGenKeySub.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/IvGenKeySub.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
+ *
+ *    https://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.cayenne.testdo.inheritance_vertical;
 
 import org.apache.cayenne.testdo.inheritance_vertical.auto._IvGenKeySub;

[cayenne] 02/02: Allow "https:" link in the license header

Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit e1cc7a7a0800c231b2bc7b28af93f7a9b8a44d16
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Fri Dec 10 16:56:50 2021 +0300

    Allow "https:" link in the license header
---
 pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pom.xml b/pom.xml
index 1dde5e2..53bb99e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -923,6 +923,14 @@
 				<groupId>org.apache.rat</groupId>
 				<artifactId>apache-rat-plugin</artifactId>
 				<configuration>
+					<licenses>
+						<license implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20">
+							<notes>Also allow the license url to be https.</notes>
+							<patterns>
+								<pattern>https://www.apache.org/licenses/LICENSE-2.0</pattern>
+							</patterns>
+						</license>
+					</licenses>
 					<excludes>
 						<exclude>build/**/*</exclude>
                         <exclude>**/.*</exclude>