You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by sc...@apache.org on 2023/01/11 00:08:54 UTC
[tomcat] branch 8.5.x updated: Revert "Tag for r8.5.85." This should have been in a branch.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 02b02132aa Revert "Tag for r8.5.85." This should have been in a branch.
02b02132aa is described below
commit 02b02132aadfc3d5f6b6369f6e264fec03abba48
Author: schultz <sc...@apache.org>
AuthorDate: Tue Jan 10 16:08:30 2023 -0800
Revert "Tag for r8.5.85." This should have been in a branch.
This reverts commit c22b29b4da07810269cee64c62b57796fbaeb85a.
---
build.properties.release | 52 ----------------------------------------
res/maven/mvn.properties.release | 27 ---------------------
webapps/docs/changelog.xml | 2 +-
3 files changed, 1 insertion(+), 80 deletions(-)
diff --git a/build.properties.release b/build.properties.release
deleted file mode 100644
index 8d63d8e154..0000000000
--- a/build.properties.release
+++ /dev/null
@@ -1,52 +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
-#
-# 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.
-# -----------------------------------------------------------------------------
-
-# This file was auto-generated by the pre-release Ant target.
-
-# Any unwanted settings may be over-ridden in a build.properties file located
-# in the same directory as this file.
-
-# Set the version-dev to "" (empty string) as this is not a development release.
-version.dev=
-
-# Ensure consistent timestamps for reproducible builds.
-ant.tstamp.now.iso=2023-01-10T23:58:01Z
-
-# Enable insertion of detached signatures into the Windows installer.
-do.codesigning=true
-
-# Re-use the same GPG executable.
-gpg.exec=C:/Program Files (x86)/gnupg/bin/gpg.exe
-
-# Reproducible builds require the use of the build tools defined below. The
-# vendors (where appropriate) and versions must match exactly for a reproducible
-# build since this data is embedded in various files, particularly JAR file
-# manifests, as part of the build process.
-#
-# Apache Ant: Apache Ant(TM) version 1.10.12 compiled on October 13 2021
-#
-# Java Name: OpenJDK 64-Bit Server VM
-# Java Vendor: Eclipse Adoptium
-# Java Version: 11.0.17+8
-
-# The following is provided for information only. Builds will be repeatable
-# whether or not the build environment in consistent with this information.
-#
-# OS: amd64 Windows 10 10.0
-# File encoding: Cp1252
-#
-# Release Manager: schultz
diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release
deleted file mode 100644
index 27c3c12bc3..0000000000
--- a/res/maven/mvn.properties.release
+++ /dev/null
@@ -1,27 +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
-#
-# 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.
-# -----------------------------------------------------------------------------
-
-# This file was auto-generated by the pre-release Ant target.
-
-# Remove "-dev" from the version since this is not a development release.
-maven.asf.release.deploy.version=8.5.85
-
-# Re-use the same GPG executable.
-gpg.exec=C:/Program Files (x86)/gnupg/bin/gpg.exe
-
-# Set the user name to use to upload the artefacts to Nexus.
-asf.ldap.username=schultz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c12e35a124..06f4f23a17 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,7 @@
They eventually become mixed with the numbered issues (i.e., numbered
issues do not "pop up" wrt. others).
-->
-<section name="Tomcat 8.5.85 (schultz)" rtext="">
+<section name="Tomcat 8.5.85 (schultz)" rtext="in development">
<subsection name="Catalina">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org