Update `org.apache.logging:logging-parent` to version `12.1.1`
diff --git a/.github/generate-email.sh b/.github/generate-email.sh
index 25402c0..52eabec 100755
--- a/.github/generate-email.sh
+++ b/.github/generate-email.sh
@@ -28,12 +28,12 @@
fail_for_invalid_args() {
stderr "Invalid arguments!"
- stderr "Expected arguments: <vote|announce> <version> <commitId>"
+ stderr "Expected arguments: <vote|announce> <version> <commitId> <nexusUrl>"
exit 1
}
# Check arguments
-[ $# -ne 3 ] && fail_for_invalid_args
+[ $# -ne 4 ] && fail_for_invalid_args
# Constants
PROJECT_NAME="Apache Log4j JMX GUI"
@@ -43,6 +43,7 @@
PROJECT_REPO="https://github.com/apache/logging-log4j-jmx-gui"
PROJECT_VERSION="$2"
COMMIT_ID="$3"
+NEXUS_URL="$4"
PROJECT_DIST_URL="https://dist.apache.org/repos/dist/dev/logging/$PROJECT_ID/$PROJECT_VERSION"
# Check release notes file
@@ -71,7 +72,7 @@
GitHub: $PROJECT_REPO
Commit: $COMMIT_ID
Distribution: $PROJECT_DIST_URL
-Nexus: https://repository.apache.org/content/repositories/orgapachelogging-<FIXME>
+Nexus: $NEXUS_URL
Signing key: 0x077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0
Review kit: https://s.apache.org/logging-parent-release-review-kit
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6cf158d..8ef1fcc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,14 +38,14 @@
build:
if: github.actor != 'dependabot[bot]'
- uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.0
+ uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.1
with:
site-enabled: true
deploy-snapshot:
needs: build
if: github.repository == 'apache/logging-log4j-jmx-gui' && github.ref == 'refs/heads/main'
- uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/11.3.0
+ uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/12.1.1
# Secrets for deployments
secrets:
NEXUS_USERNAME: ${{ secrets.NEXUS_USER }}
diff --git a/.github/workflows/deploy-site.yaml b/.github/workflows/deploy-site.yaml
index ef4f531..230d88e 100644
--- a/.github/workflows/deploy-site.yaml
+++ b/.github/workflows/deploy-site.yaml
@@ -60,7 +60,6 @@
with:
asf-yaml-content: |
publish:
- profile: ~
whoami: ${{ github.ref_name }}-out
subdir: content/log4j/jmx-gui
target-branch: ${{ github.ref_name }}-out
diff --git a/.github/workflows/merge-dependabot.yaml b/.github/workflows/merge-dependabot.yaml
index a945d94..e3a4789 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -30,7 +30,7 @@
build:
if: github.repository == 'apache/logging-log4j-jmx-gui' && github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
- uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.0
+ uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.1
merge-dependabot:
needs: build
diff --git a/pom.xml b/pom.xml
index 8eb2d7a..7bbc8cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>
- <version>11.3.0</version>
+ <version>12.1.1</version>
</parent>
<groupId>org.apache.logging.log4j</groupId>
@@ -148,8 +148,12 @@
<project.build.outputTimestamp>2023-11-15T15:33:35Z</project.build.outputTimestamp>
<!-- dependency versions -->
+ <bnd.annotation.version>7.1.0</bnd.annotation.version>
<log4j.version>2.25.1</log4j.version>
<nashorn.version>15.6</nashorn.version>
+ <osgi.annotation.bundle.version>2.0.0</osgi.annotation.bundle.version>
+ <osgi.annotation.versioning.version>1.1.2</osgi.annotation.versioning.version>
+ <spotbugs-annotations.version>4.9.3</spotbugs-annotations.version>
<!-- Additional manifest entries -->
<Class-Path>log4j-api-${log4j.version}.jar log4j-core-${log4j.version}.jar</Class-Path>
@@ -161,24 +165,28 @@
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.annotation</artifactId>
+ <version>${bnd.annotation.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
+ <version>${spotbugs-annotations.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.annotation</artifactId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <version>${osgi.annotation.versioning.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation.bundle</artifactId>
+ <version>${osgi.annotation.bundle.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/src/changelog/.2.x.x/update_apache_logging_parent.xml b/src/changelog/.2.x.x/update_apache_logging_parent.xml
index 62d57a3..517026f 100644
--- a/src/changelog/.2.x.x/update_apache_logging_parent.xml
+++ b/src/changelog/.2.x.x/update_apache_logging_parent.xml
@@ -3,6 +3,5 @@
xmlns="https://logging.apache.org/xml/ns"
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
type="updated">
- <issue id="17" link="https://github.com/apache/logging-log4j-jmx-gui/pull/17"/>
- <description format="asciidoc">Update `apache/logging-parent` to version ``</description>
+ <description format="asciidoc">Update `apache/logging-parent` to version `12.1.1`</description>
</entry>
