3.2.1 (#47)
* Release preparations
* Update HowToReleaseJDO.md
* [maven-release-plugin] prepare release v3.2.1-rc1
* [maven-release-plugin] prepare for next development iteration
* JDO-813: Avoid duplicated license and notice files in distribution artifact (#48)
Co-authored-by: Michael Bouschen <mbo@apache.org>
* [maven-release-plugin] prepare release v3.2.1-rc2
* [maven-release-plugin] prepare for next development iteration
* [maven-release-plugin] prepare release v3.2.1
* [maven-release-plugin] prepare for next development iteration
Co-authored-by: Michael Bouschen <mbo@apache.org>
diff --git a/HowToReleaseJDO.md b/HowToReleaseJDO.md
index fa00055..97048af 100644
--- a/HowToReleaseJDO.md
+++ b/HowToReleaseJDO.md
@@ -107,29 +107,20 @@
git checkout -b 3.2
git push -u origin 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
-
-4. If needed, update the dependency to the RI, DataNucleus, in the tck
+3. If needed, update the dependency to the RI, DataNucleus, in the tck
`pom.xml`.
-5. If needed, apply patches from the main branch to the release branch.
+4. 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. Updating `pom.xml`
- files is not necessary at this point. Check the following files:
- * `README.md`
- File names and version references in the Overview section (for a
- major release only.)
+5. Update version numbers where necessary in projects to be released,
+ if these changes haven't been made previously (some changes are for majopr releases only).
+ Updating `pom.xml` files is not necessary at this point. Check the following files:
+ * `README.md`
+ * `tck/RunRules.md`: Update version number and date
- * `tck/RunRules.md`
- Update version number
-
-7. Check the `<scm>` settings in the parent `pom.xml` file in the new branch. Note that and
- that the maven release plugin tends to remove the section. It should look as follows:
+6. Check the `<scm>` settings in the parent `pom.xml` file in the new branch. Note that and
+ that the maven release plugin tends to remove the section. It should be between
+ `<mailingLists>` and `<properties>`, and look as follows:
<scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false"
child.scm.url.inherit.append.path="false">
@@ -138,20 +129,20 @@
<url>https://gitbox.apache.org/repos/asf?p=db-jdo.git</url>
</scm>
-8. Follow the instructions at [Publishing Maven
+7. Follow the instructions at [Publishing Maven
Artifacts](https://infra.apache.org/publishing-maven-artifacts.html)
to set up your development environment.
-9. Copy the JNDI implementation jars (`providerutil.jar` and
+8. 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**
-10. Make sure the TCK passes
+9. Make sure the TCK passes
- mvn clean install
+ mvn clean install
-11. Build the distribution with the following command:
+10. Build the distribution with the following command:
mvn clean install -Papache-release -Djdo.tck.doRunTCK=false -Djdo.tck.doInstallSchema=false -Djdo.tck.doEnhance=false
@@ -160,7 +151,7 @@
to create the `<artifact>.asc` GPG signatures.
This happens multiple times.
-12. Run [Apache Rat](http://creadur.apache.org/rat) on the release
+11. 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
@@ -191,12 +182,12 @@
mvn release:prepare -Papache-release -DautoVersionSubmodules=true -DdryRun=true -Dresume=false
mvn deploy -Papache-release
- Check the artifacts at [the Maven release
- repository](https://repository.apache.org/content/repositories/snapshots/)
+ Check the artifacts at the Maven release repository for
+ [javax.jdo](https://repository.apache.org/content/repositories/snapshots/javax/jdo/jdo-api/) and
+ [org.apach.jdo](https://repository.apache.org/content/repositories/snapshots/org/apache/jdo/).
-14. Check out the SVN repository at
- https://dist.apache.org/repos/dist/release/db/jdo and make sure that
- the key used to sign the artifacts is included in the KEYS file.
+14. Make sure that the key used to sign the artifacts is included in the
+ [KEYS](https://dist.apache.org/repos/dist/release/db/jdo/KEYS) file (this is an SVN repository).
15. Prepare and release the artifacts. There are interoperability issues
with the maven release plugin and cygwin, so if on Windows, use a
diff --git a/LICENSE.txt b/LICENSE
similarity index 100%
rename from LICENSE.txt
rename to LICENSE
diff --git a/NOTICE.txt b/NOTICE
similarity index 100%
rename from NOTICE.txt
rename to NOTICE
diff --git a/api/pom.xml b/api/pom.xml
index 86b76d0..b108302 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,13 +21,14 @@
<parent>
<groupId>org.apache.jdo</groupId>
<artifactId>parent-pom</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
<relativePath>../parent-pom</relativePath>
</parent>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
+ <!-- The name is used when generating a NOTICE file -->
<name>JDO API</name>
<dependencies>
diff --git a/exectck/pom.xml b/exectck/pom.xml
index ff7d73e..7bc67ae 100644
--- a/exectck/pom.xml
+++ b/exectck/pom.xml
@@ -21,13 +21,13 @@
<parent>
<groupId>org.apache.jdo</groupId>
<artifactId>parent-pom</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
<relativePath>../parent-pom</relativePath>
</parent>
<groupId>org.apache.jdo</groupId>
<artifactId>jdo-exectck</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>JDO TCK Execution Maven Mojo</name>
diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml
index c7d8153..46bb807 100644
--- a/parent-pom/pom.xml
+++ b/parent-pom/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.jdo</groupId>
<artifactId>parent-pom</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JDO PARENT</name>
@@ -38,7 +38,8 @@
<url>http://db.apache.org/jdo</url>
<inceptionYear>2005</inceptionYear>
<organization>
- <name>Apache Software Foundation</name>
+ <!-- The name is used when generating a NOTICE file -->
+ <name>The Apache Software Foundation</name>
<url>http://www.apache.org</url>
</organization>
@@ -154,8 +155,15 @@
</mailingList>
</mailingLists>
+ <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/db-jdo.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/db-jdo.git</developerConnection>
+ <url>https://gitbox.apache.org/repos/asf?p=db-jdo.git</url>
+ <tag>HEAD</tag>
+ </scm>
+
<properties>
- <project.build.outputTimestamp>1</project.build.outputTimestamp>
+ <project.build.outputTimestamp>1653505066</project.build.outputTimestamp>
</properties>
<dependencyManagement>
@@ -163,17 +171,17 @@
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.jdo</groupId>
<artifactId>jdo-exectck</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.jdo</groupId>
<artifactId>jdo-tck</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/pom.xml b/pom.xml
index b3a50c2..fcc4990 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.jdo</groupId>
<artifactId>parent-pom</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
<relativePath>parent-pom</relativePath>
</parent>
<groupId>org.apache</groupId>
<artifactId>jdo</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JDO Root POM</name>
diff --git a/tck/RunRules.md b/tck/RunRules.md
index 2c59a65..a1018bf 100644
--- a/tck/RunRules.md
+++ b/tck/RunRules.md
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-Running the JDO 3.2 Technology Compatibility Kit
+Running the JDO 3.2.1 Technology Compatibility Kit
================================================
- [Overview](#overview)
@@ -27,7 +27,7 @@
- [First Level TCK Appeals Process](#firstlevel)
- [Prerequisites](#prerequisites)
-1-November-2021
+12-May-2022
<span id="overview"></span>
diff --git a/tck/pom.xml b/tck/pom.xml
index 85910b0..3b70cb8 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -21,13 +21,13 @@
<parent>
<groupId>org.apache.jdo</groupId>
<artifactId>parent-pom</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
<relativePath>../parent-pom</relativePath>
</parent>
<groupId>org.apache.jdo</groupId>
<artifactId>jdo-tck</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
<name>JDO Technology Compatibility Kit (TCK)</name>
<description>The Java Data Objects (JDO) API is a standard interface-based Java model abstraction of persistence, developed as Java Specification Request JSR 243 under the auspices of the Java Community Process.
@@ -98,7 +98,7 @@
<plugin>
<groupId>org.apache.jdo</groupId>
<artifactId>jdo-exectck</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
<executions>
<execution>
<goals>
