Skip to content

Commit 4d62979

Browse files
cekiceki
committed
ow
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
1 parent 71fa431 commit 4d62979

File tree

9 files changed

+154
-53
lines changed

9 files changed

+154
-53
lines changed

‎mvni.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function scpLogback() {
1616
}
1717

1818
function doRsync() {
19-
ssh root@ge.qos.ch "rsync -r -p -z -l --exclude=log/ --delete rsync://yvo.qos.ch/www/www.slf4j.org /var/www"
19+
ssh root@exo1.qos.ch "rsync -r -p -z -l --exclude=log/ --delete rsync://yvo.qos.ch/www/www.slf4j.org /var/www"
2020
}
2121

2222

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
<properties>
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2020
<latest.1.version>1.7.36</latest.1.version>
21-
<latest.2.version>2.0.3</latest.2.version>
21+
<latest.2.version>2.0.6</latest.2.version>
2222
<latest.stable.version>${latest.2.version}</latest.stable.version>
2323
<older.stable.version>${latest.1.version}</older.stable.version>
24-
<logback-javax.version>1.3.2</logback-javax.version>
25-
<logback-jakarta.version>1.4.2</logback-jakarta.version>
26-
<reload4j.version>1.2.22</reload4j.version>
24+
<logback-javax.version>1.3.5</logback-javax.version>
25+
<logback-jakarta.version>1.4.5</logback-jakarta.version>
26+
<reload4j.version>1.2.24</reload4j.version>
2727
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
2828
<maven-site-plugin.version>3.7.1</maven-site-plugin.version>
2929
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>

‎src/site/pages/css/site3.css‎

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
--max-menu-width: 14rem;
1414

1515
--main-logo-height: 2rem;
16-
--sponsor-icon-height: calc(var(--main-logo-height) * 0.5);
17-
--x-logo-height: calc(var(--main-logo-height) * 0.5);
1816
--logo-in-menu-height: 2.5ex;
1917
}
2018

@@ -27,15 +25,6 @@ body {
2725
padding: 0px;
2826
counter-reset: example; /* Create an example counter scope */
2927

30-
/*display: grid;*/
31-
32-
/*gap: 0rem;*/
33-
/*grid-template-columns: 1fr;*/
34-
/*grid-template-areas:*/
35-
/* 'headerArea'*/
36-
/* 'contentArea';*/
37-
38-
/* mobile first */
3928
margin-left: 1rem;
4029
margin-right: 1rem;
4130
}
@@ -54,8 +43,6 @@ table {
5443

5544
:root {
5645
--main-logo-height: 3rem;
57-
--sponsor-icon-height: calc(var(--main-logo-height) * 0.7);
58-
--x-logo-height: calc(var(--main-logo-height) * 0.7);
5946
}
6047

6148
body {
@@ -79,8 +66,16 @@ img.logo {
7966
height: var(--main-logo-height);
8067
}
8168

82-
img.sponsorIcon {
83-
height: var(--sponsor-icon-height);
69+
img.avatar-icon,
70+
img.sponsor-icon,
71+
img.twitter-logo{
72+
max-height: calc(var(--main-logo-height))
73+
}
74+
75+
div.twitter,
76+
div.avatar {
77+
width: calc(var(--main-logo-height) );
78+
margin: 3px;
8479
}
8580

8681
pre, div.bodyTable {
@@ -110,12 +105,7 @@ img.data {
110105
/*max-width: calc(var(--max-width-on-wide-screen) * 0.75);*/
111106
}
112107

113-
.twitter-logo{
114-
height: var(--x-logo-height);
115-
}
116-
.github-logo {
117-
height: var(--logo-in-menu-height);
118-
}
108+
119109

120110
/*-----------------------------------------*/
121111

@@ -149,20 +139,34 @@ img.data {
149139
align-self: end;
150140
}
151141

142+
#header-grid-icons-item-flex-container {
143+
display: flex;
144+
flex-direction: row;
145+
align-items: center; /* vertical alignment: */
146+
/*justify-content: flex-end;*/
147+
}
148+
152149
#header-grid-line-item {
153150
grid-area: header-line-area;
154151
}
155152

156153
div#ad {
157154
grid-area: ad-area;
158-
margin: 0.5rem;
159155
}
160156

161157
div#ad,
162158
.horizontal-ad {
163159
max-height: calc(var(--main-logo-height) * 2);
164160
}
165161

162+
.top-message {
163+
background-color: #f9f9f9;
164+
color: #999;
165+
text-align: center;
166+
border-bottom: 1px solid #EEE;
167+
border-radius: 3px;
168+
}
169+
166170
div#sponsor {
167171
float: right;
168172
display: flex;
@@ -178,6 +182,10 @@ div#sponsor {
178182
padding: 0px;
179183
}
180184

185+
div.pub {
186+
margin: 0px;
187+
padding: 0px;
188+
}
181189
p.sponsoredBy {
182190
padding: 2px;
183191
margin: 0px;
@@ -188,6 +196,7 @@ p.sponsoredBy {
188196
border-bottom: solid 1px #CCCCCC;
189197
}
190198
div.spotify {
199+
margin: 3px;
191200
background-color: #FFEEDD;
192201
}
193202
img.spotify {

‎src/site/pages/download.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<script type="text/javascript" src="templates/sponsoredBy.js" ></script>
1818

1919
<h2>STABLE version</h2>
20-
20+
2121
<p>The current stable and actively developed version of SLF4J
2222
is
2323
<span class="big green">${latest.stable.version}</span>.
@@ -28,8 +28,8 @@ <h2>Older stable version (INACTIVE)</h2>
2828
<p>The older stable SLF4J version is <span class="big
2929
green">${older.stable.version}</span>. It is no longer actively
3030
developed.</p>
31-
32-
31+
32+
3333
<h2>Maven central</h2>
3434

3535
<p>SLF4J artifacts such as <em>.jar</em>, <em>.sources.jar</em>

‎src/site/pages/index.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
<script src="templates/header3.js" type="text/javascript"></script>
1313

1414
<div id="content">
15-
15+
16+
<script type="text/javascript" src="templates/sponsoredBy.js" ></script>
1617

1718
<h2>Simple Logging Facade for Java (SLF4J)</h2>
1819

‎src/site/pages/manual.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<title>SLF4J Manual</title>
88
<script type="text/javascript">prefix='';</script>
9-
109
</head>
1110

1211
<body onLoad="enableMenuEventListeners(); hljs.highlightAll(); decorate();">

‎src/site/pages/news.html‎

Lines changed: 76 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ <h1>SLF4J News</h1>
3232
class names in <code/>
3333
-->
3434

35-
<hr noshade="noshade" size="1"/>
36-
37-
<h3 class="doAnchor" name="2.0.3">2022-09-28 - Release of SLF4J 2.0.3</h3>
35+
<h2>On the 2.0.x series</h2>
3836

3937
<p class="highlight">The the 2.0.x series requires Java&nbsp;8 and
4038
adds a backward-compatible <a
@@ -58,6 +56,81 @@ <h3 class="doAnchor" name="2.0.3">2022-09-28 - Release of SLF4J 2.0.3</h3>
5856
href="faq.html#changesInVersion200">detailed</a> in the FAQ page.
5957
</p>
6058

59+
<hr noshade="noshade" size="1"/>
60+
61+
<h3 class="doAnchor" name="2.0.6">2022-12-12 - Release of SLF4J 2.0.6</h3>
62+
63+
64+
<p>&bull; When replaying events occuring during initialization, the
65+
<code>LoggerFactory#replaySingleEvent</code> method now applies
66+
filtering by level by invoking the filtering methods of the
67+
underlying logging system whereas previous the underlying system
68+
was invoked without filtering. This fixes <a
69+
href="https://jira.qos.ch/browse/SLF4J-575">SLF4J-575</a> reported
70+
by Patrick Doyle.</p>
71+
72+
<p>&bull; Artifacts creation now invokes the BND tool to generate
73+
OSGi headers, in particular "uses" clases. This fixes <a
74+
href="https://jira.qos.ch/browse/SLF4J-574">SLF4J-574</a> reported
75+
Jonah Graham who also provided the relevant PR.</p>
76+
77+
78+
<p>&bull; The binary of this version can be reproduced by checking
79+
out the tag v_2.0.6 from the source code repository
80+
(GitHub). Release built using Java "19" 2022-09-20 build 19+36-2038
81+
under Linux Debian 11.2.</p>
82+
83+
84+
<hr noshade="noshade" size="1"/>
85+
86+
<h3 class="doAnchor" name="2.0.5">2022-11-25 - Release of SLF4J 2.0.5</h3>
87+
88+
<p>&bull; If a <code>SecurityManager</code> is installed, then
89+
<code>LoggerFactory</code> will now load providers as a privileged
90+
action by invoking
91+
<code>AccessController.doPrivileged()</code>. This will allow
92+
Wildfy-Core to upgrade to SLF4J 2.0.x as discussed in <a
93+
href="https://github.com/qos-ch/slf4j/pull/304">PR 304</a>
94+
contributed by Piotr P. Karwasz.
95+
</p>
96+
97+
<p>&bull; The binary of this version can be reproduced by checking
98+
out the tag v_2.0.5 from the source code repository
99+
(GitHub). Release built using Java "19" 2022-09-20 build 19+36-2038
100+
under Linux Debian 11.2.</p>
101+
102+
<hr noshade="noshade" size="1"/>
103+
104+
<h3 class="doAnchor" name="2.0.4">2022-11-17 - Release of SLF4J 2.0.4</h3>
105+
106+
<p>&bull; <code>LoggerFactory</code> now uses the class loader that
107+
loaded <code>LoggerFactory</code> class itself to find providers of
108+
type <code>SLF4JServiceProvider</code>. Previously, the thread
109+
context class loader was used. This was unintentional and the
110+
current behavior more closely matches that of the SLF4J 1.7 series
111+
and earlier. This tentatively fixes <a
112+
href="https://jira.qos.ch/browse/SLF4J-544">SLF4J-544</a> as well
113+
as several other related/duplicating issues.
114+
</p>
115+
116+
<p>&bull; The <code>MANIFEST.MF</code> files of slf4j-api,
117+
slf4j-jdk14, slf4j-nop, slf4j-reload4j and slf4j-simple modules now
118+
declare the appropriate OSGi <code>Require-Capability</code> and
119+
<code>Provide-Capability</code> statements in relation to
120+
<code>org.slf4j.spi.SLF4JServiceProvider</code> service. This fixes
121+
<a href="https://jira.qos.ch/browse/SLF4J-572">SLF4J-572</a>
122+
reported by Stefan Bischof who also provided the relevant PR.
123+
</p>
124+
125+
<p>&bull; The binary of this version can be reproduced by checking
126+
out the tag v_2.0.4 from the source code repository
127+
(GitHub). Release built using Java "19" 2022-09-20 build 19+36-2038
128+
under Linux Debian 11.2.</p>
129+
130+
<hr noshade="noshade" size="1"/>
131+
132+
<h3 class="doAnchor" name="2.0.3">2022-09-28 - Release of SLF4J 2.0.3</h3>
133+
61134
<p>&bull; Fixed a bug in <code>Reload4jLoggerAdapter</code> when
62135
used in conjunction with the fluent API, the timestamp would not be
63136
correctly set. This issue was reported

‎src/site/pages/templates/header3.js‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ function insertLogoAndMenu() {
2929
document.write(' <i class="fa-regular fa-code-branch"></i> Source Repository');
3030
//document.write(' <img style="vertical-align: middle;" class="github-logo" src="' + prefix + 'images/GitHub-Mark-32px.png" alt="Source code" /> Source Repository</a>');
3131
document.write(' </a>');
32+
document.write(' <a href="' + prefix + 'count/tidelift.html">');
33+
document.write(' <i class="fa-regular fa-t"></i> Tidelift');
34+
document.write(' </a>');
35+
3236
//document.write(' <a href="http://www.qos.ch/shop/products/professionalSupport"><i class="fa-regular fa-rectangle-pro"></i> Support offerings</a>');
3337
document.write(' </div>');
3438
document.write(' </div>'); // hanging div END
@@ -42,26 +46,24 @@ function insertLogoAndMenu() {
4246
document.write(' <div>'); // hanging div START
4347
document.write(' <div class="dropdown-heading">Wrapped implementations</div>');
4448
document.write(' <div class="dropdown-links">');
45-
document.write(' <a href="api/org/slf4j/jul/JDK14LoggerAdapter.html">JUL</a>');
46-
document.write(' <a href="api/org/slf4j/reload4j/Reload4jLoggerAdapter.html">log4j 1.x (replaced by reload4j)</a>');
47-
document.write(' <a href="api/org/slf4j/reload4j/Reload4jLoggerAdapter.html">reload4j</a>');
48-
document.write(' <a href="api/org/slf4j/simple/SimpleLogger.html">Simple</a>');
49+
document.write(' <a href="api/org/slf4j/jul/JDK14LoggerAdapter.html">slf4j-jdk14</a>');
50+
document.write(' <a href="api/org/slf4j/reload4j/Reload4jLoggerAdapter.html">slf4j-log4j 1.x (superseded by slf4j-reload4j)</a>');
51+
document.write(' <a href="api/org/slf4j/reload4j/Reload4jLoggerAdapter.html">slf4j-reload4j</a>');
52+
document.write(' <a href="api/org/slf4j/simple/SimpleLogger.html">slf4j-simple</a>');
4953
document.write(' </div>');
5054
document.write(' </div>'); // hanging div END
5155
document.write(' <div>'); // hanging div START
5256
document.write(' <div class="dropdown-heading">Other implementations</div>');
5357
document.write(' <div class="dropdown-links">');
54-
document.write(' <a href="https://tinylog.org/v2/download/#slf4j">tinylog</a>');
58+
document.write(' <a href="' + prefix +'count/tinylog.html">tinylog</a>');
59+
document.write(' <a href="' + prefix +'count/jboss.html">JBoss logging</a>');
5560
document.write(' </div>');
5661
document.write(' </div>'); // hanging div END
5762

5863
document.write(' </div>');
5964
document.write(' </div>');
6065
}
6166

62-
63-
document.write('<div id="header">');
64-
6567
document.write('<link rel="stylesheet" type="text/css" href="'+prefix+'css/site3.css"/>');
6668
document.write('<link rel="stylesheet" type="text/css" href="'+prefix+'css/menu2.css"/>');
6769
document.write('<link rel="stylesheet" type="text/css" href="'+prefix+'css/stackoverflow-light.min.css"/>');
@@ -75,6 +77,8 @@ document.write('<script type="text/javascript" src="'+prefix+'js/menuListener.js
7577
document.write('<script type="text/javascript" src="'+prefix+'js/decorator.js"></script>');
7678
document.write('<script type="text/javascript" src="'+prefix+'js/highlight.min.js"></script>');
7779

80+
document.write('<div id="header">');
81+
7882
document.write('<div id="header-grid">');
7983

8084
document.write('<div id="header-grid-logo-item">');
@@ -83,24 +87,36 @@ document.write('</div>');
8387

8488
document.write('<div id="header-grid-icons-item">');
8589

90+
document.write('<div id="header-grid-icons-item-flex-container">');
91+
92+
document.write(' <div class="sponsor">');
8693
document.write(' <a href="' + prefix +'count/sponsor.html"">');
87-
document.write(' <img class="sponsorIcon" src="' + prefix + 'images/sponsor.png" alt="Sponsor qos-ch"/>');
94+
document.write(' <img class="sponsor-icon" src="' + prefix + 'images/sponsor.png" alt="Sponsor qos-ch"/>');
8895
document.write(' </a>');
96+
document.write(' </div>');
8997

98+
document.write(' <div class="twitter">');
9099
document.write(' <a href="' + prefix +'count/twitter.html">');
91100
document.write(' <img class="twitter-logo" src="' + prefix + 'images/TwitterLogo_blue.svg" alt="Follow @qos_ch on Twitter"/>');
92101
document.write(' </a>');
102+
document.write(' </div>');
93103

104+
// close header-grid-icons-item-flex-container
105+
document.write('</div>');
94106
// close #header-grid-icons-item
95107
document.write('</div>');
96108

97109
// div close #header-grid-icons-item
98110
document.write(' <div id="header-grid-line-item" class="headerline"></div>');
99111

100-
document.write('<div id="ad">');
101-
document.write(' <script type="text/javascript" src="'+prefix+'templates/ad.js" ></script>');
112+
document.write('<div id="ad" class="top-message">');
113+
document.write(' <p>Need an issue fixed as soon as possible? Consider <a href="'+prefix+'count/champion.html"><i class="fa-regular fa-trophy"></i> championing a release</a>.</p>');
102114
document.write('</div>');
103115

116+
// document.write('<div id="ad">');
117+
// document.write(' <script type="text/javascript" src="'+prefix+'templates/ad.js" ></script>');
118+
// document.write('</div>');
119+
104120
// close #header-grid
105121
document.write('</div>');
106122

‎src/site/pages/templates/sponsoredBy.js‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11

22
document.write('<div id="sponsor">');
33

4-
document.write(' <p class="sponsoredBy">&nbsp;Sponsored by:</p>');
4+
document.write('<p class="sponsoredBy">&nbsp;Sponsored by:</p>');
55

6-
document.write(' <div class="spotify"><a href="' + prefix +'count/spotify.html" style="">'+
7-
'<img class="spotify" alt="Spotify R&amp;D" src="' + prefix + 'images/logos/spotify-rnd-black.png"/>'+
8-
'</a></div>');
6+
document.write('<div class="pub">');
7+
document.write(' <a href="' + prefix +'count/spotify.html" style="">');
8+
document.write(' <img class="spotify" alt="Spotify R&amp;D" src="' + prefix + 'images/logos/spotify-rnd-black.png"/>');
9+
document.write(' </a>');
10+
document.write(' <a href="' + prefix +'count/exoscale.html" style="">');
11+
document.write(' <img class="exoscale" alt="Exoscale" src="' + prefix + 'images/logos/exoscale.png"/>');
12+
document.write(' </a>');
913

10-
document.write(' <div><a href="' + prefix +'count/exoscale.html" style="">'+
11-
'<img class="exoscale" alt="Exoscale" src="' + prefix + 'images/logos/exoscale.png"/>'+
12-
'</a></div>');
14+
15+
document.write('</div>');
1316

1417
// close div.sponsor
1518
document.write('</div>');

0 commit comments

Comments
 (0)