Skip to content

Commit 5979cd1

Browse files
benn-csbenn-cs
committed
Change quantum-client/model to the module of OpenStack SDK and fix some dependency
problems Signed-off-by: benn-cs <benn.cs@fengruyi.com>
1 parent 5d7e42a commit 5979cd1

File tree

4 files changed

+31
-22
lines changed

4 files changed

+31
-22
lines changed

‎pom.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@
1212
<module>glance-client</module>
1313
<module>keystone-client</module>
1414
<module>swift-client</module>
15+
<module>quantum-client</module>
1516
<module>openstack-client</module>
1617
<module>nova-model</module>
1718
<module>glance-model</module>
1819
<module>keystone-model</module>
1920
<module>swift-model</module>
21+
<module>quantum-model</module>
2022
<module>openstack-examples</module>
2123
<module>ceilometer-java</module>
2224
</modules>
@@ -81,4 +83,4 @@
8183
</plugin>
8284
</plugins>
8385
</build>
84-
</project>
86+
</project>

‎quantum-client/pom.xml‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
2-
<modelVersion>4.0.0</modelVersion>
3-
<groupId>org.openstack</groupId>
4-
<artifactId>quantum-client</artifactId>
5-
<version>2.0.0-SNAPSHOT</version>
6-
<name>Quantum Client</name>
7-
<description>Quantum Client</description>
8-
<dependencies>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>org.openstack</groupId>
6+
<artifactId>openstack-java-sdk</artifactId>
7+
<version>2.0.0-SNAPSHOT</version>
8+
</parent>
9+
<artifactId>quantum-client</artifactId>
10+
<name>Quantum Client</name>
11+
<description>Quantum Client</description>
12+
<dependencies>
913
<dependency>
10-
<groupId>javax.ws.rs</groupId>
11-
<artifactId>javax.ws.rs-api</artifactId>
12-
<version>2.0-m12</version>
14+
<groupId>org.openstack</groupId>
15+
<artifactId>openstack-client</artifactId>
16+
<version>2.0.0-SNAPSHOT</version>
17+
</dependency>
18+
<dependency>
19+
<groupId>org.openstack</groupId>
20+
<artifactId>quantum-model</artifactId>
21+
<version>2.0.0-SNAPSHOT</version>
1322
</dependency>
1423
</dependencies>
15-
</project>
24+
</project>

‎quantum-client/src/main/java/org/openstack/quantum/client/QuantumClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public QuantumClient(String endpointURL, String token) {
1313
public <R> R execute(QuantumCommand<R> command) {
1414
WebTarget endpoint = OpenStack.CLIENT.target(endpointURL);
1515
if(token != null) {
16-
endpoint.configuration().register(tokenFilter);
16+
endpoint.register(tokenFilter);
1717
}
1818
return command.execute(endpoint);
1919
}

‎quantum-model/pom.xml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>quantum.model</groupId>
4+
<parent>
5+
<groupId>org.openstack</groupId>
6+
<artifactId>openstack-java-sdk</artifactId>
7+
<version>2.0.0-SNAPSHOT</version>
8+
</parent>
59
<artifactId>quantum-model</artifactId>
6-
<version>2.0.0-SNAPSHOT</version>
710
<name>Quantum Model</name>
811
<description>Quantum Model</description>
912
<dependencies>
@@ -12,10 +15,5 @@
1215
<artifactId>jackson-mapper-asl</artifactId>
1316
<version>1.9.8</version>
1417
</dependency>
15-
<dependency>
16-
<groupId>javax.ws.rs</groupId>
17-
<artifactId>javax.ws.rs-api</artifactId>
18-
<version>2.0-m12</version>
19-
</dependency>
2018
</dependencies>
21-
</project>
19+
</project>

0 commit comments

Comments
 (0)