Provide a diff file to make it easier to deploy JGit snapshot
Provide a git diff that can be applied to JGit to make it easier to apply the necessary changes in pom.xml for deployment to the Gerrit Maven repository. Update the instructions to describe how to use it as an alternative to manually updating pom.xml. Change-Id: Ib8b2655abbd49b546e88ccf90def8329e749aa8b
This commit is contained in:
parent
addada1449
commit
b8fbb8ac61
@ -143,10 +143,9 @@ deployable to the `gerrit-maven` storage bucket:
|
|||||||
----
|
----
|
||||||
|
|
||||||
[NOTE]
|
[NOTE]
|
||||||
In case of JGit the `pom.xml` already contains a distributionManagement
|
In case of JGit the `pom.xml` already contains a `distributionManagement`
|
||||||
section. Replace the existing distributionManagement section with this snippet
|
section. To deploy the artifacts to the `gerrit-maven` repository, replace
|
||||||
in order to deploy the artifacts only in the gerrit-maven repository.
|
the existing `distributionManagement` section with this snippet.
|
||||||
|
|
||||||
|
|
||||||
* Add these two snippets to the `pom.xml` to enable the wagon provider:
|
* Add these two snippets to the `pom.xml` to enable the wagon provider:
|
||||||
|
|
||||||
|
@ -1,33 +1,44 @@
|
|||||||
= Making a Release of JGit
|
= Making a Snapshot Release of JGit
|
||||||
|
|
||||||
This step is only necessary if we need to create an unofficial JGit
|
This step is only necessary if we need to create an unofficial JGit
|
||||||
snapshot release and publish it to the
|
snapshot release and publish it to the
|
||||||
link:https://developers.google.com/storage/[Google Cloud Storage].
|
link:https://developers.google.com/storage/[Google Cloud Storage].
|
||||||
|
|
||||||
|
[[prepare-environment]]
|
||||||
|
== Prepare the Maven Environment
|
||||||
|
|
||||||
|
First, make sure you have done the necessary
|
||||||
|
link:dev-release-deploy-config.html#deploy-configuration-settings-xml[
|
||||||
|
configuration in Maven `settings.xml`].
|
||||||
|
|
||||||
|
To apply the necessary settings in JGit's `pom.xml`, follow the instructions
|
||||||
|
in link:dev-release-deploy-config.html#deploy-configuration-subprojects[
|
||||||
|
Configuration for Subprojects in `pom.xml`], or apply the provided diff by
|
||||||
|
executing the following command in the JGit workspace:
|
||||||
|
|
||||||
|
----
|
||||||
|
git apply /path/to/gerrit/tools/jgit-snapshot-deploy-pom.diff
|
||||||
|
----
|
||||||
|
|
||||||
[[prepare-release]]
|
[[prepare-release]]
|
||||||
== Prepare the Release
|
== Prepare the Release
|
||||||
|
|
||||||
Since JGit has its own release process we do not push any release tags
|
Since JGit has its own release process we do not push any release tags. Instead
|
||||||
for JGit. Instead we will use the output of the `git describe` as the
|
we will use the output of `git describe` as the version of the current JGit
|
||||||
version of the current JGit snapshot.
|
snapshot.
|
||||||
|
|
||||||
|
In the JGit workspace, execute the following command:
|
||||||
|
|
||||||
----
|
----
|
||||||
./tools/version.sh --release $(git describe)
|
./tools/version.sh --release $(git describe)
|
||||||
----
|
----
|
||||||
|
|
||||||
|
|
||||||
[[publish-release]]
|
[[publish-release]]
|
||||||
== Publish the Release
|
== Publish the Release
|
||||||
|
|
||||||
* Make sure you have done the configuration needed for deployment:
|
To deploy the new snapshot, execute the following command in the JGit
|
||||||
** link:dev-release-deploy-config.html#deploy-configuration-settings-xml[
|
workspace:
|
||||||
Configuration in Maven `settings.xml`]
|
|
||||||
** link:dev-release-deploy-config.html#deploy-configuration-subprojects[
|
|
||||||
Configuration for Subprojects in `pom.xml`]
|
|
||||||
|
|
||||||
* Deploy the new snapshot. From JGit workspace execute:
|
|
||||||
+
|
|
||||||
----
|
----
|
||||||
mvn deploy
|
mvn deploy
|
||||||
----
|
----
|
||||||
|
43
tools/jgit-snapshot-deploy-pom.diff
Normal file
43
tools/jgit-snapshot-deploy-pom.diff
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
diff --git a/pom.xml b/pom.xml
|
||||||
|
index d256bbb..7e523fd 100644
|
||||||
|
--- a/pom.xml
|
||||||
|
+++ b/pom.xml
|
||||||
|
@@ -226,6 +226,10 @@
|
||||||
|
|
||||||
|
<pluginRepositories>
|
||||||
|
<pluginRepository>
|
||||||
|
+ <id>gerrit-maven</id>
|
||||||
|
+ <url>https://gerrit-maven.commondatastorage.googleapis.com</url>
|
||||||
|
+ </pluginRepository>
|
||||||
|
+ <pluginRepository>
|
||||||
|
<id>repo.eclipse.org.cbi-releases</id>
|
||||||
|
<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
|
||||||
|
</pluginRepository>
|
||||||
|
@@ -236,6 +240,13 @@
|
||||||
|
</pluginRepositories>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
+ <extensions>
|
||||||
|
+ <extension>
|
||||||
|
+ <groupId>com.googlesource.gerrit</groupId>
|
||||||
|
+ <artifactId>gs-maven-wagon</artifactId>
|
||||||
|
+ <version>3.3</version>
|
||||||
|
+ </extension>
|
||||||
|
+ </extensions>
|
||||||
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
@@ -649,9 +660,10 @@
|
||||||
|
|
||||||
|
<distributionManagement>
|
||||||
|
<repository>
|
||||||
|
- <id>repo.eclipse.org</id>
|
||||||
|
- <name>JGit Maven Repository - Releases</name>
|
||||||
|
- <url>https://repo.eclipse.org/content/repositories/jgit-releases/</url>
|
||||||
|
+ <id>gerrit-maven-repository</id>
|
||||||
|
+ <name>Gerrit Maven Repository</name>
|
||||||
|
+ <url>gs://gerrit-maven</url>
|
||||||
|
+ <uniqueVersion>true</uniqueVersion>
|
||||||
|
</repository>
|
||||||
|
<snapshotRepository>
|
||||||
|
<id>repo.eclipse.org</id>
|
Loading…
x
Reference in New Issue
Block a user