Skip to content

Commit 2bd770c

Browse files
author
Yaniv Inbar
committed
fold parent subfolder into top-level dir to make maven release plugin happy
1 parent 7d03957 commit 2bd770c

8 files changed

Lines changed: 20 additions & 28 deletions

File tree

‎google-api-client-assembly/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>com.google.api.client</groupId>
66
<artifactId>google-api-client-parent</artifactId>
77
<version>1.4.0-alpha-SNAPSHOT</version>
8-
<relativePath>../google-api-java-client-parent/pom.xml</relativePath>
8+
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<groupId>com.google.api.client</groupId>
1111
<artifactId>google-api-client-assembly</artifactId>

‎google-api-client-extensions/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>com.google.api.client</groupId>
66
<artifactId>google-api-client-parent</artifactId>
77
<version>1.4.0-alpha-SNAPSHOT</version>
8-
<relativePath>../google-api-java-client-parent/pom.xml</relativePath>
8+
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<groupId>com.google.api.client</groupId>
1111
<artifactId>google-api-client-extensions</artifactId>

‎google-api-client-googleapis/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>com.google.api.client</groupId>
66
<artifactId>google-api-client-parent</artifactId>
77
<version>1.4.0-alpha-SNAPSHOT</version>
8-
<relativePath>../google-api-java-client-parent/pom.xml</relativePath>
8+
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<groupId>com.google.api.client</groupId>
1111
<artifactId>google-api-client-googleapis</artifactId>

‎google-api-client-parent/.project‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎google-api-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>com.google.api.client</groupId>
66
<artifactId>google-api-client-parent</artifactId>
77
<version>1.4.0-alpha-SNAPSHOT</version>
8-
<relativePath>../google-api-java-client-parent/pom.xml</relativePath>
8+
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-api-client</artifactId>
1111
<name>Google API Client Library for Java (Core)</name>

google-api-client-parent/jdiff.xml renamed to jdiff.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111

1212
<taskdef name="jdiff" classname="jdiff.JDiffAntTask"
1313
classpath="${JDIFF_HOME}/antjdiff.jar:${MAVEN_REPOSITORY_HOME}/org/codehaus/jackson/jackson-core-asl/1.6.5/jackson-core-asl-1.6.5.jar:${MAVEN_REPOSITORY_HOME}/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar" />
14-
<jdiff destdir="${JAVADOC_PROJECT_ROOT_DIR}/1.4-alpha/jdiff" verbose="on"
14+
<jdiff destdir="${JAVADOC_PROJECT_ROOT_DIR}/1.4.0-alpha/jdiff" verbose="on"
1515
stats="on" docchanges="on">
16-
<old name="Google API Client Library for Java 1.3-alpha">
16+
<old name="Google API Client Library for Java 1.3.1-alpha">
1717
<!-- This is the location of your old source files -->
1818
<dirset dir="${OLD_PROJECT_ROOT_DIR}/google-api-client/src"
1919
includes="com/**" />
2020
</old>
21-
<new name="Google API Client Library for Java 1.4-alpha">
21+
<new name="Google API Client Library for Java 1.4.0-alpha">
2222
<!-- This is the location of your new source files -->
2323
<dirset dir="${PROJECT_ROOT_DIR}/google-api-client/src/main/java" />
2424
<dirset dir="${PROJECT_ROOT_DIR}/google-api-client-extensions/src/main/java" />

google-api-client-parent/pom.xml renamed to pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@
4848
</developers>
4949

5050
<modules>
51-
<module>../google-api-client</module>
52-
<module>../google-api-client-assembly</module>
53-
<module>../google-api-client-extensions</module>
54-
<module>../google-api-client-googleapis</module>
51+
<module>google-api-client</module>
52+
<module>google-api-client-assembly</module>
53+
<module>google-api-client-extensions</module>
54+
<module>google-api-client-googleapis</module>
5555
</modules>
5656

5757
<repositories>

google-api-client-parent/release.html renamed to release.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,10 @@ <h3>Release version 1.4.0-alpha (minor update)</h3>
9797
</pre></li>
9898
<li>For the following files, replace <code>1.4.0-alpha</code> with <code>1.5.0-alpha</code>:
9999
<pre>
100+
pom.xml
100101
*/pom.xml
101-
google-api-client-parent/jdiff.xml (also change "1.3.0" to "1.4.0")
102-
google-api-client-parent/release.html (also change "1.4" to "1.5", "1.3.0" to "1.4.0", and "1.3" to "1.4")
102+
jdiff.xml (also change "1.3.0" to "1.4.0")
103+
release.html (also change "1.4" to "1.5", "1.3.0" to "1.4.0", and "1.3" to "1.4")
103104
google-api-client/src/main/java/com/google/api/client/util/Strings.java
104105
</pre></li>
105106
<li>Commit and push: <pre>
@@ -110,6 +111,8 @@ <h3>Release version 1.4.0-alpha (minor update)</h3>
110111
<li>Merge dev branch for samples: <pre>
111112
cd <i>rootDir</i>/google-api-java-client-samples
112113
hg update default
114+
hg pull
115+
hg update
113116
hg merge -r dev
114117
hg commit -m "merge with dev branch"
115118
hg push
@@ -121,7 +124,7 @@ <h3>Release version 1.4.0-alpha (minor update)</h3>
121124
OSS Maven Repository Usage Guide</a>):
122125
<ul>
123126
<li>Prepare:<pre>
124-
cd <i>rootDir</i>/google-api-java-client/google-api-client-parent
127+
cd <i>rootDir</i>/google-api-java-client
125128
mvn clean deploy
126129
mvn release:clean
127130
</pre></li>
@@ -159,7 +162,7 @@ <h3>Release version 1.4.0-alpha (minor update)</h3>
159162
environment: JDIFF_HOME, MAVEN_REPOSITORY_HOME, PROJECT_ROOT_DIR,
160163
JAVADOC_PROJECT_ROOT_DIR</li>
161164
<li><pre>
162-
cd <i>rootDir</i>/google-api-java-client/google-api-client-parent
165+
cd <i>rootDir</i>/google-api-java-client
163166
hg update -r 1.4.0-alpha
164167
mvn clean javadoc:jar install site
165168
cp -R target/site/apidocs/ <i>rootDir</i>/javadoc/1.4-alpha
@@ -221,8 +224,8 @@ <h3>Release version 1.4.0-alpha (minor update)</h3>
221224
<li><code>hg update</code></li>
222225
<li>For the following files, replace <code>1.3.*-alpha</code> with <code>1.4.0-alpha</code>:
223226
<ul>
224-
<li><code>google-api-client-parent/jdiff.xml</code></li>
225-
<li><code>google-api-client-parent/release.html</code>
227+
<li><code>jdiff.xml</code></li>
228+
<li><code>release.html</code>
226229
<ul>
227230
<li>before-hand replace 1.4.1 with next minor version, and 1.4.0
228231
with 1.4.1</li>

0 commit comments

Comments
 (0)