You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/09/26 18:20:17 UTC
[logging-parent] branch release/10.1.0 created (now 57158b6)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch release/10.1.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
at 57158b6 Fix the website URL
This branch includes the following new commits:
new 7a7eae7 Add `parsedVersion` property to `constants-tmpl-adoc` profile
new bf0a6f0 Remove website-related release instructions
new 57158b6 Fix the website URL
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.
[logging-parent] 02/03: Remove website-related release instructions
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/10.1.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit bf0a6f0f57b96b2773ed2768fd45b604dd365001
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Tue Sep 26 20:16:51 2023 +0200
Remove website-related release instructions
---
src/site/release-instructions.adoc | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/src/site/release-instructions.adoc b/src/site/release-instructions.adoc
index 3ed8814..5ed540d 100644
--- a/src/site/release-instructions.adoc
+++ b/src/site/release-instructions.adoc
@@ -62,13 +62,6 @@ You can iterate on the `release/7.8.0` branch to perfect it.
====
. _Close_ the repository in https://repository.apache.org/[repository.apache.org]
-[#stage-website]
-=== Stage the website
-. Check out the `asf-staging` branch of https://github.com/apache/logging-site[the `logging-site` repository]
-. Add the contents of the generated website from the https://dist.apache.org/repos/dist/dev/logging/{project-id}[dist.apache.org/repos/dist/**dev**/logging/{project-id}] Subversion directory to `content/{project-id}` folder
-. Commit and push your changes
-. Verify the result in https://logging.staged.apache.org/{project-id}
-
[#vote-release]
=== Vote the release
@@ -150,11 +143,6 @@ Once the artifacts are visible in https://central.sonatype.dev/[central.sonatype
. Use the `rel/7.8.0` tag
. Copy release notes from the generated emails
-[#publish-website]
-=== Publish the website
-. Cherry-pick the `asf-staging` branch commit of https://github.com/apache/logging-site[the `logging-site` repository] to `asf-site` branch and push your changes
-. Verify the result in https://logging.apache.org/{project-id}
-
[#announce-release]
=== Announce the release
[logging-parent] 03/03: Fix the website URL
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/10.1.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 57158b6f3c8635bc1a17de63e6d9c80c7da73196
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Tue Sep 26 20:17:29 2023 +0200
Fix the website URL
---
.asf.yaml | 2 +-
README.adoc | 2 +-
src/changelog/.10.x.x/.release-notes.adoc.ftl | 2 +-
src/changelog/.10.x.x/add-website.xml | 2 +-
src/site/release-notes/_10.x.x.adoc | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 1d51505..7de06b9 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -20,7 +20,7 @@
github:
description: Parent project internally used in Maven-based projects of the Apache Logging Services
- homepage: https://logging.apache.org/logging-parent
+ homepage: https://logging.apache.org/logging-parent/latest
labels:
- apache
- java
diff --git a/README.adoc b/README.adoc
index 5078251..b22a300 100644
--- a/README.adoc
+++ b/README.adoc
@@ -19,4 +19,4 @@ https://github.com/apache/logging-parent/actions[image:https://github.com/apache
https://search.maven.org/search?q=g:org.apache.logging%20a:logging-parent[image:https://img.shields.io/maven-central/v/org.apache.logging/logging-parent.svg[Maven Central]]
https://www.apache.org/licenses/LICENSE-2.0.txt[image:https://img.shields.io/github/license/apache/logging-parent.svg[License]]
-Parent project **internally** used in Maven-based projects of https://logging.apache.org[the Apache Logging Services] projects. See https://logging.apache.org/logging-parent[the project website] for further information.
+Parent project **internally** used in Maven-based projects of https://logging.apache.org[the Apache Logging Services] projects. See https://logging.apache.org/logging-parent/latest[the project website] for further information.
diff --git a/src/changelog/.10.x.x/.release-notes.adoc.ftl b/src/changelog/.10.x.x/.release-notes.adoc.ftl
index d4548e9..8662cca 100644
--- a/src/changelog/.10.x.x/.release-notes.adoc.ftl
+++ b/src/changelog/.10.x.x/.release-notes.adoc.ftl
@@ -39,7 +39,7 @@
<#if release.date?has_content>Release date:: ${release.date}</#if>
This minor release focuses on shipping AsciiDoc-based website generation convenience targeting the `src/site` folder.
-As a part of this effort, `logging-parent` started publishing https://logging.apache.org/logging-parent[its own website] and `log4j-changelog` support is switched from Markdown to AsciiDoc.
+As a part of this effort, `logging-parent` started publishing https://logging.apache.org/logging-parent/latest[its own website] and `log4j-changelog` support is switched from Markdown to AsciiDoc.
The introduced https://github.com/bndtools/bnd/blob/master/maven-plugins/bnd-maven-plugin[`bnd-maven-plugin`] default auto-generates both OSGi and JPMS descriptors.
Users only need to annotate packages that are to be exported with `org.osgi.annotation.bundle.Export`, plugin will do the rest of the magic.
diff --git a/src/changelog/.10.x.x/add-website.xml b/src/changelog/.10.x.x/add-website.xml
index 5049731..de74f27 100644
--- a/src/changelog/.10.x.x/add-website.xml
+++ b/src/changelog/.10.x.x/add-website.xml
@@ -4,5 +4,5 @@
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
type="added">
<author id="github:vy"/>
- <description format="asciidoc">Started publishing https://logging.apache.org/logging-parent[the project website]</description>
+ <description format="asciidoc">Started publishing https://logging.apache.org/logging-parent/latest[the project website]</description>
</entry>
diff --git a/src/site/release-notes/_10.x.x.adoc b/src/site/release-notes/_10.x.x.adoc
index f1e32f3..2cd309c 100644
--- a/src/site/release-notes/_10.x.x.adoc
+++ b/src/site/release-notes/_10.x.x.adoc
@@ -39,7 +39,7 @@
This minor release focuses on shipping AsciiDoc-based website generation convenience targeting the `src/site` folder.
-As a part of this effort, `logging-parent` started publishing https://logging.apache.org/logging-parent[its own website] and `log4j-changelog` support is switched from Markdown to AsciiDoc.
+As a part of this effort, `logging-parent` started publishing https://logging.apache.org/logging-parent/latest[its own website] and `log4j-changelog` support is switched from Markdown to AsciiDoc.
The introduced https://github.com/bndtools/bnd/blob/master/maven-plugins/bnd-maven-plugin[`bnd-maven-plugin`] default auto-generates both OSGi and JPMS descriptors.
Users only need to annotate packages that are to be exported with `org.osgi.annotation.bundle.Export`, plugin will do the rest of the magic.
@@ -52,7 +52,7 @@ In particular, we expect the absence of `module-info.java` files to avoid severa
* Added `asciidoc` and `constants-tmpl-adoc` profiles to generate AsciiDoc-based websites from `src/site`
* Added support to auto-generate changelog entries for `dependabot` updates
* Added `bnd-maven-plugin` defaults to auto-generate both OSGi and JPMS descriptors
-* Started publishing https://logging.apache.org/logging-parent[the project website]
+* Started publishing https://logging.apache.org/logging-parent/latest[the project website]
==== Changed
[logging-parent] 01/03: Add `parsedVersion` property to `constants-tmpl-adoc` profile
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/10.1.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 7a7eae733ce39b9ac8a78a4a67419651eb18e43e
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Tue Sep 26 13:23:10 2023 +0200
Add `parsedVersion` property to `constants-tmpl-adoc` profile
---
pom.xml | 22 ++++++++++++++++++++++
src/site/_constants.adoc | 1 +
src/site/_constants.tmpl.adoc | 1 +
3 files changed, 24 insertions(+)
diff --git a/pom.xml b/pom.xml
index 3c20877..458a2d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,6 +122,7 @@
<!-- plugin versions -->
<beanshell-maven-plugin.version>1.4</beanshell-maven-plugin.version>
<bnd-maven-plugin.version>6.4.0</bnd-maven-plugin.version>
+ <build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
<error-prone.version>2.22.0</error-prone.version>
<findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
@@ -223,6 +224,12 @@
<version>${bnd-maven-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>${build-helper-maven-plugin.version}</version>
+ </plugin>
+
</plugins>
</pluginManagement>
@@ -977,6 +984,21 @@
<build>
<plugins>
+ <!-- populate the `parsedVersion` property -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ <phase>validate</phase>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- copy `src/site/_constants.tmpl.adoc` to `target/constants-adoc/_constants.adoc` -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc
index 3768cad..d206630 100644
--- a/src/site/_constants.adoc
+++ b/src/site/_constants.adoc
@@ -35,6 +35,7 @@
:project-github-url: https://github.com/apache/logging-parent
:project-version: 10.1.0-SNAPSHOT
+:project-version-major: 10
:project-name: Logging Parent
:project-id: logging-parent
:java-target-version: 8
diff --git a/src/site/_constants.tmpl.adoc b/src/site/_constants.tmpl.adoc
index 6e88ae8..2609b6f 100644
--- a/src/site/_constants.tmpl.adoc
+++ b/src/site/_constants.tmpl.adoc
@@ -35,6 +35,7 @@
:project-github-url: ${scm.url}
:project-version: ${project.version}
+:project-version-major: ${parsedVersion.majorVersion}
:project-name: Logging Parent
:project-id: logging-parent
:java-target-version: ${maven.compiler.target}