Skip to content

Commit 518e621

Browse files
brendandburnsbrendandburns
authored
Merge pull request #53 from lwander/release-whole-project
Release parent project (to release util module)
2 parents df4f7e9 + fc53472 commit 518e621

File tree

4 files changed

+101
-54
lines changed

4 files changed

+101
-54
lines changed

‎examples/pom.xml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<dependencies>
1212
<dependency>
1313
<groupId>io.kubernetes</groupId>
14-
<artifactId>client-java</artifactId>
14+
<artifactId>client-java-api</artifactId>
1515
<version>1.0-SNAPSHOT</version>
1616
</dependency>
1717
<dependency>
@@ -32,6 +32,18 @@
3232
<scope>test</scope>
3333
</dependency>
3434
</dependencies>
35+
<build>
36+
<plugins>
37+
<plugin>
38+
<groupId>org.apache.maven.plugins</groupId>
39+
<artifactId>maven-deploy-plugin</artifactId>
40+
<version>2.5.3</version>
41+
<configuration>
42+
<skip>true</skip>
43+
</configuration>
44+
</plugin>
45+
</plugins>
46+
</build>
3547
<properties>
3648
<java.version>1.7</java.version>
3749
<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -44,4 +56,4 @@
4456
<junit-version>4.12</junit-version>
4557
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4658
</properties>
47-
</project>
59+
</project>

‎kubernetes/pom.xml‎

Lines changed: 3 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>io.kubernetes</groupId>
5-
<artifactId>client-java</artifactId>
5+
<artifactId>client-java-api</artifactId>
66
<packaging>jar</packaging>
7-
<name>client-java</name>
7+
<name>client-java-api</name>
88
<version>1.0-SNAPSHOT</version>
99
<url>https://github.com/swagger-api/swagger-codegen</url>
1010
<description>Swagger Java</description>
@@ -30,21 +30,10 @@
3030
<name>The Kubernetes Authors</name>
3131
<email>kubernetes-dev@googlegroups.com</email>
3232
<organization>Kubernetes</organization>
33-
<organizationUrl>http://kubernetes.io</organizationUrl>
33+
<organizationUrl>https://kubernetes.io</organizationUrl>
3434
</developer>
3535
</developers>
3636

37-
<distributionManagement>
38-
<snapshotRepository>
39-
<id>ossrh</id>
40-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
41-
</snapshotRepository>
42-
<repository>
43-
<id>ossrh</id>
44-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
45-
</repository>
46-
</distributionManagement>
47-
4837
<build>
4938
<plugins>
5039
<plugin>
@@ -77,20 +66,6 @@
7766
</execution>
7867
</executions>
7968
</plugin>
80-
<plugin>
81-
<groupId>org.apache.maven.plugins</groupId>
82-
<artifactId>maven-release-plugin</artifactId>
83-
<version>2.5.3</version>
84-
<!--
85-
During release:perform, enable the "release" profile
86-
-->
87-
<configuration>
88-
<autoVersionSubmodules>true</autoVersionSubmodules>
89-
<useReleaseProfile>false</useReleaseProfile>
90-
<releaseProfiles>release</releaseProfiles>
91-
<goals>deploy</goals>
92-
</configuration>
93-
</plugin>
9469

9570
<!-- attach test jar -->
9671
<plugin>
@@ -170,27 +145,6 @@
170145
</build>
171146

172147
<profiles>
173-
<profile>
174-
<id>sign-artifacts</id>
175-
<build>
176-
<plugins>
177-
<plugin>
178-
<groupId>org.apache.maven.plugins</groupId>
179-
<artifactId>maven-gpg-plugin</artifactId>
180-
<version>1.5</version>
181-
<executions>
182-
<execution>
183-
<id>sign-artifacts</id>
184-
<phase>verify</phase>
185-
<goals>
186-
<goal>sign</goal>
187-
</goals>
188-
</execution>
189-
</executions>
190-
</plugin>
191-
</plugins>
192-
</build>
193-
</profile>
194148
<profile>
195149
<id>disable-java8-doclint</id>
196150
<activation>

‎pom.xml‎

Lines changed: 82 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,94 @@
22
xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<artifactId>parent</artifactId>
5+
<artifactId>client-java</artifactId>
66
<groupId>io.kubernetes</groupId>
77
<version>1.0-SNAPSHOT</version>
88
<packaging>pom</packaging>
9+
<name>Kubernetes Client API</name>
10+
911
<modules>
1012
<module>kubernetes</module>
1113
<module>examples</module>
1214
<module>util</module>
1315
</modules>
16+
17+
<scm>
18+
<connection>scm:git:git@github.com:kubernetes-client/java.git</connection>
19+
<developerConnection>scm:git:git@github.com:kubernetes-client/java.git</developerConnection>
20+
<url>https://github.com/kubernetes-client/java</url>
21+
</scm>
22+
23+
<prerequisites>
24+
<maven>2.2.0</maven>
25+
</prerequisites>
26+
27+
<licenses>
28+
<license>
29+
<name>The Apache Software License, Version 2.0</name>
30+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
31+
<distribution>repo</distribution>
32+
</license>
33+
</licenses>
34+
35+
<developers>
36+
<developer>
37+
<name>The Kubernetes Authors</name>
38+
<email>kubernetes-dev@googlegroups.com</email>
39+
<organization>Kubernetes</organization>
40+
<organizationUrl>https://kubernetes.io</organizationUrl>
41+
</developer>
42+
</developers>
43+
44+
<distributionManagement>
45+
<snapshotRepository>
46+
<id>ossrh</id>
47+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
48+
</snapshotRepository>
49+
<repository>
50+
<id>ossrh</id>
51+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
52+
</repository>
53+
</distributionManagement>
54+
55+
<build>
56+
<plugins>
57+
<plugin>
58+
<groupId>org.apache.maven.plugins</groupId>
59+
<artifactId>maven-release-plugin</artifactId>
60+
<version>2.5.3</version>
61+
<configuration>
62+
<autoVersionSubmodules>true</autoVersionSubmodules>
63+
<useReleaseProfile>false</useReleaseProfile>
64+
<releaseProfiles>release</releaseProfiles>
65+
<goals>deploy</goals>
66+
</configuration>
67+
</plugin>
68+
</plugins>
69+
</build>
70+
71+
<profiles>
72+
<profile>
73+
<id>sign-artifacts</id>
74+
<build>
75+
<plugins>
76+
<plugin>
77+
<groupId>org.apache.maven.plugins</groupId>
78+
<artifactId>maven-gpg-plugin</artifactId>
79+
<version>1.5</version>
80+
<executions>
81+
<execution>
82+
<id>sign-artifacts</id>
83+
<phase>verify</phase>
84+
<goals>
85+
<goal>sign</goal>
86+
</goals>
87+
</execution>
88+
</executions>
89+
</plugin>
90+
</plugins>
91+
</build>
92+
</profile>
93+
</profiles>
94+
1495
</project>

‎util/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<dependencies>
1212
<dependency>
1313
<groupId>io.kubernetes</groupId>
14-
<artifactId>client-java</artifactId>
14+
<artifactId>client-java-api</artifactId>
1515
<version>1.0-SNAPSHOT</version>
1616
</dependency>
1717
<dependency>
@@ -92,4 +92,4 @@
9292
<maven.compiler.target>${java.version}</maven.compiler.target>
9393
<slf4jVersion>1.7.7</slf4jVersion>
9494
</properties>
95-
</project>
95+
</project>

0 commit comments

Comments
 (0)