Skip to content

Commit 1f6831c

Browse files
hazendazhazendaz
authored
Merge pull request #69 from hazendaz/master
Use spdx for license header (same epl 1.0)
2 parents b225bcd + 093a587 commit 1f6831c

File tree

10 files changed

+32
-82
lines changed

10 files changed

+32
-82
lines changed

‎.mvn/extensions.xml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Tomcat-Slf4j-Logback (https://github.com/tomcat-slf4j-logback/tomcat-slf4j-logback-config/)
4+
SPDX-License-Identifier: EPL-1.0
5+
See LICENSE file for details.
56
6-
Copyright (c) 2010-2025 Tomcat-Slf4j-Logback.
7-
8-
All rights reserved. This program and the accompanying materials are made available under the
9-
terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available
10-
at https://www.eclipse.org/legal/epl-v10.html.
11-
12-
Contributors: Tomcat-Slf4j-Logback Team.
7+
Copyright 2010-2026 tomcat-slf4j-logback
138
149
-->
1510
<extensions>

‎.mvn/settings.xml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Tomcat-Slf4j-Logback (https://github.com/tomcat-slf4j-logback/tomcat-slf4j-logback-config/)
4+
SPDX-License-Identifier: EPL-1.0
5+
See LICENSE file for details.
56
6-
Copyright (c) 2010-2025 Tomcat-Slf4j-Logback.
7-
8-
All rights reserved. This program and the accompanying materials are made available under the
9-
terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available
10-
at https://www.eclipse.org/legal/epl-v10.html.
11-
12-
Contributors: Tomcat-Slf4j-Logback Team.
7+
Copyright 2010-2026 tomcat-slf4j-logback
138
149
-->
1510
<settings xmlns="http://maven.apache.org/SETTINGS/1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

‎LICENSE_HEADER‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
Tomcat-Slf4j-Logback (https://github.com/tomcat-slf4j-logback/tomcat-slf4j-logback-config/)
1+
SPDX-License-Identifier: EPL-1.0
2+
See LICENSE file for details.
23

3-
Copyright (c) ${license.git.copyrightYears} Tomcat-Slf4j-Logback.
4-
5-
All rights reserved. This program and the accompanying materials are made available under the
6-
terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available
7-
at https://www.eclipse.org/legal/epl-v10.html.
8-
9-
Contributors: Tomcat-Slf4j-Logback Team.
4+
Copyright ${license.git.copyrightYears} ${owner}

‎pom.xml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Tomcat-Slf4j-Logback (https://github.com/tomcat-slf4j-logback/tomcat-slf4j-logback-config/)
4+
SPDX-License-Identifier: EPL-1.0
5+
See LICENSE file for details.
56
6-
Copyright (c) 2010-2026 Tomcat-Slf4j-Logback.
7-
8-
All rights reserved. This program and the accompanying materials are made available under the
9-
terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available
10-
at https://www.eclipse.org/legal/epl-v10.html.
11-
12-
Contributors: Tomcat-Slf4j-Logback Team.
7+
Copyright 2010-2026 tomcat-slf4j-logback
138
149
-->
1510
<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -34,8 +29,8 @@
3429

3530
<licenses>
3631
<license>
37-
<name>Eclipse Public License</name>
38-
<url>https://raw.githubusercontent.com/tomcat-slf4j-logback/tomcat-slf4j-logback-parent/refs/heads/master/LICENSE</url>
32+
<name>Eclipse Public License, 1.0</name>
33+
<url>https://www.eclipse.org/legal/epl-v10.html</url>
3934
<distribution>repo</distribution>
4035
</license>
4136
<license>

‎src/main/resources/assembly/assembly.xml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Tomcat-Slf4j-Logback (https://github.com/tomcat-slf4j-logback/tomcat-slf4j-logback-config/)
4+
SPDX-License-Identifier: EPL-1.0
5+
See LICENSE file for details.
56
6-
Copyright (c) 2010-2024 Tomcat-Slf4j-Logback.
7-
8-
All rights reserved. This program and the accompanying materials are made available under the
9-
terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available
10-
at https://www.eclipse.org/legal/epl-v10.html.
11-
12-
Contributors: Tomcat-Slf4j-Logback Team.
7+
Copyright 2010-2026 tomcat-slf4j-logback
138
149
-->
1510
<assembly xmlns="https://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"

‎src/main/resources/assembly/bin/setenv.bat‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
@REM
2-
@REM Tomcat-Slf4j-Logback (https://github.com/tomcat-slf4j-logback/tomcat-slf4j-logback-config/)
2+
@REM SPDX-License-Identifier: EPL-1.0
3+
@REM See LICENSE file for details.
34
@REM
4-
@REM Copyright (c) 2010-2019 Tomcat-Slf4j-Logback.
5-
@REM
6-
@REM All rights reserved. This program and the accompanying materials are made available under the
7-
@REM terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available
8-
@REM at https://www.eclipse.org/legal/epl-v10.html.
9-
@REM
10-
@REM Contributors: Tomcat-Slf4j-Logback Team.
5+
@REM Copyright 2010-2026 tomcat-slf4j-logback
116
@REM
127

138
set JAVA_OPTS=%JAVA_OPTS% -Djuli-logback.configurationFile="%CATALINA_HOME%\conf\logback.xml"

‎src/main/resources/assembly/bin/setenv.sh‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
#
2-
# Tomcat-Slf4j-Logback (https://github.com/tomcat-slf4j-logback/tomcat-slf4j-logback-config/)
2+
# SPDX-License-Identifier: EPL-1.0
3+
# See LICENSE file for details.
34
#
4-
# Copyright (c) 2010-2020 Tomcat-Slf4j-Logback.
5-
#
6-
# All rights reserved. This program and the accompanying materials are made available under the
7-
# terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available
8-
# at https://www.eclipse.org/legal/epl-v10.html.
9-
#
10-
# Contributors: Tomcat-Slf4j-Logback Team.
5+
# Copyright 2010-2026 tomcat-slf4j-logback
116
#
127

138
JAVA_OPTS="$JAVA_OPTS -Djuli-logback.configurationFile=$CATALINA_HOME/conf/logback.xml"

‎src/main/resources/assembly/conf/logback-access.xml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Tomcat-Slf4j-Logback (https://github.com/tomcat-slf4j-logback/tomcat-slf4j-logback-config/)
4+
SPDX-License-Identifier: EPL-1.0
5+
See LICENSE file for details.
56
6-
Copyright (c) 2010-2025 Tomcat-Slf4j-Logback.
7-
8-
All rights reserved. This program and the accompanying materials are made available under the
9-
terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available
10-
at https://www.eclipse.org/legal/epl-v10.html.
11-
12-
Contributors: Tomcat-Slf4j-Logback Team.
7+
Copyright 2010-2026 tomcat-slf4j-logback
138
149
-->
1510
<configuration>

‎src/main/resources/assembly/conf/logback.xml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Tomcat-Slf4j-Logback (https://github.com/tomcat-slf4j-logback/tomcat-slf4j-logback-config/)
4+
SPDX-License-Identifier: EPL-1.0
5+
See LICENSE file for details.
56
6-
Copyright (c) 2010-2023 Tomcat-Slf4j-Logback.
7-
8-
All rights reserved. This program and the accompanying materials are made available under the
9-
terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available
10-
at https://www.eclipse.org/legal/epl-v10.html.
11-
12-
Contributors: Tomcat-Slf4j-Logback Team.
7+
Copyright 2010-2026 tomcat-slf4j-logback
138
149
-->
1510
<configuration>

‎src/site/site.xml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Tomcat-Slf4j-Logback (https://github.com/tomcat-slf4j-logback/tomcat-slf4j-logback-config/)
4+
SPDX-License-Identifier: EPL-1.0
5+
See LICENSE file for details.
56
6-
Copyright (c) 2010-2025 Tomcat-Slf4j-Logback.
7-
8-
All rights reserved. This program and the accompanying materials are made available under the
9-
terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available
10-
at https://www.eclipse.org/legal/epl-v10.html.
11-
12-
Contributors: Tomcat-Slf4j-Logback Team.
7+
Copyright 2010-2026 tomcat-slf4j-logback
138
149
-->
1510
<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

0 commit comments

Comments
 (0)