Adopt most recent `logging-parent` changes
diff --git a/.github/generate-email.sh b/.github/generate-email.sh
index 1be29c5..2f0157b 100755
--- a/.github/generate-email.sh
+++ b/.github/generate-email.sh
@@ -39,14 +39,14 @@
COMMIT_ID="$3"
# Check release notes file
-RELEASE_NOTES_FILE="$SCRIPT_DIR/../target/release-notes/$PROJECT_VERSION.md"
+RELEASE_NOTES_FILE="$SCRIPT_DIR/../src/site/_release-notes/_$PROJECT_VERSION.adoc"
[ -f "$RELEASE_NOTES_FILE" ] || {
stderr "Couldn't find release notes file: $RELEASE_NOTES_FILE"
exit 1
}
dump_release_notes() {
- awk "f{print} /^# $PROJECT_VERSION/{f=1}" "$RELEASE_NOTES_FILE"
+ awk "f{print} /^Release date::/{f=1}" "$RELEASE_NOTES_FILE"
}
case $1 in
diff --git a/log4j-api-kotlin-benchmark/pom.xml b/log4j-api-kotlin-benchmark/pom.xml
index 2aa3923..399fe71 100644
--- a/log4j-api-kotlin-benchmark/pom.xml
+++ b/log4j-api-kotlin-benchmark/pom.xml
@@ -193,7 +193,9 @@
</plugin>
</plugins>
+
<sourceDirectory>src/main/kotlin</sourceDirectory>
+
</build>
</project>
diff --git a/log4j-api-kotlin-sample/pom.xml b/log4j-api-kotlin-sample/pom.xml
index 177ced9..763c06f 100644
--- a/log4j-api-kotlin-sample/pom.xml
+++ b/log4j-api-kotlin-sample/pom.xml
@@ -72,11 +72,6 @@
<plugins>
<plugin>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
diff --git a/log4j-api-kotlin/bnd/log4j-api-kotlin.bnd b/log4j-api-kotlin/bnd/log4j-api-kotlin.bnd
deleted file mode 100644
index 8aa0e9c..0000000
--- a/log4j-api-kotlin/bnd/log4j-api-kotlin.bnd
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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
-#
-# https://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.
-Bundle-SymbolicName: org.apache.logging.log4j.kotlin
-Bundle-Name: ${project.name}
-Bundle-Description: ${project.description}
-Bundle-Vendor: Apache Log4j Kotlin Project
-Bundle-ContactAddress: ${project.parent.url}
-Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.8))"
-
-Import-Package: \
- kotlin, \
- kotlin.*, \
- kotlinx.*;resolution:=optional, \
- *
-
--removeheaders: Private-Package
-
--exportcontents:\
- org.apache.logging.log4j.kotlin
diff --git a/log4j-api-kotlin/pom.xml b/log4j-api-kotlin/pom.xml
index b46690b..b9b57f6 100644
--- a/log4j-api-kotlin/pom.xml
+++ b/log4j-api-kotlin/pom.xml
@@ -64,6 +64,12 @@
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api-test</artifactId>
<scope>test</scope>
@@ -114,50 +120,8 @@
</dependencies>
<build>
-
- <plugins>
-
- <plugin>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-maven-plugin</artifactId>
- <version>${kotlin.version}</version>
- <executions>
- <execution>
- <id>compile</id>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- <execution>
- <id>test-compile</id>
- <goals>
- <goal>test-compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>bnd-process</goal>
- </goals>
- <configuration>
- <bndfile>bnd/${project.artifactId}.bnd</bndfile>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
-
<sourceDirectory>src/main/kotlin</sourceDirectory>
-
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
-
</build>
</project>
diff --git a/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/package-info.java b/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/package-info.java
new file mode 100644
index 0000000..30cbf08
--- /dev/null
+++ b/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/package-info.java
@@ -0,0 +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.
+ */
+@Export
+package org.apache.logging.log4j.kotlin;
+
+import org.osgi.annotation.bundle.Export;
diff --git a/pom.xml b/pom.xml
index c79d51f..9250333 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,10 +134,8 @@
<kotlin.version>1.6.21</kotlin.version>
<kotlinx.coroutines.version>1.6.4</kotlinx.coroutines.version>
<mockito-kotlin.version>4.1.0</mockito-kotlin.version>
- <spotbugs-annotations.version>4.7.3</spotbugs-annotations.version>
<!-- plugin versions -->
- <bnd.plugin.version>6.4.0</bnd.plugin.version>
<build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
<maven-shade-plugin.version>2.2</maven-shade-plugin.version>
@@ -221,12 +219,6 @@
<version>${jmh.version}</version>
</dependency>
- <dependency>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-annotations</artifactId>
- <version>${spotbugs-annotations.version}</version>
- </dependency>
-
</dependencies>
</dependencyManagement>
@@ -253,12 +245,6 @@
</plugin>
<plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <version>${bnd.plugin.version}</version>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven-shade-plugin.version}</version>
diff --git a/src/changelog/.index.adoc.ftl b/src/changelog/.index.adoc.ftl
index 0d60c17..8c4ff21 100644
--- a/src/changelog/.index.adoc.ftl
+++ b/src/changelog/.index.adoc.ftl
@@ -36,6 +36,6 @@
[#release-notes]
== Release Notes
-<#list releases as release>
-include::release-notes/_${release.version}.adoc[]
-</#list>
+<#list releases as release><#if release.changelogEntryCount gt 0>
+include::_release-notes/_${release.version}.adoc[]
+</#if></#list>
diff --git a/src/site/release-notes.adoc b/src/site/_release-notes.adoc
similarity index 92%
rename from src/site/release-notes.adoc
rename to src/site/_release-notes.adoc
index 41f4452..6fbed8f 100644
--- a/src/site/release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@ -36,7 +36,7 @@
[#release-notes]
== Release Notes
-include::release-notes/_1.x.x.adoc[]
-include::release-notes/_1.2.0.adoc[]
-include::release-notes/_1.1.0.adoc[]
-include::release-notes/_1.0.0.adoc[]
+include::_release-notes/_1.x.x.adoc[]
+include::_release-notes/_1.2.0.adoc[]
+include::_release-notes/_1.1.0.adoc[]
+include::_release-notes/_1.0.0.adoc[]
diff --git a/src/site/release-notes/_1.0.0.adoc b/src/site/_release-notes/_1.0.0.adoc
similarity index 100%
rename from src/site/release-notes/_1.0.0.adoc
rename to src/site/_release-notes/_1.0.0.adoc
diff --git a/src/site/release-notes/_1.1.0.adoc b/src/site/_release-notes/_1.1.0.adoc
similarity index 100%
rename from src/site/release-notes/_1.1.0.adoc
rename to src/site/_release-notes/_1.1.0.adoc
diff --git a/src/site/release-notes/_1.2.0.adoc b/src/site/_release-notes/_1.2.0.adoc
similarity index 100%
rename from src/site/release-notes/_1.2.0.adoc
rename to src/site/_release-notes/_1.2.0.adoc
diff --git a/src/site/release-notes/_1.x.x.adoc b/src/site/_release-notes/_1.x.x.adoc
similarity index 100%
rename from src/site/release-notes/_1.x.x.adoc
rename to src/site/_release-notes/_1.x.x.adoc
diff --git a/src/site/index.adoc b/src/site/index.adoc
index 2e83ecd..733c346 100644
--- a/src/site/index.adoc
+++ b/src/site/index.adoc
@@ -240,13 +240,13 @@
If you have encountered an unlisted security vulnerability or other unexpected behaviour that has security impact, please report them privately to mailto:security@logging.apache.org[the Log4j security mailing list].
See https://logging.apache.org/log4j/2.x/security.html[the Log4j Security page] for further details.
-include::release-notes.adoc[]
+include::_release-notes.adoc[]
[#release-instructions]
== Release instructions
{project-name} employs the CI/CD foundation provided by the https://logging.apache.org/logging-parent[`logging-parent`].
-You can simply use https://logging.apache.org/logging-parent/release-instructions.html[its release instructions].
+You can simply use its release instructions.
[#license]
== License
