You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2018/09/02 10:08:16 UTC
[directory-server] branch master updated: Updated the copyright
date, changed some outdated AL 2.0 license headers
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
The following commit(s) were added to refs/heads/master by this push:
new b882feb Updated the copyright date, changed some outdated AL 2.0 license headers
b882feb is described below
commit b882febcb89d0e43e7fc4d42700cf4754dd6320f
Author: Emmanuel Lécharny <el...@symas.com>
AuthorDate: Sun Sep 2 12:08:11 2018 +0200
Updated the copyright date, changed some outdated AL 2.0 license headers
---
NOTICE | 2 +-
.../org/apache/directory/server/installers/NOTICE | 2 +-
.../server/installers/macosxpkg/Info.plist | 2 +-
.../directory/server/dhcp/options/DhcpOption.java | 25 ++++++++++++----------
.../server/dhcp/options/vendor/CookieServers.java | 25 ++++++++++++----------
.../server/dhcp/options/vendor/ImpressServers.java | 25 ++++++++++++----------
6 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/NOTICE b/NOTICE
index e0b1465..eb19a7c 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,6 +1,6 @@
ApacheDS
-Copyright 2003-2015 The Apache Software Foundation
+Copyright 2003-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/NOTICE b/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/NOTICE
index eedc12f..ab9a53a 100644
--- a/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/NOTICE
+++ b/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/NOTICE
@@ -1,6 +1,6 @@
Apache Directory Server
-Copyright 2003-2015 The Apache Software Foundation
+Copyright 2003-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/Info.plist b/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/Info.plist
index 84009ac..043c7a2 100644
--- a/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/Info.plist
+++ b/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/Info.plist
@@ -23,7 +23,7 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>Copyright © 2010 Apache Software Foundation</string>
+ <string>Copyright © 201-2018 Apache Software Foundation</string>
<key>CFBundleIdentifier</key>
<string>org.apache.directory.server</string>
<key>IFPkgFlagAllowBackRev</key>
diff --git a/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java b/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java
index 49c835b..f0bf309 100644
--- a/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java
+++ b/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java
@@ -1,17 +1,20 @@
/*
- * Copyright 2005 The Apache Software Foundation
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.
*
*/
diff --git a/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java b/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java
index cd62fa1..f004374 100644
--- a/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java
+++ b/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java
@@ -1,17 +1,20 @@
/*
- * Copyright 2005 The Apache Software Foundation
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.
*
*/
diff --git a/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ImpressServers.java b/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ImpressServers.java
index 752b529..34dead0 100644
--- a/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ImpressServers.java
+++ b/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ImpressServers.java
@@ -1,17 +1,20 @@
/*
- * Copyright 2005 The Apache Software Foundation
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.
*
*/