Skip to content

fix: remove deprecated parent pom #1785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
elharo merged 2 commits into from
May 4, 2021
Merged

fix: remove deprecated parent pom #1785

elharo merged 2 commits into from
May 4, 2021

Conversation

@elharo
Copy link
Contributor

@elharo elharo commented May 4, 2021

@elharo elharo requested review from a team and Neenu1995 May 4, 2021 16:32
@google-cla google-cla bot added the cla: yes This human has signed the Contributor License Agreement. label May 4, 2021
@suztomo
Copy link
Member

suztomo commented May 4, 2021 •
edited
Loading

I ran the diff in the effective poms on google-api-java-client/google-api-client/pom.xml below.

Would you add a description field in the root parent pom?

suztomo-macbookpro44% git diff /tmp/google-api-client.master.pom /tmp/google-api-client.i1784.pom
diff --git a/tmp/google-api-client.master.pom b/tmp/google-api-client.i1784.pom
index 4f93633e..34b1d9a5 100644
--- a/tmp/google-api-client.master.pom
+++ b/tmp/google-api-client.i1784.pom
@@ -23,7 +23,7 @@ Effective POMs, after inheritance, interpolation, and profiles are applied:
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ====================================================================== -->
 <!--                                                                        -->
-<!-- Generated by Maven Help Plugin on 2021-05-04T13:04:31-04:00            -->
+<!-- Generated by Maven Help Plugin on 2021-05-04T13:05:00-04:00            -->
 <!-- See: http://maven.apache.org/plugins/maven-help-plugin/                -->
 <!--                                                                        -->
 <!-- ====================================================================== -->
@@ -44,7 +44,6 @@ Effective POMs, after inheritance, interpolation, and profiles are applied:
   <artifactId>google-api-client</artifactId>
   <version>1.31.5-SNAPSHOT</version>
   <name>Google APIs Client Library for Java</name>
-  <description>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</description>
   <url>https://github.com/googleapis/google-api-java-client/google-api-client</url>
   <inceptionYear>2010</inceptionYear>
   <organization>
@@ -67,18 +66,6 @@ Effective POMs, after inheritance, interpolation, and profiles are applied:
     <system>GitHub</system>
     <url>https://github.com/googleapis/google-api-java-client/issues</url>
   </issueManagement>
-  <distributionManagement>
-    <repository>
-      <id>sonatype-nexus-staging</id>
-      <name>Nexus Release Repository</name>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-    <snapshotRepository>
-      <id>sonatype-nexus-snapshots</id>
-      <name>Sonatype Nexus Snapshots</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-    </snapshotRepository>
-  </distributionManagement>
   <properties>
     <deploy.autorelease>false</deploy.autorelease>
     <os.detected.arch>x86_64</os.detected.arch>
@@ -100,7 +87,6 @@ Effective POMs, after inheritance, interpolation, and profiles are applied:
     <project.protobuf-java.version>3.15.8</project.protobuf-java.version>
     <project.servlet-api.version>2.5</project.servlet-api.version>
     <project.xpp3.version>1.1.4c</project.xpp3.version>
-    <sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -350,17 +336,6 @@ Effective POMs, after inheritance, interpolation, and profiles are applied:
     </dependency>
   </dependencies>
   <repositories>
-    <repository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <id>sonatype-nexus-snapshots</id>
-      <name>Sonatype Nexus Snapshots</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </repository>
     <repository>
       <snapshots>
         <enabled>false</enabled>
@@ -521,12 +496,7 @@ Effective POMs, after inheritance, interpolation, and profiles are applied:
         </plugin>
         <plugin>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.1</version>
-          <configuration>
-            <mavenExecutorId>forked-path</mavenExecutorId>
-            <useReleaseProfile>false</useReleaseProfile>
-            <arguments>-Psonatype-oss-release</arguments>
-          </configuration>
+          <version>2.5.3</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -544,7 +514,6 @@ Effective POMs, after inheritance, interpolation, and profiles are applied:
               <rules>
                 <requireMavenVersion>
                   <version>[3.5.4,4.0.0)</version>
-                  <message>Maven 2.1.0 and 2.2.0 produce incorrect GPG signatures and checksums respectively.</message>
                 </requireMavenVersion>
               </rules>
             </configuration>

For the repository configuration, I believe Yoshi team's file uploading does not read the distributionManagement element.

@elharo elharo changed the title remove deprecated parent pom fix: remove deprecated parent pom May 4, 2021
@elharo
Copy link
Contributor Author

elharo commented May 4, 2021

What do you want the description field to say? The old description was simply incorrect so removing it completely is a step forward, and adding a new one is a separate issue.

@suztomo
Copy link
Member

suztomo commented May 4, 2021

What do you want the description field to say?

Let's put "The Google APIs Client Library for Java is a flexible, efficient, and powerful Java client library for accessing any HTTP-based API on the web, not just Google APIs." (from the README.md of this repository)

@suztomo
Copy link
Member

suztomo commented May 4, 2021

My concern on the description tag is that the nexus staging repository might require the field. If it doesn't require, then that's fine.

@elharo
Copy link
Contributor Author

elharo commented May 4, 2021

Good point. Added.

@elharo elharo merged commit 5da3355 into master May 4, 2021
@elharo elharo deleted the i1784 branch May 4, 2021 20:56
gcf-merge-on-green bot pushed a commit that referenced this pull request May 10, 2021
@release-please
chore: release 1.31.5 (#1773)
f483c90 
🤖 I have created a release \*beep\* \*boop\*
---
### [1.31.5](https://www.github.com/googleapis/google-api-java-client/compare/v1.31.4...v1.31.5) (2021-05-10)


### Bug Fixes

* release scripts from issuing overlapping phases ([#1769](https://www.github.com/googleapis/google-api-java-client/issues/1769)) ([3174ff9](https://www.github.com/googleapis/google-api-java-client/commit/3174ff9ddf0c7428b90bff766c6b18bf17d1feac))
* remove deprecated parent pom ([#1785](https://www.github.com/googleapis/google-api-java-client/issues/1785)) ([5da3355](https://www.github.com/googleapis/google-api-java-client/commit/5da335518ff5076ea5dd4f40fd0494330458296c))
* update GoogleJsonError object to accomodate all fields in Invalid parameter exception ([#1783](https://www.github.com/googleapis/google-api-java-client/issues/1783)) ([94c4570](https://www.github.com/googleapis/google-api-java-client/commit/94c4570e16324b4c654d4ec3f0f940926064d955))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@suztomo suztomo suztomo approved these changes

@Neenu1995 Neenu1995 Neenu1995 approved these changes

Assignees

No one assigned

Labels

cla: yes This human has signed the Contributor License Agreement.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

org.sonatype.oss:oss-parent is deprecated and should be removed

3 participants

@elharo @suztomo @Neenu1995