You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2023/09/15 12:48:10 UTC
[logging-log4j-scala] branch facelift updated (3c019b5 -> 1ebc938)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch facelift
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git
from 3c019b5 Attempt to add Maven
new b569396 Fix compilation
new 7acdc9b Fix license warnings
new 1ebc938 Fix compilation of 2.10, 2.11 and 3
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:
.github/workflows/ci.yml | 4 ++-
NOTICE.txt | 3 ++
log4j-api-scala_2.10/pom.xml | 25 ++++++++++++++--
log4j-api-scala_2.11/pom.xml | 25 ++++++++++++++--
log4j-api-scala_2.12/pom.xml | 27 +++++++++++++++--
log4j-api-scala_2.13/pom.xml | 27 +++++++++++++++--
log4j-api-scala_3/pom.xml | 27 +++++++++++++++--
pom.xml | 69 +++++++++++++++++++++++++++++++++++++++-----
version.sbt | 16 ++++++++++
9 files changed, 199 insertions(+), 24 deletions(-)
[logging-log4j-scala] 01/03: Fix compilation
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch facelift
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git
commit b569396796cb27e32b06075a7ba86ac6eefb0771
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Fri Sep 15 11:23:34 2023 +0200
Fix compilation
---
pom.xml | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 68333ca..ab9be8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<revision>13.0.0-SNAPSHOT</revision>
<!-- javac version (should work with the minimum `scala.version`!) -->
- <minimalJavaBuildVersion>[1.8,1.9)</minimalJavaBuildVersion>
+ <minimalJavaBuildVersion>[1.8,9)</minimalJavaBuildVersion>
<!-- scala version (to be overridden by modules!) -->
<scala.version.group>2.10</scala.version.group>
@@ -62,6 +62,8 @@
<scalatestplus.version>3.2.10.0</scalatestplus.version>
<!-- plugin versions -->
+ <!-- Last one that runs on JDK 8 -->
+ <spotless-maven-plugin.version>2.30.0</spotless-maven-plugin.version>
<scala-maven-plugin.version>4.8.1</scala-maven-plugin.version>
</properties>
@@ -146,6 +148,7 @@
<scalaVersion>${scala.version}</scalaVersion>
<!-- disabling zinc, since it is causing compilation failures -->
<recompileMode>all</recompileMode>
+ <target>8</target>
</configuration>
</execution>
</executions>
@@ -154,6 +157,21 @@
</plugins>
</pluginManagement>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <!-- Unrecognized BSD license -->
+ <exclude>sbt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
</build>
</project>
[logging-log4j-scala] 02/03: Fix license warnings
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch facelift
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git
commit 7acdc9bce24f974cdf083a16d0f1278f4d1b8c7d
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Fri Sep 15 11:24:20 2023 +0200
Fix license warnings
---
.github/workflows/ci.yml | 4 +++-
NOTICE.txt | 3 +++
log4j-api-scala_2.10/pom.xml | 20 +++++++++++++++++---
log4j-api-scala_2.11/pom.xml | 20 +++++++++++++++++---
log4j-api-scala_2.12/pom.xml | 20 +++++++++++++++++---
log4j-api-scala_2.13/pom.xml | 20 +++++++++++++++++---
log4j-api-scala_3/pom.xml | 20 +++++++++++++++++---
pom.xml | 21 ++++++++++++++-------
version.sbt | 16 ++++++++++++++++
9 files changed, 121 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index df3fc9a..2cfa633 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,7 +1,8 @@
+#
# 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 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
#
@@ -12,6 +13,7 @@
# 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.
+#
name: CI
on:
diff --git a/NOTICE.txt b/NOTICE.txt
index 1824969..9aa3215 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -7,3 +7,6 @@ The Apache Software Foundation (http://www.apache.org/).
AsciidocPlugin.scala
Copyright (c) 2008, 2009, 2010, 2011 Josh Suereth, Steven Blundy, Josh Cough,
Mark Harrah, Stuart Roebuck, Tony Sloane, Vesa Vilhonen, Jason Zaugg
+
+sbt
+Copyright (c) 2011, Paul Phillips.
diff --git a/log4j-api-scala_2.10/pom.xml b/log4j-api-scala_2.10/pom.xml
index b05db0e..18ef695 100644
--- a/log4j-api-scala_2.10/pom.xml
+++ b/log4j-api-scala_2.10/pom.xml
@@ -1,7 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/log4j-api-scala_2.11/pom.xml b/log4j-api-scala_2.11/pom.xml
index ca9a454..dc182d7 100644
--- a/log4j-api-scala_2.11/pom.xml
+++ b/log4j-api-scala_2.11/pom.xml
@@ -1,7 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/log4j-api-scala_2.12/pom.xml b/log4j-api-scala_2.12/pom.xml
index 2b5afc7..833986a 100644
--- a/log4j-api-scala_2.12/pom.xml
+++ b/log4j-api-scala_2.12/pom.xml
@@ -1,7 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/log4j-api-scala_2.13/pom.xml b/log4j-api-scala_2.13/pom.xml
index b3aae80..af27184 100644
--- a/log4j-api-scala_2.13/pom.xml
+++ b/log4j-api-scala_2.13/pom.xml
@@ -1,7 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/log4j-api-scala_3/pom.xml b/log4j-api-scala_3/pom.xml
index eaa6639..549af8e 100644
--- a/log4j-api-scala_3/pom.xml
+++ b/log4j-api-scala_3/pom.xml
@@ -1,7 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/pom.xml b/pom.xml
index ab9be8f..b61be90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>
<version>10.0.0</version>
- <relativePath/>
+ <relativePath />
</parent>
<artifactId>log4j-api-scala-parent</artifactId>
@@ -60,6 +60,7 @@
<mockito.version>4.11.0</mockito.version>
<scalatest.version>3.2.10</scalatest.version>
<scalatestplus.version>3.2.10.0</scalatestplus.version>
+ <spotbugs-annotations.version>4.7.3</spotbugs-annotations.version>
<!-- plugin versions -->
<!-- Last one that runs on JDK 8 -->
@@ -75,8 +76,8 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
<version>${log4j.version}</version>
- <scope>import</scope>
<type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
@@ -121,18 +122,20 @@
<version>${scalatestplus.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ <version>${spotbugs-annotations.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
<build>
- <sourceDirectory>src/main/scala</sourceDirectory>
-
- <testSourceDirectory>src/test/scala</testSourceDirectory>
-
<pluginManagement>
- <plugins>
+ <plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
@@ -172,6 +175,10 @@
</plugins>
+ <sourceDirectory>src/main/scala</sourceDirectory>
+
+ <testSourceDirectory>src/test/scala</testSourceDirectory>
+
</build>
</project>
diff --git a/version.sbt b/version.sbt
index b64de7a..59f8e69 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1,17 @@
+/*
+ * 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.
+ */
ThisBuild / version := "13.0.0-SNAPSHOT"
[logging-log4j-scala] 03/03: Fix compilation of 2.10, 2.11 and 3
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch facelift
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git
commit 1ebc9381e6c3d001a682e696101cd5cc41642d42
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Fri Sep 15 14:48:03 2023 +0200
Fix compilation of 2.10, 2.11 and 3
---
log4j-api-scala_2.10/pom.xml | 5 +++++
log4j-api-scala_2.11/pom.xml | 5 +++++
log4j-api-scala_2.12/pom.xml | 7 +++++++
log4j-api-scala_2.13/pom.xml | 7 +++++++
log4j-api-scala_3/pom.xml | 7 +++++++
pom.xml | 30 +++++++++++++++++++++++++++++-
6 files changed, 60 insertions(+), 1 deletion(-)
diff --git a/log4j-api-scala_2.10/pom.xml b/log4j-api-scala_2.10/pom.xml
index 18ef695..5809806 100644
--- a/log4j-api-scala_2.10/pom.xml
+++ b/log4j-api-scala_2.10/pom.xml
@@ -85,6 +85,11 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ </plugin>
+
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
diff --git a/log4j-api-scala_2.11/pom.xml b/log4j-api-scala_2.11/pom.xml
index dc182d7..582c4ec 100644
--- a/log4j-api-scala_2.11/pom.xml
+++ b/log4j-api-scala_2.11/pom.xml
@@ -85,6 +85,11 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ </plugin>
+
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
diff --git a/log4j-api-scala_2.12/pom.xml b/log4j-api-scala_2.12/pom.xml
index 833986a..44d5d3c 100644
--- a/log4j-api-scala_2.12/pom.xml
+++ b/log4j-api-scala_2.12/pom.xml
@@ -39,6 +39,13 @@
<artifactId>log4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/log4j-api-scala_2.13/pom.xml b/log4j-api-scala_2.13/pom.xml
index af27184..25b7d65 100644
--- a/log4j-api-scala_2.13/pom.xml
+++ b/log4j-api-scala_2.13/pom.xml
@@ -39,6 +39,13 @@
<artifactId>log4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/log4j-api-scala_3/pom.xml b/log4j-api-scala_3/pom.xml
index 549af8e..3dc55b3 100644
--- a/log4j-api-scala_3/pom.xml
+++ b/log4j-api-scala_3/pom.xml
@@ -39,6 +39,13 @@
<artifactId>log4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala3-library_${scala.version.group}</artifactId>
+ <version>${scala.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/pom.xml b/pom.xml
index b61be90..5177434 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,16 +44,23 @@
<revision>13.0.0-SNAPSHOT</revision>
<!-- javac version (should work with the minimum `scala.version`!) -->
- <minimalJavaBuildVersion>[1.8,9)</minimalJavaBuildVersion>
+ <minimalJavaBuildVersion>[17,18)</minimalJavaBuildVersion>
<!-- scala version (to be overridden by modules!) -->
<scala.version.group>2.10</scala.version.group>
<scala.version>${scala.version.group}.7</scala.version>
+ <!-- JDK 8 does not support -release -->
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
+
<!-- disable `maven-site-plugin`-->
<maven.site.skip>true</maven.site.skip>
<maven.site.deploy.skip>true</maven.site.deploy.skip>
+ <!-- disable Spotbugs -->
+ <spotbugs.skip>true</spotbugs.skip>
+
<!-- dependency version -->
<junit.version>4.13.2</junit.version>
<log4j.version>2.20.0</log4j.version>
@@ -148,6 +155,7 @@
<goal>testCompile</goal>
</goals>
<configuration>
+ <release />
<scalaVersion>${scala.version}</scalaVersion>
<!-- disabling zinc, since it is causing compilation failures -->
<recompileMode>all</recompileMode>
@@ -157,6 +165,26 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <toolchains>
+ <jdk>
+ <version>[1.8,9)</version>
+ </jdk>
+ </toolchains>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>toolchain</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</pluginManagement>