You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by da...@apache.org on 2022/07/30 21:19:42 UTC
[logging-log4net] branch master updated (d29c8f25 -> 7a1a5f0e)
This is an automated email from the ASF dual-hosted git repository.
davydm pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
from d29c8f25 :memo: minor update to release docs
new f1a28ff5 :package: bump version numbers
new 3495ffbf :memo: update copyright date in NOTICE
new 7a1a5f0e :memo: add apache license headers
The 3 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:
NOTICE | 2 +-
build-with-docker-for-windows.bat | 17 +++++++++++++++++
install-dotnet-core-sdk-1.1.ps1 | 17 +++++++++++++++++
install-net-framework-sdk-3.5.ps1 | 17 +++++++++++++++++
local-tasks/build-site.js | 17 +++++++++++++++++
local-tasks/hash-build-artifacts.js | 17 +++++++++++++++++
local-tasks/prefix-build-artifacts.js | 19 ++++++++++++++++++-
local-tasks/prepare-build-artifacts.js | 17 +++++++++++++++++
local-tasks/update-version-info.js | 17 +++++++++++++++++
local-tasks/zip.js | 17 +++++++++++++++++
log4net.build | 2 +-
log4net.shfbproj | 2 +-
old-log4net.snk.gpg | Bin 2535 -> 0 bytes
pom.xml | 2 +-
14 files changed, 158 insertions(+), 5 deletions(-)
delete mode 100644 old-log4net.snk.gpg
[logging-log4net] 03/03: :memo: add apache license headers
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davydm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
commit 7a1a5f0e297404105bc9bc7072eebe8b24695e7f
Author: Davyd McColl <da...@gmail.com>
AuthorDate: Mon Jul 25 09:38:27 2022 +0200
:memo: add apache license headers
---
build-with-docker-for-windows.bat | 17 +++++++++++++++++
install-dotnet-core-sdk-1.1.ps1 | 17 +++++++++++++++++
install-net-framework-sdk-3.5.ps1 | 17 +++++++++++++++++
local-tasks/build-site.js | 17 +++++++++++++++++
local-tasks/hash-build-artifacts.js | 17 +++++++++++++++++
local-tasks/prefix-build-artifacts.js | 19 ++++++++++++++++++-
local-tasks/prepare-build-artifacts.js | 17 +++++++++++++++++
local-tasks/update-version-info.js | 17 +++++++++++++++++
local-tasks/zip.js | 17 +++++++++++++++++
old-log4net.snk.gpg | Bin 2535 -> 0 bytes
10 files changed, 154 insertions(+), 1 deletion(-)
diff --git a/build-with-docker-for-windows.bat b/build-with-docker-for-windows.bat
index a5cdf9c1..9db90c95 100644
--- a/build-with-docker-for-windows.bat
+++ b/build-with-docker-for-windows.bat
@@ -1 +1,18 @@
+rem Licensed to the Apache Software Foundation (ASF) under one
+rem or more contributor license agreements. See the NOTICE file
+rem distributed with this work for additional information
+rem regarding copyright ownership. The ASF licenses this file
+rem to you under the Apache License, Version 2.0 (the
+rem "License"); you may not use this file except in compliance
+rem with the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing,
+rem software distributed under the License is distributed on an
+rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem KIND, either express or implied. See the License for the
+rem specific language governing permissions and limitations
+rem under the License.
+
docker run -v %~dp0%:C:\dev -v %USERPROFILE%\.nuget\packages:C:\packages -t davydm/net-build-tools:vs2019 "npm ci && npm run build"
diff --git a/install-dotnet-core-sdk-1.1.ps1 b/install-dotnet-core-sdk-1.1.ps1
index 038d9d62..08282ff9 100644
--- a/install-dotnet-core-sdk-1.1.ps1
+++ b/install-dotnet-core-sdk-1.1.ps1
@@ -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.
+
#Enforce TLS 1.2 as Microsoft is deprecating all old TLS versions
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12;
diff --git a/install-net-framework-sdk-3.5.ps1 b/install-net-framework-sdk-3.5.ps1
index 7858dc98..e49ce0bf 100644
--- a/install-net-framework-sdk-3.5.ps1
+++ b/install-net-framework-sdk-3.5.ps1
@@ -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.
+#
#Enforce TLS 1.2 as Microsoft is deprecating all old TLS versions
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12;
diff --git a/local-tasks/build-site.js b/local-tasks/build-site.js
index 8e27cf03..d63d91cd 100644
--- a/local-tasks/build-site.js
+++ b/local-tasks/build-site.js
@@ -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.
+
const
gulp = requireModule("gulp"),
spawn = requireModule("spawn"),
diff --git a/local-tasks/hash-build-artifacts.js b/local-tasks/hash-build-artifacts.js
index 91fea918..1af07dfa 100644
--- a/local-tasks/hash-build-artifacts.js
+++ b/local-tasks/hash-build-artifacts.js
@@ -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.
+
const
gulp = requireModule("gulp");
diff --git a/local-tasks/prefix-build-artifacts.js b/local-tasks/prefix-build-artifacts.js
index 4f34ae96..886890b7 100644
--- a/local-tasks/prefix-build-artifacts.js
+++ b/local-tasks/prefix-build-artifacts.js
@@ -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.
+
const { renameSync } = require("fs");
const gulp = requireModule("gulp");
@@ -20,4 +37,4 @@ gulp.task("prefix-build-artifacts", async () => {
);
await rename(item, newName, true);
}
-});
\ No newline at end of file
+});
diff --git a/local-tasks/prepare-build-artifacts.js b/local-tasks/prepare-build-artifacts.js
index 3c22504e..b658f088 100644
--- a/local-tasks/prepare-build-artifacts.js
+++ b/local-tasks/prepare-build-artifacts.js
@@ -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.
+
const
gulp = requireModule("gulp");
diff --git a/local-tasks/update-version-info.js b/local-tasks/update-version-info.js
index 314bf5cc..c1e0353f 100644
--- a/local-tasks/update-version-info.js
+++ b/local-tasks/update-version-info.js
@@ -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.
+
const
gulp = requireModule("gulp");
diff --git a/local-tasks/zip.js b/local-tasks/zip.js
index 3876fb86..3e2ec026 100644
--- a/local-tasks/zip.js
+++ b/local-tasks/zip.js
@@ -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.
+
const
gulp = requireModule("gulp"),
promisify = requireModule("promisify-stream"),
diff --git a/old-log4net.snk.gpg b/old-log4net.snk.gpg
deleted file mode 100644
index 57126212..00000000
Binary files a/old-log4net.snk.gpg and /dev/null differ
[logging-log4net] 02/03: :memo: update copyright date in NOTICE
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davydm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
commit 3495ffbf819d6ec262e54efc23c9a80eda842aab
Author: Davyd McColl <da...@gmail.com>
AuthorDate: Mon Jul 25 09:32:56 2022 +0200
:memo: update copyright date in NOTICE
---
NOTICE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/NOTICE b/NOTICE
index 35c2b634..468a2f54 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache log4net
- Copyright 2004-2021 The Apache Software Foundation
+ Copyright 2004-2022 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
[logging-log4net] 01/03: :package: bump version numbers
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davydm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
commit f1a28ff534cc4d68adac208ca802e04adbe4d939
Author: Davyd McColl <da...@gmail.com>
AuthorDate: Mon Jul 25 08:52:30 2022 +0200
:package: bump version numbers
---
log4net.build | 2 +-
log4net.shfbproj | 2 +-
pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/log4net.build b/log4net.build
index 230d6a80..0bb50afd 100644
--- a/log4net.build
+++ b/log4net.build
@@ -20,7 +20,7 @@ limitations under the License.
<property name="log4net.basedir" value="." />
<property name="project.build.config" value="debug" />
<property name="project.build.package" value="false" />
- <property name="package.version" value="2.0.9"/>
+ <property name="package.version" value="2.0.15"/>
<!-- Include log4net helpers -->
<include buildfile="${log4net.basedir}/log4net.include" />
diff --git a/log4net.shfbproj b/log4net.shfbproj
index 7f91938a..d8e22eb6 100644
--- a/log4net.shfbproj
+++ b/log4net.shfbproj
@@ -33,7 +33,7 @@ limitations under the License.
<!-- SHFB properties -->
<FrameworkVersion>.NET Framework 3.5</FrameworkVersion>
<OutputPath>doc\sdk\net\4.0\</OutputPath>
- <HtmlHelpName>log4net-sdk-2.0.9</HtmlHelpName>
+ <HtmlHelpName>log4net-sdk-2.0.15</HtmlHelpName>
<Language>en-US</Language>
<SyntaxFilters>Standard</SyntaxFilters>
<SdkLinkTarget>Blank</SdkLinkTarget>
diff --git a/pom.xml b/pom.xml
index 36c4c2b4..86918c59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<groupId>log4net</groupId>
<artifactId>apache-log4net</artifactId>
<packaging>pom</packaging>
- <version>2.0.9-SNAPSHOT</version>
+ <version>2.0.15</version>
<name>Apache log4net</name>
<description>Logging framework for Microsoft .NET Framework.</description>
<url>http://logging.apache.org/log4net/</url>