Change Maven groupId to com.google.oauth-client & some minor release …

…fixes. http://codereview.appspot.com/4798054/
googleapis · JDeveloperINK · Jul 26, 2011 · Jul 26, 2011 · Jul 27, 2011 · Jul 28, 2011
commit 51de154bc2d2837c40284eb30cb5a429beb06c37
diff --git a/google-oauth-client-assembly/assembly.xml b/google-oauth-client-assembly/assembly.xml
@@ -19,14 +19,14 @@
     <fileSet>
       <directory>target/dependencies</directory>
       <excludes>
-        <exclude>google-api-client-*</exclude>
+        <exclude>google-*-client-*</exclude>
       </excludes>
       <outputDirectory>dependencies</outputDirectory>
     </fileSet>
     <fileSet>
       <directory>target/dependencies</directory>
       <includes>
-        <include>google-api-client-*</include>
+        <include>google-*-client-*</include>
       </includes>
       <outputDirectory>/</outputDirectory>
     </fileSet>

diff --git a/google-oauth-client-assembly/pom.xml b/google-oauth-client-assembly/pom.xml
@@ -2,23 +2,23 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.google.oauth.client</groupId>
+    <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
     <version>1.5.0-beta-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-  <groupId>com.google.oauth.client</groupId>
+  <groupId>com.google.oauth-client</groupId>
   <artifactId>google-oauth-client-assembly</artifactId>
   <packaging>pom</packaging>
   <name>Assembly for the Google OAuth Client Library for Java</name>
 
   <dependencies>
     <dependency>
-      <groupId>com.google.oauth.client</groupId>
+      <groupId>com.google.oauth-client</groupId>
       <artifactId>google-oauth-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.oauth.client</groupId>
+      <groupId>com.google.oauth-client</groupId>
       <artifactId>google-oauth-client-extensions</artifactId>
     </dependency>
   </dependencies>

diff --git a/google-oauth-client-extensions/pom.xml b/google-oauth-client-extensions/pom.xml
@@ -2,12 +2,12 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.google.oauth.client</groupId>
+    <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
     <version>1.5.0-beta-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-  <groupId>com.google.oauth.client</groupId>
+  <groupId>com.google.oauth-client</groupId>
   <artifactId>google-oauth-client-extensions</artifactId>
   <name>Platform extensions to the Google OAuth Client Library for Java.</name>
   <build>
@@ -74,11 +74,11 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>com.google.http.client</groupId>
+      <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-extensions</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.oauth.client</groupId>
+      <groupId>com.google.oauth-client</groupId>
       <artifactId>google-oauth-client</artifactId>
     </dependency>
     <dependency>

diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml
@@ -2,7 +2,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.google.oauth.client</groupId>
+    <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
     <version>1.5.0-beta-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
@@ -63,7 +63,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>com.google.http.client</groupId>
+      <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client</artifactId>
     </dependency>
     <dependency>

diff --git a/jdiff.xml b/jdiff.xml
@@ -12,7 +12,7 @@
     <!-- Set to the location of your local hg clone of the "javadoc" repository. -->
     <property name="JAVADOC_PROJECT_ROOT_DIR" value="../javadoc" />
 
-    <property name="TMP_PROJECT_ROOT_DIR" value="/tmp/google-api-java-client" />
+    <property name="TMP_PROJECT_ROOT_DIR" value="/tmp/google-oauth-java-client" />
 
     <taskdef name="jdiff" classname="jdiff.JDiffAntTask"
       classpath="${JDIFF_HOME}/antjdiff.jar:${MAVEN_REPOSITORY_HOME}/org/codehaus/jackson/jackson-core-asl/1.6.7/jackson-core-asl-1.6.7.jar:${MAVEN_REPOSITORY_HOME}/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar" />
@@ -22,21 +22,11 @@
         <!-- This is the location of your old source files -->
         <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.4.1-beta/google-api-client/src/main/java" />
         <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.4.1-beta/google-api-client-extensions/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.4.1-beta/google-api-client-extensions-android2/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.4.1-beta/google-api-client-extensions-android3/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.4.1-beta/google-api-client-googleapis/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.4.1-beta/google-api-client-googleapis-extensions/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.4.1-beta/google-api-client-googleapis-extensions-android2/src/main/java" />
       </old>
-      <new name="Google API Client Library for Java 1.5.0-beta">
+      <new name="Google OAuth Client Library for Java 1.5.0-beta">
         <!-- This is the location of your new source files -->
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.5.0-beta/google-api-client/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.5.0-beta/google-api-client-extensions/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.5.0-beta/google-api-client-extensions-android2/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.5.0-beta/google-api-client-extensions-android3/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.5.0-beta/google-api-client-googleapis/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.5.0-beta/google-api-client-googleapis-extensions/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.5.0-beta/google-api-client-googleapis-extensions-android2/src/main/java" />
+        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.5.0-beta/google-oauth-client/src/main/java" />
+        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.5.0-beta/google-oauth-client-extensions/src/main/java" />
       </new>
     </jdiff>
   </target>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>google</artifactId>
     <version>5</version>
   </parent>
-  <groupId>com.google.oauth.client</groupId>
+  <groupId>com.google.oauth-client</groupId>
   <artifactId>google-oauth-client-parent</artifactId>
   <version>1.5.0-beta-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -20,7 +20,7 @@
     <url>http://code.google.com/p/google-oauth-java-client/issues/list</url>
   </issueManagement>
 
-  <inceptionYear>2010</inceptionYear>
+  <inceptionYear>2011</inceptionYear>
 
   <prerequisites>
     <maven>2.0.9</maven>
@@ -92,22 +92,22 @@
         <version>2.5</version>
       </dependency>
       <dependency>
-        <groupId>com.google.http.client</groupId>
+        <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.google.http.client</groupId>
+        <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-extensions</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.google.oauth.client</groupId>
+        <groupId>com.google.oauth-client</groupId>
         <artifactId>google-oauth-client</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.google.oauth.client</groupId>
+        <groupId>com.google.oauth-client</groupId>
         <artifactId>google-oauth-client-extensions</artifactId>
         <version>${project.version}</version>
       </dependency>

diff --git a/release.html b/release.html
@@ -7,7 +7,7 @@ <h3>First time set up</h3>
 <ul>
   <li>Make sure you have at least a Committer role</li>
   <li>Make sure you have permission to post to the <a
-    href="http://google-api-java-client.blogspot.com/">Announcement Blog</a>.</li>
+    href="http://google-oauth-java-client.blogspot.com/">Announcement Blog</a>.</li>
   <li>Download <a href="http://sourceforge.net/projects/javadiff/">JDiff</a>.</li>
   <li>Set up for pushing to central Maven repository
   <ul>
@@ -26,15 +26,15 @@ <h3>First time set up</h3>
 username = Your Name <yourname @domain.com>
 
 [auth]
-google-api-java-client.prefix = https://google-api-java-client.googlecode.com/hg/
-google-api-java-client.username = <i>[username from <a
+google-oauth-java-client.prefix = https://google-oauth-java-client.googlecode.com/hg/
+google-oauth-java-client.username = <i>[username from <a
       href="https://code.google.com/hosting/settings">https://code.google.com/hosting/settings</a>]</i>
-google-api-java-client.password = <i>[password from <a
+google-oauth-java-client.password = <i>[password from <a
       href="https://code.google.com/hosting/settings">https://code.google.com/hosting/settings</a>]</i></code></pre></li>
-    <li>Add these lines to your <code>~/.hgrc</code>: <pre><code>google-api-java-client.prefix = https://google-api-java-client.googlecode.com/hg/
-google-api-java-client.username = <i>[username from <a
+    <li>Add these lines to your <code>~/.hgrc</code>: <pre><code>google-oauth-java-client.prefix = https://google-oauth-java-client.googlecode.com/hg/
+google-oauth-java-client.username = <i>[username from <a
       href="https://code.google.com/hosting/settings">https://code.google.com/hosting/settings</a>]</i>
-google-api-java-client.password = <i>[password from <a
+google-oauth-java-client.password = <i>[password from <a
       href="https://code.google.com/hosting/settings">https://code.google.com/hosting/settings</a>]</i></code></pre></li>
     <li>Add these lines to your <code>~/.m2/settings.xml</code> (create
     this file if it does not already exist): <pre><code>&lt;settings&gt;
@@ -79,10 +79,10 @@ <h3>Release version 1.5.0-beta</h3>
   <ul>
     <li><pre>
 cd /tmp
-rm -rf google-api-java-client
-mkdir google-api-java-client
-cd google-api-java-client
-hg clone https://google-api-java-client.googlecode.com/hg/ default
+rm -rf google-oauth-java-client
+mkdir google-oauth-java-client
+cd google-oauth-java-client
+hg clone https://google-oauth-java-client.googlecode.com/hg/ default
 </pre></li>
   </ul>
   </li>
@@ -103,7 +103,6 @@ <h3>Release version 1.5.0-beta</h3>
 */pom.xml
 jdiff.xml (first change "1.5" to next minor version, then change "1.4" to "1.5")
 release.html (first change "1.5" to next minor version, then change "1.4" to "1.5")
-google-api-client/src/main/java/com/google/api/client/util/Strings.java
 </pre></li>
     <li>Commit and push: <pre>
 hg commit -m "Start 1.5"
@@ -112,7 +111,7 @@ <h3>Release version 1.5.0-beta</h3>
 </pre></li>
     <li>Merge dev branch for samples: <pre>
 cd /tmp
-hg clone https://samples.google-api-java-client.googlecode.com/hg/ samples
+hg clone https://samples.google-oauth-java-client.googlecode.com/hg/ samples
 cd samples
 hg merge -r dev
 hg commit -m "merge with dev branch"
@@ -125,18 +124,18 @@ <h3>Release version 1.5.0-beta</h3>
   OSS Maven Repository Usage Guide</a>):
   <ul>
     <li>Prepare:<pre>
-cd /tmp/google-api-java-client/default
+cd /tmp/google-oauth-java-client/default
 mvn clean deploy
 mvn release:clean
 </pre></li>
     <li><code>mvn release:prepare -DautoVersionSubmodules=true</code>
     <ul>
-      <li>Accept default for 'What is the release version for "Google API
+      <li>Accept default for 'What is the release version for "Google OAuth
       Client - Parent"?'</li>
       <li>Type <code>1.5.0-beta</code> for 'What is SCM release tag or
-      label for "Google API Client - Parent"?'</li>
+      label for "Google OAuth Client - Parent"?'</li>
       <li>Accept default for 'What is the new development version for
-      "Google API Client - Parent"?'</li>
+      "Google OAuth Client - Parent"?'</li>
     </ul>
     </li>
     <li><code>mvn release:perform -Darguments=-Dgpg.passphrase=<i>[YOUR
@@ -155,7 +154,7 @@ <h3>Release version 1.5.0-beta</h3>
     </li>
     <li>Central Maven repository is synced hourly. Once uploaded onto
     repo2.maven.org, it will be found at: <a
-      href="http://repo2.maven.org/maven2/com/google/api/client/google-api-client/1.5.0-beta/">repo2.maven.org</a></li>
+      href="http://repo2.maven.org/maven2/com/google/oauth-client/google-oauth-client/1.5.0-beta/">repo2.maven.org</a></li>
   </ul>
   </li>
   <li>Start development of next bug fix version
@@ -165,7 +164,6 @@ <h3>Release version 1.5.0-beta</h3>
     <ul>
       <li><code>jdiff.xml</code></li>
       <li><code>release.html</code></li>
-      <li><code>google-api-client/src/main/java/com/google/api/client/util/Strings.java</code></li>
     </ul>
     </li>
     <li><pre>
@@ -184,12 +182,12 @@ <h3>Release version 1.5.0-beta</h3>
     repository.</li>
     <li><pre>
 cd /tmp
-rm -rf google-api-java-client
-mkdir google-api-java-client
-cd google-api-java-client
-hg clone https://javadoc.google-api-java-client.googlecode.com/hg/ javadoc
-hg clone -r 1.4.1-beta https://google-api-java-client.googlecode.com/hg/ 1.4.1-beta
-hg clone -r 1.5.0-beta https://google-api-java-client.googlecode.com/hg/ 1.5.0-beta
+rm -rf google-oauth-java-client
+mkdir google-oauth-java-client
+cd google-oauth-java-client
+hg clone https://javadoc.google-oauth-java-client.googlecode.com/hg/ javadoc
+hg clone -r 1.4.1-beta https://google-oauth-java-client.googlecode.com/hg/ 1.4.1-beta
+hg clone -r 1.5.0-beta https://google-oauth-java-client.googlecode.com/hg/ 1.5.0-beta
 cd 1.5.0-beta
 mvn javadoc:jar install site
 cp -R target/site/apidocs/ ../javadoc/1.5.0-beta
@@ -207,15 +205,15 @@ <h3>Release version 1.5.0-beta</h3>
   </li>
   <li><b>WAIT!</b> Don't do the following instructions until after the
   library has been uploaded to repo2.maven.org at: <a
-    href="http://repo2.maven.org/maven2/com/google/api/client/google-api-client/1.5.0-beta/">repo2.maven.org</a></li>
+    href="http://repo2.maven.org/maven2/com/google/oauth-client/google-oauth-client/1.5.0-beta/">repo2.maven.org</a></li>
   <li>Update to new version on <a
-    href="http://code.google.com/p/google-api-java-client">http://code.google.com/p/google-api-java-client</a>
+    href="http://code.google.com/p/google-oauth-java-client">http://code.google.com/p/google-oauth-java-client</a>
   <ul>
     <li>Upload to <a
-      href="http://code.google.com/p/google-api-java-client/downloads/entry">http://code.google.com/p/google-api-java-client/downloads/entry</a>
+      href="http://code.google.com/p/google-oauth-java-client/downloads/entry">http://code.google.com/p/google-oauth-java-client/downloads/entry</a>
     <ul>
-      <li>Summary: Google API Client Library for Java, version 1.5.0-beta</li>
-      <li>File: <code>/tmp/google-api-java-client/1.5.0-beta/google-api-client-assembly/target/google-api-client-1.5.0-beta-java.zip</code></li>
+      <li>Summary: Google OAuth Client Library for Java, version 1.5.0-beta</li>
+      <li>File: <code>/tmp/google-oauth-java-client/1.5.0-beta/google-oauth-client-assembly/target/google-oauth-client-1.5.0-beta-java.zip</code></li>
       <li>Labels: <code>Type-Archive</code>, <code>OpSys-All</code>, and <code>Featured</code></li>
       <li>click Submit file</li>
     </ul>
@@ -226,20 +224,20 @@ <h3>Release version 1.5.0-beta</h3>
     <li>Update the following pages changing any reference from the previous
     version to the new version <code>1.5.0-beta</code>:
     <ul>
-      <li><a href="http://code.google.com/p/google-api-java-client/admin">admin</a></li>
+      <li><a href="http://code.google.com/p/google-oauth-java-client/admin">admin</a></li>
       <li><a
-        href="http://code.google.com/p/google-api-java-client/w/edit/Setup">wiki/Setup</a></li>
+        href="http://code.google.com/p/google-oauth-java-client/w/edit/Setup">wiki/Setup</a></li>
       <li><a
-        href="http://code.google.com/p/google-api-java-client/w/edit/SampleProgram">wiki/SampleProgram</a></li>
+        href="http://code.google.com/p/google-oauth-java-client/w/edit/SampleProgram">wiki/SampleProgram</a></li>
     </ul>
     </li>
   </ul>
   </li>
   <li><a
     href="http://www.blogger.com/post-create.g?blogID=4531100327392916335">New
-  Post</a> on the <a href="http://google-api-java-client.blogspot.com/">announcement
+  Post</a> on the <a href="http://google-oauth-java-client.blogspot.com/">announcement
   blog</a> about the new version, including links to <a
-    href="http://code.google.com/p/google-api-java-client/issues/list?can=1&q=milestone=Version1.5.0%20status=Fixed&colspec=ID%20Type%20Priority%20Summary">new
+    href="http://code.google.com/p/google-oauth-java-client/issues/list?can=1&q=milestone=Version1.5.0%20status=Fixed&colspec=ID%20Type%20Priority%20Summary">new
   features and bugs fixed</a>.</li>
 </ul>
 </body>