You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by ti...@apache.org on 2021/10/29 19:20:16 UTC
[db-jdo] 01/01: Revert "Pre 3.2 release fixes (#33)"
This is an automated email from the ASF dual-hosted git repository.
tilmannz pushed a commit to branch revert-33-pre-3.2-RC1-fixes
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
commit 6d55724fb4ca34d7737ca72aefe6ae7739a9bcc5
Author: Tilmann <ti...@gmx.de>
AuthorDate: Fri Oct 29 21:20:09 2021 +0200
Revert "Pre 3.2 release fixes (#33)"
This reverts commit 5747304cba6041270e2c728f32518743c3c02a8a.
---
.rat-excludes | 1 -
HowToReleaseJDO.md | 51 +++++++++++++++++++++++----------------------------
parent-pom/pom.xml | 2 +-
3 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/.rat-excludes b/.rat-excludes
index fcf26d6..fd92448 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -33,7 +33,6 @@ Q*MeetingRoom.java
Q*Person.java
Q*Project.java
Q*DiscriminatorClassName*.java
-QPC*Annotated.java
QPrimitiveTypes.java
QVersionedPCPoint.java
QNamedQueriesSample.java
diff --git a/HowToReleaseJDO.md b/HowToReleaseJDO.md
index 3103bb8..350742c 100644
--- a/HowToReleaseJDO.md
+++ b/HowToReleaseJDO.md
@@ -105,45 +105,41 @@ Detailed process steps
main branch.
git checkout -b 3.2
- git push -u origin 3.2
+ git push -u 3.2
3. In the release branch, update version numbers in the following files in
preparation for the next release:
- * `tck/README.md`
- Update version number and date
+ tck/README.md
+ Update version number and date
Use the maven version plug-in to update version numbers in the
- `pom.xml` files at the root and subproject levels.
-
- mvn versions:set -DnewVersion=3.2-RC1 -DprocessAllModules
- mvn versions:update-parent -DallowSnapshots=true -DnewVersion=3.2-RC1 -DprocessAllModulesss
- mvn versions:commit -DprocessAllModules
+ pom.xml files at the root and subproject levels.
4. If needed, update the dependency to the RI, DataNucleus, in the tck
- `pom.xml`.
+ pom.xml.
5. If needed, apply patches from the main branch to the release branch.
6. Update version numbers where necessary in projects to be released,
if these changes haven't been made previously. Check the following
files:
- * `README.md`
- File names and version references in the Overview section (for a
+ README.md
+ File names and version references in the Overview section (for a
major release only.)
- * `tck/RunRules.md`
- Update version number
+ tck/RunRules.md
+ Update version number
-7. Check the scm settings in the `pom.xml` files in the new branch and
+7. Check the scm settings in the pom.xml files in the new branch and
make sure they refer to the new branch (instead of the main branch).
8. Follow the instructions at [Publishing Maven
- Artifacts](https://infra.apache.org/publishing-maven-artifacts.html)
+ Artifacts](http://www.apache.org/dev/publishing-maven-artifacts.html)
to set up your development environment.
-9. Copy the JNDI implementation jars (`providerutil.jar` and
- `fscontext.jar`) to the branch `lib/ext` directory. This is needed to
+9. Copy the JNDI implementation jars (providerutil.jar and
+ fscontext.jar) to the branch lib/ext directory. This is needed to
test the tck before distributing it.
**Do not check these in into the repository**
@@ -157,29 +153,28 @@ Detailed process steps
This creates the .jar and .pom files in the target directory of each
subproject. Be prepared to enter your key passcode when prompted,
- to create the `<artifact>.asc` GPG signatures.
+ to create the <artifact>.asc GPG signatures.
This happens multiple times.
12. Run [Apache Rat](http://creadur.apache.org/rat) on the release
artifacts to verify the results of the build.
Download Apache Rat from https://creadur.apache.org/rat/download_rat.cgi
- and extract the Jar-File, e.g. `apache-rat-0.13.jar`
+ and extract the Jar-File, e.g. apache-rat-0.13.jar
- java -jar apache-rat-0.13.jar -E .rat-excludes -d api/target/jdo-api-3.2-RC1-sources.jar
- java -jar apache-rat-0.13.jar -E .rat-excludes -d tck/target/jdo-tck-3.2-RC1-sources.jar
+ java -jar apache-rat-0.13.jar -E .rat-excludes -d api/target/jdo-api-3.2-SNAPSHOT-sources.jar
+ java -jar apache-rat-0.13.jar -E .rat-excludes -d tck/target/jdo-tck-3.2-SNAPSHOT-sources.jar
13. Do a dry run prepare and deployment of a *snapshot release*. You might
want to do this in a fresh workspace, since you cannot have local
- modifications when preparing a release. The files in `lib/ext and`
- `lib/jdori` count as local modifications. Be prepared to enter your
+ modifications when preparing a release. The files in lib/ext and
+ lib/jdori count as local modifications. Be prepared to enter your
key passcode when prompted. This happens multiple times.
- The release plugin will ask the following questions and expects an input:
- * What is the release version for "JDO Root POM"?
- * What is the SCM release tag or label for "JDO Root POM"?
- * What is the new development version for "JDO Root POM"?
-
+ The release plugin will will ask the following questions and expects an input:
+ What is the release version for "JDO Root POM"?
+ What is the SCM release tag or label for "JDO Root POM"?
+ What is the new development version for "JDO Root POM"?
The proposed defaults should be fine.
mkdir tmp
diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml
index a8135c8..922582b 100644
--- a/parent-pom/pom.xml
+++ b/parent-pom/pom.xml
@@ -40,7 +40,7 @@ Requests (JSR 12 and 243) under the auspices of the Java Community Process.</des
<name>Apache Software Foundation</name>
<url>http://www.apache.org</url>
</organization>
-
+
<developers>
<developer>
<id>madams</id>