Skip to content

Commit bd6bc11

Browse files
FreeAndNilFreeAndNil
committed
#129 Prepare release 3.0.0-preview.1
1 parent 531ce1f commit bd6bc11

File tree

6 files changed

+44
-55
lines changed

6 files changed

+44
-55
lines changed

‎doc/RELEASING.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ release version 2.0.123:
2929
(or at least, I haven't figured out how - in particular CF)
3030
- TODO: the following are still manual and need to be built into the `release` script:
3131
- log4net.build: update package.version property
32-
- log4net.shfbproj: update HtmlHelpName
3332
- pom.xml: update version
3433
4. Sign release artifacts (zips & nupkg) under `build/artifacts`
3534
- eg `gpg --argmor --output log4net-2.0.123.nupkg.asc --detach-sig log4net-2.0.123.nupkg`
@@ -81,5 +80,4 @@ release version 2.0.123:
8180
- `git pull --rebase`
8281
- `git merge asf-staging`
8382
18. rename the release at github, eg to `rel/2.0.123`
84-
- double-check that the `rel` tag is created
85-
83+
- double-check that the `rel` tag is created

‎pom.xml‎

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<groupId>log4net</groupId>
2222
<artifactId>apache-log4net</artifactId>
2323
<packaging>pom</packaging>
24-
<version>2.0.17</version>
24+
<version>3.0.0</version>
2525
<name>Apache log4net</name>
2626
<description>Logging framework for Microsoft .NET Framework.</description>
2727
<url>http://logging.apache.org/log4net/</url>
@@ -91,30 +91,6 @@
9191
<templateFile>${basedir}/src/site/site.vm</templateFile>
9292
</configuration>
9393
</plugin>
94-
<plugin>
95-
<artifactId>maven-antrun-plugin</artifactId>
96-
<version>1.8</version>
97-
<executions>
98-
<execution>
99-
<phase>install</phase>
100-
<goals>
101-
<goal>run</goal>
102-
</goals>
103-
<configuration>
104-
<tasks>
105-
<fixcrlf srcDir="target/site" excludes="images/**"/>
106-
</tasks>
107-
</configuration>
108-
</execution>
109-
</executions>
110-
<dependencies>
111-
<dependency>
112-
<groupId>org.apache.ant</groupId>
113-
<artifactId>ant</artifactId>
114-
<version>1.10.11</version>
115-
</dependency>
116-
</dependencies>
117-
</plugin>
11894
</plugins>
11995
</build>
12096

@@ -134,7 +110,7 @@
134110
<artifactId>apache-rat-plugin</artifactId>
135111
<version>0.12</version>
136112
<configuration>
137-
<excludesFile>${basedir}/rat.excludesFile</excludesFile>
113+
<excludesFile>${basedir}/rat.excludesFile</excludesFile>
138114
</configuration>
139115
</plugin>
140116
<plugin>
@@ -156,6 +132,14 @@
156132
</reporting>
157133

158134
<developers>
135+
<developer>
136+
<name>Davyd McColl</name>
137+
<id>fluffynuts</id>
138+
</developer>
139+
<developer>
140+
<name>Jan Friedrich</name>
141+
<id>freeandnil</id>
142+
</developer>
159143
<developer>
160144
<name>Curt Arnold</name>
161145
<id>carnold</id>
@@ -187,6 +171,9 @@
187171
</developers>
188172

189173
<contributors>
174+
<contributor>
175+
<name>Erik Mavrinac</name>
176+
</contributor>
190177
<contributor>
191178
<name>Julian Biddle</name>
192179
</contributor>

‎src/Directory.Build.props‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
<Project>
2-
<PropertyGroup>
3-
<UseSharedCompilation>true</UseSharedCompilation>
4-
<LangVersion>latest</LangVersion>
5-
<Nullable>Enable</Nullable>
6-
<WarningsAsErrors>nullable</WarningsAsErrors>
7-
</PropertyGroup>
2+
<PropertyGroup Label="Versioning">
3+
<VersionPrefix>3.0.0</VersionPrefix>
4+
</PropertyGroup>
5+
<PropertyGroup>
6+
<UseSharedCompilation>true</UseSharedCompilation>
7+
<LangVersion>latest</LangVersion>
8+
<Nullable>Enable</Nullable>
9+
<WarningsAsErrors>nullable</WarningsAsErrors>
10+
</PropertyGroup>
811
</Project>

‎src/build-preview.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dotnet build -c Release '-p:GeneratePackages=true;VersionSuffix=preview.1' ./log4net/log4net.csproj

‎src/log4net.sln‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "log4net2-SerializeEvent", "
4040
EndProject
4141
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".doc", ".doc", "{33D80AD3-8048-4220-8BB0-38E3BDE5FCF4}"
4242
ProjectSection(SolutionItems) = preProject
43+
build-preview.ps1 = build-preview.ps1
4344
..\doc\BUILDING.md = ..\doc\BUILDING.md
45+
site\xdoc\download_log4net.xml = site\xdoc\download_log4net.xml
4446
..\doc\MailTemplate.Result.txt = ..\doc\MailTemplate.Result.txt
4547
..\doc\MailTemplate.txt = ..\doc\MailTemplate.txt
46-
..\doc\RELEASING.md = ..\doc\RELEASING.md
4748
site\xdoc\release\release-notes.xml = site\xdoc\release\release-notes.xml
48-
site\xdoc\download_log4net.xml = site\xdoc\download_log4net.xml
49+
..\doc\RELEASING.md = ..\doc\RELEASING.md
4950
EndProjectSection
5051
EndProject
5152
Global

‎src/log4net/log4net.csproj‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<PackageId>log4net</PackageId>
4-
<Version>3.0.0</Version>
5-
<PackageVersion>$(Version)</PackageVersion>
6-
<Title>Apache log4net</Title>
7-
<Product>Apache log4net</Product>
8-
<Description>
9-
log4net is a tool to help the programmer output log statements to a variety of output targets.
10-
In case of problems with an application, it is helpful to enable logging so that the problem
11-
can be located. With log4net it is possible to enable logging at runtime without modifying the
12-
application binary. The log4net package is designed so that log statements can remain in
13-
shipped code without incurring a high performance cost. It follows that the speed of logging
14-
(or rather not logging) is crucial.
2+
<PropertyGroup>
3+
<PackageId>log4net</PackageId>
4+
<Title>Apache log4net</Title>
5+
<Product>Apache log4net</Product>
6+
<Description>
7+
log4net is a tool to help the programmer output log statements to a variety of output targets.
8+
In case of problems with an application, it is helpful to enable logging so that the problem
9+
can be located. With log4net it is possible to enable logging at runtime without modifying the
10+
application binary. The log4net package is designed so that log statements can remain in
11+
shipped code without incurring a high performance cost. It follows that the speed of logging
12+
(or rather not logging) is crucial.
1513

16-
At the same time, log output can be so voluminous that it quickly becomes overwhelming.
17-
One of the distinctive features of log4net is the notion of hierarchical loggers.
18-
Using these loggers it is possible to selectively control which log statements are output
19-
at arbitrary granularity.
14+
At the same time, log output can be so voluminous that it quickly becomes overwhelming.
15+
One of the distinctive features of log4net is the notion of hierarchical loggers.
16+
Using these loggers it is possible to selectively control which log statements are output
17+
at arbitrary granularity.
2018

2119
log4net is designed with two distinct goals in mind: speed and flexibility
2220
</Description>
@@ -41,7 +39,8 @@
4139
<Authors>The Apache Software Foundation</Authors>
4240
<Copyright>Copyright 2004-2024 The Apache Software Foundation</Copyright>
4341
<DevelopmentDependency>false</DevelopmentDependency>
44-
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
42+
<IsPackable>true</IsPackable>
43+
<GeneratePackageOnBuild>$(GeneratePackages)</GeneratePackageOnBuild>
4544
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
4645
<PackageProjectUrl>https://logging.apache.org/log4net/</PackageProjectUrl>
4746
<PackageIcon>package-icon.png</PackageIcon>

0 commit comments

Comments
 (0)