From 23922741ab80dc665f83362fbc7b14e8af0240a3 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Mon, 9 Jan 2017 22:02:33 +0100 Subject: [PATCH 01/40] RESTEasyConnector: Isolate the creation of ClientExecutor The creation of the ClientExecutor is isolated in a protected method, to allow subclasses to overwrite. This enables the usage of a customized executor for the request. The customized executor is needed to set parameters, like timeouts, on the creation of the executor. --- .../com/woorea/openstack/connector/RESTEasyConnector.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java index b2ec41570..cc2d12969 100644 --- a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java +++ b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java @@ -14,6 +14,7 @@ import org.codehaus.jackson.map.SerializationConfig; import org.codehaus.jackson.map.annotate.JsonRootName; import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; +import org.jboss.resteasy.client.ClientExecutor; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.plugins.providers.InputStreamProvider; @@ -79,9 +80,13 @@ public ObjectMapper getContext(Class type) { providerFactory = new OpenStackProviderFactory(); } + protected ClientExecutor createClientExecutor() { + return ClientRequest.getDefaultExecutor(); + } + public OpenStackResponse request(OpenStackRequest request) { ClientRequest client = new ClientRequest(UriBuilder.fromUri(request.endpoint() + "/" + request.path()), - ClientRequest.getDefaultExecutor(), providerFactory); + createClientExecutor(), providerFactory); for(Map.Entry > entry : request.queryParams().entrySet()) { for (Object o : entry.getValue()) { From 97539b2afc78c0dacae08130c5551fa88184ce0d Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Fri, 27 Jan 2017 22:44:18 +0100 Subject: [PATCH 02/40] Fix javadoc Correct some @param to match the names of the parameters. --- .../main/java/com/woorea/openstack/glance/model/Image.java | 2 +- .../nova/api/extensions/SecurityGroupsExtension.java | 2 +- .../openstack/nova/model/SecurityGroupRuleForCreate.java | 4 ++-- .../src/main/java/com/woorea/openstack/console/Console.java | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java index 4bd49e0e8..5d1167a28 100644 --- a/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java +++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java @@ -154,7 +154,7 @@ public Long getVirtualSize() { } /** - * @param size the virtual size to set + * @param virtualSize the virtual size to set */ public void setVirtualSize(Long virtualSize) { this.virtualSize = virtualSize; diff --git a/nova-client/src/main/java/com/woorea/openstack/nova/api/extensions/SecurityGroupsExtension.java b/nova-client/src/main/java/com/woorea/openstack/nova/api/extensions/SecurityGroupsExtension.java index 5a80a10aa..58dfa4f8d 100644 --- a/nova-client/src/main/java/com/woorea/openstack/nova/api/extensions/SecurityGroupsExtension.java +++ b/nova-client/src/main/java/com/woorea/openstack/nova/api/extensions/SecurityGroupsExtension.java @@ -145,7 +145,7 @@ public CreateRule createSecurityGroupRule( * @param ipProtocol * @param fromPort * @param toPort - * @param cidr + * @param sourceGroupId * @return * @deprecated Use {@link #createSecurityGroupRule(String, String, String, Integer, Integer)} */ diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java index 2f58da00c..c6a76c22c 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java @@ -51,11 +51,11 @@ public SecurityGroupRuleForCreate(Integer parentSecurityGroupId, String ipProtoc } /** * - * @param parentSecurityGroupId + * @param parentGroupId * @param ipProtocol * @param fromPort * @param toPort - * @param cidr + * @param sourceGroupId * @deprecated Ids in some installs have shown to use strings .Use {@link #SecurityGroupRuleForCreate(String, String, String, Integer, Integer)} */ @Deprecated diff --git a/openstack-console/src/main/java/com/woorea/openstack/console/Console.java b/openstack-console/src/main/java/com/woorea/openstack/console/Console.java index 13b7fbfde..0f7ad8446 100644 --- a/openstack-console/src/main/java/com/woorea/openstack/console/Console.java +++ b/openstack-console/src/main/java/com/woorea/openstack/console/Console.java @@ -87,7 +87,8 @@ public String getProperty(String name) { } /** - * @return the properties + * @param name + * @param value */ public void setProperty(String name, Object value) { properties.put(name, value); From 672c4120bb60ef657a98c751b4c55c88ad3632dc Mon Sep 17 00:00:00 2001 From: Fred Rolland Date: Wed, 13 Sep 2017 12:26:07 +0300 Subject: [PATCH 03/40] Cinder: Add support for os-terminate_connection --- .../openstack/cinder/VolumesExtension.java | 15 ++++++++++ .../cinder/model/BaseConnection.java | 28 +++++++++++++++++++ .../cinder/model/ConnectionForInitialize.java | 25 ++--------------- .../cinder/model/ConnectionForTerminate.java | 20 +++++++++++++ 4 files changed, 65 insertions(+), 23 deletions(-) create mode 100644 cinder-model/src/main/java/com/woorea/openstack/cinder/model/BaseConnection.java create mode 100644 cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForTerminate.java diff --git a/cinder-client/src/main/java/com/woorea/openstack/cinder/VolumesExtension.java b/cinder-client/src/main/java/com/woorea/openstack/cinder/VolumesExtension.java index 8254ca133..39bcc0e4d 100644 --- a/cinder-client/src/main/java/com/woorea/openstack/cinder/VolumesExtension.java +++ b/cinder-client/src/main/java/com/woorea/openstack/cinder/VolumesExtension.java @@ -5,6 +5,7 @@ import com.woorea.openstack.base.client.OpenStackClient; import com.woorea.openstack.base.client.OpenStackRequest; import com.woorea.openstack.cinder.model.ConnectionForInitialize; +import com.woorea.openstack.cinder.model.ConnectionForTerminate; import com.woorea.openstack.cinder.model.ConnectionInfo; import com.woorea.openstack.cinder.model.Metadata; import com.woorea.openstack.cinder.model.Volume; @@ -60,6 +61,10 @@ public InitializeConnection initializeConnection(String id, ConnectionForInitial return new InitializeConnection(id, connectionForInitialize); } + public TerminateConnection terminateConnection(String id, ConnectionForTerminate connectionForTerminate) { + return new TerminateConnection(id, connectionForTerminate); + } + public class List extends OpenStackRequest { public List(boolean detail) { @@ -146,4 +151,14 @@ public InitializeConnection(String id, ConnectionForInitialize connectionForInit } + public class TerminateConnection extends OpenStackRequest { + + public TerminateConnection(String id, ConnectionForTerminate connectionForTerminate) { + super(CLIENT, HttpMethod.POST, new StringBuilder("/volumes/") + .append(id).append("/action").toString(), + Entity.json(connectionForTerminate), Void.class); + } + + } + } diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/BaseConnection.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/BaseConnection.java new file mode 100644 index 000000000..cca3514f2 --- /dev/null +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/BaseConnection.java @@ -0,0 +1,28 @@ +package com.woorea.openstack.cinder.model; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +import org.codehaus.jackson.annotate.JsonProperty; + +public abstract class BaseConnection implements Serializable { + @JsonProperty("connector") + private Map connector = new HashMap(); + + /** + * @return the connector + */ + public Map getConnector() { + return connector; + } + + /** + * @param connector + * the connector to set + */ + public void setConnector(Map connector) { + this.connector = connector; + } + +} diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForInitialize.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForInitialize.java index f8163c336..76ff7b784 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForInitialize.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForInitialize.java @@ -1,32 +1,11 @@ package com.woorea.openstack.cinder.model; -import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.map.annotate.JsonRootName; import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; @JsonRootName("os-initialize_connection") -public class ConnectionForInitialize implements Serializable { - - @JsonProperty("connector") - private Map connector = new HashMap(); - - /** - * @return the connector - */ - public Map getConnector() { - return connector; - } - - /** - * @param connector - * the connector to set - */ - public void setConnector(Map connector) { - this.connector = connector; - } +public class ConnectionForInitialize extends BaseConnection implements Serializable { /* * (non-Javadoc) @@ -35,7 +14,7 @@ public void setConnector(Map connector) { */ @Override public String toString() { - return "ConnectionForInitialize [connector=" + connector + "]"; + return "ConnectionForInitialize [connector=" + getConnector() + "]"; } } diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForTerminate.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForTerminate.java new file mode 100644 index 000000000..0777ab472 --- /dev/null +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForTerminate.java @@ -0,0 +1,20 @@ +package com.woorea.openstack.cinder.model; + +import org.codehaus.jackson.map.annotate.JsonRootName; + +import java.io.Serializable; + +@JsonRootName("os-terminate_connection") +public class ConnectionForTerminate extends BaseConnection implements Serializable { + + /* + * (non-Javadoc) + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "ConnectionForInitialize [connector=" + getConnector() + "]"; + } + +} From d7cbcfd0cf58723de2cf953b15b0949072366d90 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Mon, 16 Apr 2018 17:52:59 +0200 Subject: [PATCH 04/40] neutron: Support parameter mtu Signed-off-by: Dominik Holler --- .../openstack/quantum/model/Network.java | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java index 4490911e2..853858fc5 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java @@ -41,6 +41,8 @@ public class Network implements Serializable { private String shared; + private Integer mtu; + /** * @return the status */ @@ -259,6 +261,21 @@ public void setProviderSegmentationId(Integer providerSegmentationId) { this.providerSegmentationId = providerSegmentationId; } + /** + * @return the MTU + */ + public Integer getMtu() { + return mtu; + } + + /** + * @param mtu + * the MTU to set + */ + public void setMtu(Integer mtu) { + this.mtu = mtu; + } + /* * (non-Javadoc) * @@ -268,8 +285,8 @@ public void setProviderSegmentationId(Integer providerSegmentationId) { public String toString() { return "Network [id=" + id + ", name=" + name + ", subnets=" + subnets + ", status=" + status + ", admin_state_up=" + adminStateUp + ", tenant_id=" + - tenantId + ", shared=" + shared + ", provider:physical_network=" + providerPhysicalNetwork + - ", provider:network_type=" + providerNetworkType + ", router:external=" + routerExternal + - ", provider:segmentation_id=" + providerSegmentationId + "]"; + tenantId + ", shared=" + shared + ", mtu=" + mtu + ", provider:physical_network=" + + providerPhysicalNetwork + ", provider:network_type=" + providerNetworkType + ", router:external=" + + routerExternal + ", provider:segmentation_id=" + providerSegmentationId + "]"; } } From cb088daf1db2eb395f692476c172ff2994e464cf Mon Sep 17 00:00:00 2001 From: Eduardo Garcia Cebollero Date: Thu, 4 Dec 2014 16:25:19 +0100 Subject: [PATCH 05/40] Ignore new fields (as audit_ids) on the token model to avoid problems on Juno (cherry picked from commit 0753168a04d74b29f626817bb08a3a3810090637) --- .../main/java/com/woorea/openstack/keystone/model/Token.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Token.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Token.java index 92d34ee61..0f0b6ccb2 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Token.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Token.java @@ -1,7 +1,10 @@ package com.woorea.openstack.keystone.model; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; + import java.util.Calendar; +@JsonIgnoreProperties(ignoreUnknown=true) public final class Token { private String id; From 8a475b413ca509f0f4c4c9f082133dddc675efc7 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Wed, 18 Jul 2018 18:05:15 +0200 Subject: [PATCH 06/40] Revert "hide password in payload log" This reverts commit df6faf007e4e45b9a9cc2511e4e2cbc3f93da371. Even the removed code creates a nice logging, it introduces an additional license, which adds additional effort to the release process. --- .../openstack/connector/JerseyConnector.java | 6 +- .../connector/JerseyLoggingFilter.java | 279 ------------------ .../openstack/connector/JaxRs20Connector.java | 5 +- pom.xml | 14 - 4 files changed, 5 insertions(+), 299 deletions(-) delete mode 100644 openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyLoggingFilter.java diff --git a/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyConnector.java b/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyConnector.java index afd7a2b65..c8ed12387 100644 --- a/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyConnector.java +++ b/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyConnector.java @@ -2,7 +2,6 @@ import java.util.List; import java.util.Map; -import java.util.logging.Logger; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.ContextResolver; @@ -21,6 +20,7 @@ import com.sun.jersey.api.client.WebResource; import com.sun.jersey.api.client.config.ClientConfig; import com.sun.jersey.api.client.config.DefaultClientConfig; +import com.sun.jersey.api.client.filter.LoggingFilter; import com.sun.jersey.client.impl.ClientRequestImpl; import com.sun.jersey.core.header.OutBoundHeaders; import com.woorea.openstack.base.client.OpenStackClientConnector; @@ -31,8 +31,6 @@ public class JerseyConnector implements OpenStackClientConnector { protected Client client = null; - protected boolean logPassword; - private JerseyLoggingFilter logger = new JerseyLoggingFilter(Logger.getLogger("os")); public JerseyConnector() { ClientConfig clientConfig = new DefaultClientConfig(); @@ -49,7 +47,7 @@ public OpenStackResponse request(OpenStackRequest request) { target = target.queryParam(entry.getKey(), String.valueOf(o)); } } - target.addFilter(logger); + target.addFilter(new LoggingFilter()); MultivaluedMap headers = new OutBoundHeaders(); for(Map.Entry> h : request.headers().entrySet()) { for(Object v : h.getValue()) { diff --git a/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyLoggingFilter.java b/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyLoggingFilter.java deleted file mode 100644 index c1877c3df..000000000 --- a/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyLoggingFilter.java +++ /dev/null @@ -1,279 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can - * obtain a copy of the License at - * http://glassfish.java.net/public/CDDL+GPL_1_1.html - * or packager/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at packager/legal/LICENSE.txt. - * - * GPL Classpath Exception: - * Oracle designates this particular file as subject to the "Classpath" - * exception as provided by Oracle in the GPL Version 2 section of the License - * file that accompanied this code. - * - * Modifications: - * If applicable, add the following below the License Header, with the fields - * enclosed by brackets [] replaced by your own identifying information: - * "Portions Copyright [year] [name of copyright owner]" - * - * Contributor(s): - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - */ -package com.woorea.openstack.connector; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.PrintStream; -import java.util.List; -import java.util.Map; -import java.util.logging.Logger; - -import javax.ws.rs.core.MultivaluedMap; - -import com.sun.jersey.api.client.AbstractClientRequestAdapter; -import com.sun.jersey.api.client.ClientHandlerException; -import com.sun.jersey.api.client.ClientRequest; -import com.sun.jersey.api.client.ClientRequestAdapter; -import com.sun.jersey.api.client.ClientResponse; -import com.sun.jersey.api.client.filter.ClientFilter; -import com.sun.jersey.api.client.filter.LoggingFilter; -import com.sun.jersey.core.util.ReaderWriter; - -/** - * A logging filter. - * - */ -public class JerseyLoggingFilter extends ClientFilter { - - private static final Logger LOGGER = Logger.getLogger(LoggingFilter.class.getName()); - - private static final String NOTIFICATION_PREFIX = "* "; - - private static final String REQUEST_PREFIX = "> "; - - private static final String RESPONSE_PREFIX = "< "; - - private static final String PASSWORD_PATTERN = "\"password\".*:.*\"(.*)\""; - - private final class Adapter extends AbstractClientRequestAdapter { - private final StringBuilder b; - - Adapter(ClientRequestAdapter cra, StringBuilder b) { - super(cra); - this.b = b; - } - - public OutputStream adapt(ClientRequest request, OutputStream out) throws IOException { - return new LoggingOutputStream(getAdapter().adapt(request, out), b); - } - - } - - private final class LoggingOutputStream extends OutputStream { - private final OutputStream out; - - private final ByteArrayOutputStream baos = new ByteArrayOutputStream(); - - private final StringBuilder b; - - LoggingOutputStream(OutputStream out, StringBuilder b) { - this.out = out; - this.b = b; - } - - @Override - public void write(byte[] b) throws IOException { - baos.write(b); - out.write(b); - } - - @Override - public void write(byte[] b, int off, int len) throws IOException { - baos.write(b, off, len); - out.write(b, off, len); - } - - @Override - public void write(int b) throws IOException { - baos.write(b); - out.write(b); - } - - @Override - public void close() throws IOException { - printEntity(b, baos.toByteArray()); - log(b); - out.close(); - } - } - - private final PrintStream loggingStream; - - private final Logger logger; - - private long _id = 0; - - /** - * Create a logging filter logging the request and response to - * a default JDK logger, named as the fully qualified class name of this - * class. - */ - public JerseyLoggingFilter() { - this(LOGGER); - } - - /** - * Create a logging filter logging the request and response to - * a JDK logger. - * - * @param logger the logger to log requests and responses. - */ - public JerseyLoggingFilter(Logger logger) { - this.loggingStream = null; - this.logger = logger; - } - - /** - * Create a logging filter logging the request and response to - * print stream. - * - * @param loggingStream the print stream to log requests and responses. - */ - public JerseyLoggingFilter(PrintStream loggingStream) { - this.loggingStream = loggingStream; - this.logger = null; - } - - private void log(StringBuilder b) { - if (logger != null) { - logger.info(b.toString()); - } else { - loggingStream.print(b); - } - } - - private StringBuilder prefixId(StringBuilder b, long id) { - b.append(Long.toString(id)).append(" "); - return b; - } - - @Override - public ClientResponse handle(ClientRequest request) throws ClientHandlerException { - long id = ++this._id; - - logRequest(id, request); - - ClientResponse response = getNext().handle(request); - - logResponse(id, response); - - return response; - } - - private void logRequest(long id, ClientRequest request) { - StringBuilder b = new StringBuilder(); - - printRequestLine(b, id, request); - printRequestHeaders(b, id, request.getHeaders()); - - if (request.getEntity() != null) { - request.setAdapter(new Adapter(request.getAdapter(), b)); - } else { - log(b); - } - } - - private void printRequestLine(StringBuilder b, long id, ClientRequest request) { - prefixId(b, id).append(NOTIFICATION_PREFIX).append("Client out-bound request").append("\n"); - prefixId(b, id).append(REQUEST_PREFIX).append(request.getMethod()).append(" "). - append(request.getURI().toASCIIString()).append("\n"); - } - - private void printRequestHeaders(StringBuilder b, long id, MultivaluedMap headers) { - for (Map.Entry> e : headers.entrySet()) { - List val = e.getValue(); - String header = e.getKey(); - - if(val.size() == 1) { - prefixId(b, id).append(REQUEST_PREFIX).append(header).append(": ").append(ClientRequest.getHeaderValue(val.get(0))).append("\n"); - } else { - StringBuilder sb = new StringBuilder(); - boolean add = false; - for(Object o : val) { - if(add) sb.append(','); - add = true; - sb.append(ClientRequest.getHeaderValue(o)); - } - prefixId(b, id).append(REQUEST_PREFIX).append(header).append(": ").append(sb.toString()).append("\n"); - } - } - } - - private void logResponse(long id, ClientResponse response) { - StringBuilder b = new StringBuilder(); - - printResponseLine(b, id, response); - printResponseHeaders(b, id, response.getHeaders()); - - ByteArrayOutputStream out = new ByteArrayOutputStream(); - InputStream in = response.getEntityInputStream(); - try { - ReaderWriter.writeTo(in, out); - - byte[] requestEntity = out.toByteArray(); - printEntity(b, requestEntity); - response.setEntityInputStream(new ByteArrayInputStream(requestEntity)); - } catch (IOException ex) { - throw new ClientHandlerException(ex); - } - log(b); - } - - private void printResponseLine(StringBuilder b, long id, ClientResponse response) { - prefixId(b, id).append(NOTIFICATION_PREFIX). - append("Client in-bound response").append("\n"); - prefixId(b, id).append(RESPONSE_PREFIX). - append(Integer.toString(response.getStatus())). - append("\n"); - } - - private void printResponseHeaders(StringBuilder b, long id, MultivaluedMap headers) { - for (Map.Entry> e : headers.entrySet()) { - String header = e.getKey(); - for (String value : e.getValue()) { - prefixId(b, id).append(RESPONSE_PREFIX).append(header).append(": "). - append(value).append("\n"); - } - } - prefixId(b, id).append(RESPONSE_PREFIX).append("\n"); - } - - private void printEntity(StringBuilder b, byte[] entity) throws IOException { - if (entity.length == 0) - return; - String entityString = new String(entity); - entityString = entityString.replaceAll(PASSWORD_PATTERN, "\"password\" : \"******\""); - b.append(entityString).append("\n"); - } -} \ No newline at end of file diff --git a/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/JaxRs20Connector.java b/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/JaxRs20Connector.java index 2171beacf..82b9d5b95 100644 --- a/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/JaxRs20Connector.java +++ b/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/JaxRs20Connector.java @@ -22,7 +22,6 @@ public class JaxRs20Connector implements OpenStackClientConnector { protected Client client = OpenStack.CLIENT; - private LoggingFilter logger = new LoggingFilter(Logger.getLogger("os"), 10000); @Override public OpenStackResponse request(OpenStackRequest request) { @@ -33,7 +32,8 @@ public OpenStackResponse request(OpenStackRequest request) { target = target.queryParam(entry.getKey(), o); } } - target.register(logger); + + target.register(new LoggingFilter(Logger.getLogger("os"), 10000)); Invocation.Builder invocation = target.request(); for(Map.Entry> h : request.headers().entrySet()) { @@ -62,4 +62,5 @@ public OpenStackResponse request(OpenStackRequest request) { .getStatusInfo().toString(), e.getResponse().getStatus()); } } + } diff --git a/pom.xml b/pom.xml index 46996ba2d..2870170e2 100644 --- a/pom.xml +++ b/pom.xml @@ -131,20 +131,6 @@ maven-resources-plugin 2.6 - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - verify - - jar-no-fork - - - - From 366e25ba17ef191142ffd269e84d2a138a205cd0 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Thu, 19 Jul 2018 10:35:27 +0200 Subject: [PATCH 07/40] Use updated version of Apache Maven GPG Plugin The updated version of Apache Maven GPG Plugin improves compatibility to updated versions of GPG. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2870170e2..ab4261200 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.4 + 1.5 ${skip.sign} From 32053dbebdf3c686a1ad484c325f8afc15c17c2a Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Thu, 19 Jul 2018 10:42:51 +0200 Subject: [PATCH 08/40] Add sonatype.org to pom.xml This enables the deployment by mvn deploy --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index ab4261200..5eedb6ff3 100644 --- a/pom.xml +++ b/pom.xml @@ -131,6 +131,17 @@ maven-resources-plugin 2.6 + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ossrh + https://oss.sonatype.org/ + false + + From 72b1c2379c78c753f226d915c0dcb7e339ad3bb0 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Thu, 19 Jul 2018 14:16:39 +0200 Subject: [PATCH 09/40] Let all request path start with "/" The convention that the path of an OpenStackRequest starts with an "/" or is empty is introduced. The majority of the code was written before this change according this convention anyway. This way the resteasy-connector does not need to add the "/" between the endpoint and the path. This way the generated URLs does not contain unintended double "/" anymore, which may confuse the OpenStack server. --- .../openstack/nova/api/ExtensionsResource.java | 2 +- .../openstack/connector/RESTEasyConnector.java | 2 +- .../openstack/base/client/OpenStackRequest.java | 2 ++ .../openstack/quantum/api/NetworksResource.java | 10 +++++----- .../openstack/quantum/api/PortsResource.java | 10 +++++----- .../openstack/quantum/api/RoutersResource.java | 14 +++++++------- .../openstack/quantum/api/SubnetsResource.java | 10 +++++----- 7 files changed, 26 insertions(+), 24 deletions(-) diff --git a/nova-client/src/main/java/com/woorea/openstack/nova/api/ExtensionsResource.java b/nova-client/src/main/java/com/woorea/openstack/nova/api/ExtensionsResource.java index 46e16c440..148ec40db 100644 --- a/nova-client/src/main/java/com/woorea/openstack/nova/api/ExtensionsResource.java +++ b/nova-client/src/main/java/com/woorea/openstack/nova/api/ExtensionsResource.java @@ -21,7 +21,7 @@ public List list(boolean detail) { public class List extends OpenStackRequest { public List(boolean detail) { - super(CLIENT, HttpMethod.GET, detail ? "extensions/detail" : "extensions", null, Extensions.class); + super(CLIENT, HttpMethod.GET, detail ? buildPath("extensions", "detail") : buildPath("extensions"), null, Extensions.class); } } diff --git a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java index cc2d12969..c31a2cee5 100644 --- a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java +++ b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java @@ -85,7 +85,7 @@ protected ClientExecutor createClientExecutor() { } public OpenStackResponse request(OpenStackRequest request) { - ClientRequest client = new ClientRequest(UriBuilder.fromUri(request.endpoint() + "/" + request.path()), + ClientRequest client = new ClientRequest(UriBuilder.fromUri(request.endpoint() + request.path()), createClientExecutor(), providerFactory); for(Map.Entry > entry : request.queryParams().entrySet()) { diff --git a/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackRequest.java b/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackRequest.java index 94a545f11..38cf2b643 100644 --- a/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackRequest.java +++ b/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackRequest.java @@ -133,7 +133,9 @@ public OpenStackRequest queryParam(String key, Object value) { protected static String buildPath(String ... elements) { StringBuilder stringBuilder = new StringBuilder(); + final String PATH_SEPARATOR = "/"; for (String element : elements) { + stringBuilder.append(PATH_SEPARATOR); stringBuilder.append(element); } diff --git a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/NetworksResource.java b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/NetworksResource.java index 97a919aba..8b8edeec9 100644 --- a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/NetworksResource.java +++ b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/NetworksResource.java @@ -39,7 +39,7 @@ public Show show(String netId){ public class List extends OpenStackRequest { public List() { - super(CLIENT, HttpMethod.GET, "networks", null, Networks.class); + super(CLIENT, HttpMethod.GET, buildPath("networks"), null, Networks.class); } } @@ -57,28 +57,28 @@ public Query(Network network) { public class Create extends OpenStackRequest { public Create(Network net) { - super(CLIENT, HttpMethod.POST, "networks", Entity.json(net), Network.class); + super(CLIENT, HttpMethod.POST, buildPath("networks"), Entity.json(net), Network.class); } } public class Update extends OpenStackRequest { public Update(Network net) { - super(CLIENT, HttpMethod.PUT, buildPath("networks/", net.getId()), Entity.json(net), Network.class); + super(CLIENT, HttpMethod.PUT, buildPath("networks", net.getId()), Entity.json(net), Network.class); } } public class Show extends OpenStackRequest { public Show(String id) { - super(CLIENT, HttpMethod.GET, buildPath("networks/", id), null, Network.class); + super(CLIENT, HttpMethod.GET, buildPath("networks", id), null, Network.class); } } public class Delete extends OpenStackRequest { public Delete(String id){ - super(CLIENT, HttpMethod.DELETE, buildPath("networks/", id), null, Void.class); + super(CLIENT, HttpMethod.DELETE, buildPath("networks", id), null, Void.class); } } } diff --git a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/PortsResource.java b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/PortsResource.java index d14e860b6..b1cac3cc9 100644 --- a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/PortsResource.java +++ b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/PortsResource.java @@ -39,7 +39,7 @@ public Show show(String portId){ public class List extends OpenStackRequest { public List() { - super(CLIENT, HttpMethod.GET, "ports", null, Ports.class); + super(CLIENT, HttpMethod.GET, buildPath("ports"), null, Ports.class); } } @@ -58,28 +58,28 @@ public Query(Port port) { public class Create extends OpenStackRequest { public Create(Port port){ - super(CLIENT, HttpMethod.POST, "ports", Entity.json(port), Port.class); + super(CLIENT, HttpMethod.POST, buildPath("ports"), Entity.json(port), Port.class); } } public class Update extends OpenStackRequest { public Update(Port port){ - super(CLIENT, HttpMethod.PUT, buildPath("ports/", port.getId()), Entity.json(port), Port.class); + super(CLIENT, HttpMethod.PUT, buildPath("ports", port.getId()), Entity.json(port), Port.class); } } public class Show extends OpenStackRequest { public Show(String id) { - super(CLIENT, HttpMethod.GET, buildPath("ports/", id), null, Port.class); + super(CLIENT, HttpMethod.GET, buildPath("ports", id), null, Port.class); } } public class Delete extends OpenStackRequest { public Delete(String id){ - super(CLIENT, HttpMethod.DELETE, buildPath("ports/", id), null, Void.class); + super(CLIENT, HttpMethod.DELETE, buildPath("ports", id), null, Void.class); } } } diff --git a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/RoutersResource.java b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/RoutersResource.java index bcd646d09..71357097e 100644 --- a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/RoutersResource.java +++ b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/RoutersResource.java @@ -37,7 +37,7 @@ public Show show(String netId){ public class List extends OpenStackRequest { public List() { - super(CLIENT, HttpMethod.GET, "routers", null, Routers.class); + super(CLIENT, HttpMethod.GET, buildPath("routers"), null, Routers.class); } } @@ -53,7 +53,7 @@ public Query(Router router) { public class Create extends OpenStackRequest { public Create(RouterForCreate router){ - super(CLIENT, HttpMethod.POST, "routers", Entity.json(router), Router.class); + super(CLIENT, HttpMethod.POST, buildPath("routers"), Entity.json(router), Router.class); } } @@ -62,14 +62,14 @@ public Create(RouterForCreate router){ public class Show extends OpenStackRequest { public Show(String id) { - super(CLIENT, HttpMethod.GET, buildPath("routers/", id), null, Router.class); + super(CLIENT, HttpMethod.GET, buildPath("routers", id), null, Router.class); } } public class Delete extends OpenStackRequest { public Delete(String id){ - super(CLIENT, HttpMethod.DELETE, buildPath("routers/", id), null, Void.class); + super(CLIENT, HttpMethod.DELETE, buildPath("routers", id), null, Void.class); } } public Attach addInterface(RouterForAddInterface interfaceToAdd){ @@ -78,7 +78,7 @@ public Attach addInterface(RouterForAddInterface interfaceToAdd){ public class Attach extends OpenStackRequest { public Attach(RouterForAddInterface interfaceToAdd){ - super(CLIENT, HttpMethod.PUT, buildPath("routers/",interfaceToAdd.getRouterId(),"/add_router_interface"), Entity.json(interfaceToAdd),RouterInterface.class); + super(CLIENT, HttpMethod.PUT, buildPath("routers",interfaceToAdd.getRouterId(),"add_router_interface"), Entity.json(interfaceToAdd),RouterInterface.class); } } @@ -89,8 +89,8 @@ public Detach deleteInterface(RouterForAddInterface interfaceRouter) { public class Detach extends OpenStackRequest { public Detach(RouterForAddInterface interfaceToAdd) { - super(CLIENT, HttpMethod.PUT, buildPath("routers/", - interfaceToAdd.getRouterId(), "/remove_router_interface"), + super(CLIENT, HttpMethod.PUT, buildPath("routers", + interfaceToAdd.getRouterId(), "remove_router_interface"), Entity.json(interfaceToAdd), RouterInterface.class); } diff --git a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/SubnetsResource.java b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/SubnetsResource.java index 1864604b2..3f6f5e5c8 100644 --- a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/SubnetsResource.java +++ b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/SubnetsResource.java @@ -39,7 +39,7 @@ public Show show(String netId){ public class List extends OpenStackRequest { public List() { - super(CLIENT, HttpMethod.GET, "subnets", null, Subnets.class); + super(CLIENT, HttpMethod.GET, buildPath("subnets"), null, Subnets.class); } } @@ -57,28 +57,28 @@ public Query(Subnet subnet) { public class Create extends OpenStackRequest { public Create(Subnet subnet) { - super(CLIENT, HttpMethod.POST, "subnets", Entity.json(subnet), Subnet.class); + super(CLIENT, HttpMethod.POST, buildPath("subnets"), Entity.json(subnet), Subnet.class); } } public class Update extends OpenStackRequest { public Update(Subnet subnet) { - super(CLIENT, HttpMethod.PUT, buildPath("subnets/", subnet.getId()), Entity.json(subnet), Subnet.class); + super(CLIENT, HttpMethod.PUT, buildPath("subnets", subnet.getId()), Entity.json(subnet), Subnet.class); } } public class Show extends OpenStackRequest { public Show(String id) { - super(CLIENT, HttpMethod.GET, buildPath("subnets/", id), null, Subnet.class); + super(CLIENT, HttpMethod.GET, buildPath("subnets", id), null, Subnet.class); } } public class Delete extends OpenStackRequest { public Delete(String id){ - super(CLIENT, HttpMethod.DELETE, buildPath("subnets/", id), null, Void.class); + super(CLIENT, HttpMethod.DELETE, buildPath("subnets", id), null, Void.class); } } } From 18adb0d00354bb724e82c1ec9ae314455ed88285 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Mon, 23 Jul 2018 16:21:20 +0200 Subject: [PATCH 10/40] [maven-release-plugin] prepare release openstack-java-sdk-3.2.2 --- ceilometer-client/pom.xml | 6 +++--- ceilometer-model/pom.xml | 2 +- cinder-client/pom.xml | 6 +++--- cinder-model/pom.xml | 2 +- glance-client/pom.xml | 6 +++--- glance-model/pom.xml | 2 +- heat-client/pom.xml | 6 +++--- heat-model/pom.xml | 2 +- keystone-client/pom.xml | 6 +++--- keystone-model/pom.xml | 2 +- nova-client/pom.xml | 6 +++--- nova-model/pom.xml | 2 +- .../jersey2-connector/pom.xml | 4 ++-- openstack-client-connectors/pom.xml | 4 ++-- .../resteasy-connector/pom.xml | 2 +- openstack-client/pom.xml | 2 +- openstack-console/pom.xml | 6 +++--- openstack-examples/pom.xml | 16 ++++++++-------- pom.xml | 4 ++-- quantum-client/pom.xml | 6 +++--- quantum-model/pom.xml | 2 +- swift-client/pom.xml | 6 +++--- swift-model/pom.xml | 2 +- 23 files changed, 51 insertions(+), 51 deletions(-) diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index f8a9a3fe1..0fb4eb0ff 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 ceilometer-client OpenStack Ceilometer Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.2-SNAPSHOT + 3.2.2 com.woorea ceilometer-model - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index 2718bdbe8..2846dc6de 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 ceilometer-model OpenStack Ceilometer Model diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index b85a04b89..cdcae2be4 100644 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 cinder-client OpenStack Cinder Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.2-SNAPSHOT + 3.2.2 com.woorea cinder-model - 3.2.2-SNAPSHOT + 3.2.2 \ No newline at end of file diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index c30b9cb70..14c6e69f1 100644 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 cinder-model OpenStack Cinder Model diff --git a/glance-client/pom.xml b/glance-client/pom.xml index 6eb537e1c..230d7b404 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 glance-client OpenStack Glance Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.2-SNAPSHOT + 3.2.2 com.woorea glance-model - 3.2.2-SNAPSHOT + 3.2.2 \ No newline at end of file diff --git a/glance-model/pom.xml b/glance-model/pom.xml index 2efc98be8..d33314c8d 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 glance-model OpenStack Glance Model diff --git a/heat-client/pom.xml b/heat-client/pom.xml index 7c63daf12..9d46c7666 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 heat-client OpenStack Heat Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.2-SNAPSHOT + 3.2.2 com.woorea heat-model - 3.2.2-SNAPSHOT + 3.2.2 \ No newline at end of file diff --git a/heat-model/pom.xml b/heat-model/pom.xml index d7fb92148..3a7045841 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 heat-model OpenStack Heat Model diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index 69a46ed43..fe9a7ff61 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 keystone-client OpenStack Keystone Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.2-SNAPSHOT + 3.2.2 com.woorea keystone-model - 3.2.2-SNAPSHOT + 3.2.2 \ No newline at end of file diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index 0c8794192..fc59f52d5 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 keystone-model OpenStack Keystone Model diff --git a/nova-client/pom.xml b/nova-client/pom.xml index f967af043..26a667822 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 nova-client OpenStack Nova Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.2-SNAPSHOT + 3.2.2 com.woorea nova-model - 3.2.2-SNAPSHOT + 3.2.2 \ No newline at end of file diff --git a/nova-model/pom.xml b/nova-model/pom.xml index e7cfec5c3..fda497249 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 nova-model OpenStack Nova Model diff --git a/openstack-client-connectors/jersey2-connector/pom.xml b/openstack-client-connectors/jersey2-connector/pom.xml index 1738128d4..2cbfa86c9 100644 --- a/openstack-client-connectors/jersey2-connector/pom.xml +++ b/openstack-client-connectors/jersey2-connector/pom.xml @@ -4,7 +4,7 @@ com.woorea openstack-client-connectors - 3.2.2-SNAPSHOT + 3.2.2 jersey2-connector OpenStack Jersey2 Connector @@ -27,7 +27,7 @@ com.woorea openstack-client - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index b5f29f241..8cb475e37 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 openstack-client-connectors OpenStack Client Connectors @@ -42,7 +42,7 @@ com.woorea openstack-client - 3.2.2-SNAPSHOT + 3.2.2 \ No newline at end of file diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index 6cbea9dc8..d509f485c 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.2-SNAPSHOT + 3.2.2 resteasy-connector OpenStack RESTEasy Connector diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index c3fcf3510..5e73ff5e9 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 openstack-client OpenStack Client diff --git a/openstack-console/pom.xml b/openstack-console/pom.xml index 2f462ec81..5c97c7e8b 100644 --- a/openstack-console/pom.xml +++ b/openstack-console/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 openstack-console OpenStack Console @@ -22,12 +22,12 @@ com.woorea keystone-client - 3.2.2-SNAPSHOT + 3.2.2 com.woorea nova-client - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index 30d401437..79738c431 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 openstack-examples OpenStack Examples @@ -12,37 +12,37 @@ com.woorea keystone-client - 3.2.2-SNAPSHOT + 3.2.2 com.woorea nova-client - 3.2.2-SNAPSHOT + 3.2.2 com.woorea heat-client - 3.2.2-SNAPSHOT + 3.2.2 com.woorea swift-client - 3.2.2-SNAPSHOT + 3.2.2 com.woorea quantum-client - 3.2.2-SNAPSHOT + 3.2.2 com.woorea ceilometer-client - 3.2.2-SNAPSHOT + 3.2.2 com.woorea glance-client - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/pom.xml b/pom.xml index 5eedb6ff3..0027f8af6 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 pom OpenStack Java SDK OpenStack Java SDK @@ -107,7 +107,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + 1.6 ${skip.sign} diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index 0f3426f02..ff5a3f307 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 quantum-client OpenStack Quantum Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.2-SNAPSHOT + 3.2.2 com.woorea quantum-model - 3.2.2-SNAPSHOT + 3.2.2 diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index f8b7ef8d5..6475176a9 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 quantum-model OpenStack Quantum Model diff --git a/swift-client/pom.xml b/swift-client/pom.xml index c0aafe7c1..2a6ae51e4 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 swift-client OpenStack Swift Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.2-SNAPSHOT + 3.2.2 com.woorea swift-model - 3.2.2-SNAPSHOT + 3.2.2 \ No newline at end of file diff --git a/swift-model/pom.xml b/swift-model/pom.xml index ebf618b56..fd27017a2 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2-SNAPSHOT + 3.2.2 swift-model OpenStack Swift Model From 24ca83f2e28e9b5e6254258934aa63be43324012 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Mon, 23 Jul 2018 16:23:49 +0200 Subject: [PATCH 11/40] [maven-release-plugin] prepare for next development iteration --- ceilometer-client/pom.xml | 6 +++--- ceilometer-model/pom.xml | 2 +- cinder-client/pom.xml | 6 +++--- cinder-model/pom.xml | 2 +- glance-client/pom.xml | 6 +++--- glance-model/pom.xml | 2 +- heat-client/pom.xml | 6 +++--- heat-model/pom.xml | 2 +- keystone-client/pom.xml | 6 +++--- keystone-model/pom.xml | 2 +- nova-client/pom.xml | 6 +++--- nova-model/pom.xml | 2 +- .../jersey2-connector/pom.xml | 4 ++-- openstack-client-connectors/pom.xml | 4 ++-- .../resteasy-connector/pom.xml | 2 +- openstack-client/pom.xml | 2 +- openstack-console/pom.xml | 6 +++--- openstack-examples/pom.xml | 16 ++++++++-------- pom.xml | 2 +- quantum-client/pom.xml | 6 +++--- quantum-model/pom.xml | 2 +- swift-client/pom.xml | 6 +++--- swift-model/pom.xml | 2 +- 23 files changed, 50 insertions(+), 50 deletions(-) diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index 0fb4eb0ff..3c657af83 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT ceilometer-client OpenStack Ceilometer Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.2 + 3.2.3-SNAPSHOT com.woorea ceilometer-model - 3.2.2 + 3.2.3-SNAPSHOT diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index 2846dc6de..ed7e7c391 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT ceilometer-model OpenStack Ceilometer Model diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index cdcae2be4..1b232cb85 100644 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT cinder-client OpenStack Cinder Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.2 + 3.2.3-SNAPSHOT com.woorea cinder-model - 3.2.2 + 3.2.3-SNAPSHOT \ No newline at end of file diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index 14c6e69f1..007f2dd9d 100644 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT cinder-model OpenStack Cinder Model diff --git a/glance-client/pom.xml b/glance-client/pom.xml index 230d7b404..8aa3ef5fe 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT glance-client OpenStack Glance Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.2 + 3.2.3-SNAPSHOT com.woorea glance-model - 3.2.2 + 3.2.3-SNAPSHOT \ No newline at end of file diff --git a/glance-model/pom.xml b/glance-model/pom.xml index d33314c8d..203420b61 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT glance-model OpenStack Glance Model diff --git a/heat-client/pom.xml b/heat-client/pom.xml index 9d46c7666..909b14ec4 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT heat-client OpenStack Heat Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.2 + 3.2.3-SNAPSHOT com.woorea heat-model - 3.2.2 + 3.2.3-SNAPSHOT \ No newline at end of file diff --git a/heat-model/pom.xml b/heat-model/pom.xml index 3a7045841..e09d86ab6 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT heat-model OpenStack Heat Model diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index fe9a7ff61..50e79ca58 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT keystone-client OpenStack Keystone Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.2 + 3.2.3-SNAPSHOT com.woorea keystone-model - 3.2.2 + 3.2.3-SNAPSHOT \ No newline at end of file diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index fc59f52d5..5c542f086 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT keystone-model OpenStack Keystone Model diff --git a/nova-client/pom.xml b/nova-client/pom.xml index 26a667822..e851ea850 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT nova-client OpenStack Nova Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.2 + 3.2.3-SNAPSHOT com.woorea nova-model - 3.2.2 + 3.2.3-SNAPSHOT \ No newline at end of file diff --git a/nova-model/pom.xml b/nova-model/pom.xml index fda497249..8321caab7 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT nova-model OpenStack Nova Model diff --git a/openstack-client-connectors/jersey2-connector/pom.xml b/openstack-client-connectors/jersey2-connector/pom.xml index 2cbfa86c9..8822cd456 100644 --- a/openstack-client-connectors/jersey2-connector/pom.xml +++ b/openstack-client-connectors/jersey2-connector/pom.xml @@ -4,7 +4,7 @@ com.woorea openstack-client-connectors - 3.2.2 + 3.2.3-SNAPSHOT jersey2-connector OpenStack Jersey2 Connector @@ -27,7 +27,7 @@ com.woorea openstack-client - 3.2.2 + 3.2.3-SNAPSHOT diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index 8cb475e37..23c7e5c88 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT openstack-client-connectors OpenStack Client Connectors @@ -42,7 +42,7 @@ com.woorea openstack-client - 3.2.2 + 3.2.3-SNAPSHOT \ No newline at end of file diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index d509f485c..591dcc6f6 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.2 + 3.2.3-SNAPSHOT resteasy-connector OpenStack RESTEasy Connector diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index 5e73ff5e9..9a412ead4 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT openstack-client OpenStack Client diff --git a/openstack-console/pom.xml b/openstack-console/pom.xml index 5c97c7e8b..8110402c9 100644 --- a/openstack-console/pom.xml +++ b/openstack-console/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT openstack-console OpenStack Console @@ -22,12 +22,12 @@ com.woorea keystone-client - 3.2.2 + 3.2.3-SNAPSHOT com.woorea nova-client - 3.2.2 + 3.2.3-SNAPSHOT diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index 79738c431..21c6c1568 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT openstack-examples OpenStack Examples @@ -12,37 +12,37 @@ com.woorea keystone-client - 3.2.2 + 3.2.3-SNAPSHOT com.woorea nova-client - 3.2.2 + 3.2.3-SNAPSHOT com.woorea heat-client - 3.2.2 + 3.2.3-SNAPSHOT com.woorea swift-client - 3.2.2 + 3.2.3-SNAPSHOT com.woorea quantum-client - 3.2.2 + 3.2.3-SNAPSHOT com.woorea ceilometer-client - 3.2.2 + 3.2.3-SNAPSHOT com.woorea glance-client - 3.2.2 + 3.2.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index 0027f8af6..0e85bda35 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT pom OpenStack Java SDK OpenStack Java SDK diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index ff5a3f307..59fc2f0bf 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT quantum-client OpenStack Quantum Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.2 + 3.2.3-SNAPSHOT com.woorea quantum-model - 3.2.2 + 3.2.3-SNAPSHOT diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index 6475176a9..3d55fb615 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT quantum-model OpenStack Quantum Model diff --git a/swift-client/pom.xml b/swift-client/pom.xml index 2a6ae51e4..1414c54a0 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT swift-client OpenStack Swift Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.2 + 3.2.3-SNAPSHOT com.woorea swift-model - 3.2.2 + 3.2.3-SNAPSHOT \ No newline at end of file diff --git a/swift-model/pom.xml b/swift-model/pom.xml index fd27017a2..0191af90b 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.2 + 3.2.3-SNAPSHOT swift-model OpenStack Swift Model From cf4d6a09bd9f36544b8013c6d47528b451a76423 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Tue, 24 Jul 2018 08:59:18 +0200 Subject: [PATCH 12/40] Revert "Add sonatype.org to pom.xml" This reverts commit 32053dbebdf3c686a1ad484c325f8afc15c17c2a. The nexus-staging-maven-plugin causes trouble in fedora's build system, and might cause trouble in other build systems, too. --- pom.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pom.xml b/pom.xml index 0e85bda35..2b6579bde 100644 --- a/pom.xml +++ b/pom.xml @@ -131,17 +131,6 @@ maven-resources-plugin 2.6 - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://oss.sonatype.org/ - false - - From 0f81115f281ccedc13b085cf1373eed4afa98896 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Tue, 24 Jul 2018 09:28:42 +0200 Subject: [PATCH 13/40] [maven-release-plugin] prepare release openstack-java-sdk-3.2.3 --- ceilometer-client/pom.xml | 6 +++--- ceilometer-model/pom.xml | 2 +- cinder-client/pom.xml | 6 +++--- cinder-model/pom.xml | 2 +- glance-client/pom.xml | 6 +++--- glance-model/pom.xml | 2 +- heat-client/pom.xml | 6 +++--- heat-model/pom.xml | 2 +- keystone-client/pom.xml | 6 +++--- keystone-model/pom.xml | 2 +- nova-client/pom.xml | 6 +++--- nova-model/pom.xml | 2 +- .../jersey2-connector/pom.xml | 4 ++-- openstack-client-connectors/pom.xml | 4 ++-- .../resteasy-connector/pom.xml | 2 +- openstack-client/pom.xml | 2 +- openstack-console/pom.xml | 6 +++--- openstack-examples/pom.xml | 16 ++++++++-------- pom.xml | 2 +- quantum-client/pom.xml | 6 +++--- quantum-model/pom.xml | 2 +- swift-client/pom.xml | 6 +++--- swift-model/pom.xml | 2 +- 23 files changed, 50 insertions(+), 50 deletions(-) diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index 3c657af83..c6e21e67e 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 ceilometer-client OpenStack Ceilometer Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.3-SNAPSHOT + 3.2.3 com.woorea ceilometer-model - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index ed7e7c391..0e839e76a 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 ceilometer-model OpenStack Ceilometer Model diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index 1b232cb85..b3d2b87a4 100644 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 cinder-client OpenStack Cinder Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.3-SNAPSHOT + 3.2.3 com.woorea cinder-model - 3.2.3-SNAPSHOT + 3.2.3 \ No newline at end of file diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index 007f2dd9d..716814120 100644 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 cinder-model OpenStack Cinder Model diff --git a/glance-client/pom.xml b/glance-client/pom.xml index 8aa3ef5fe..30a3cd798 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 glance-client OpenStack Glance Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.3-SNAPSHOT + 3.2.3 com.woorea glance-model - 3.2.3-SNAPSHOT + 3.2.3 \ No newline at end of file diff --git a/glance-model/pom.xml b/glance-model/pom.xml index 203420b61..a76a3d542 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 glance-model OpenStack Glance Model diff --git a/heat-client/pom.xml b/heat-client/pom.xml index 909b14ec4..a96586300 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 heat-client OpenStack Heat Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.3-SNAPSHOT + 3.2.3 com.woorea heat-model - 3.2.3-SNAPSHOT + 3.2.3 \ No newline at end of file diff --git a/heat-model/pom.xml b/heat-model/pom.xml index e09d86ab6..bf757fbf3 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 heat-model OpenStack Heat Model diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index 50e79ca58..7326d5038 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 keystone-client OpenStack Keystone Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.3-SNAPSHOT + 3.2.3 com.woorea keystone-model - 3.2.3-SNAPSHOT + 3.2.3 \ No newline at end of file diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index 5c542f086..54d872b11 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 keystone-model OpenStack Keystone Model diff --git a/nova-client/pom.xml b/nova-client/pom.xml index e851ea850..c593e5681 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 nova-client OpenStack Nova Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.3-SNAPSHOT + 3.2.3 com.woorea nova-model - 3.2.3-SNAPSHOT + 3.2.3 \ No newline at end of file diff --git a/nova-model/pom.xml b/nova-model/pom.xml index 8321caab7..c2c7a07a7 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 nova-model OpenStack Nova Model diff --git a/openstack-client-connectors/jersey2-connector/pom.xml b/openstack-client-connectors/jersey2-connector/pom.xml index 8822cd456..cf40f2b29 100644 --- a/openstack-client-connectors/jersey2-connector/pom.xml +++ b/openstack-client-connectors/jersey2-connector/pom.xml @@ -4,7 +4,7 @@ com.woorea openstack-client-connectors - 3.2.3-SNAPSHOT + 3.2.3 jersey2-connector OpenStack Jersey2 Connector @@ -27,7 +27,7 @@ com.woorea openstack-client - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index 23c7e5c88..603483e8b 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 openstack-client-connectors OpenStack Client Connectors @@ -42,7 +42,7 @@ com.woorea openstack-client - 3.2.3-SNAPSHOT + 3.2.3 \ No newline at end of file diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index 591dcc6f6..3069a4ecb 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.3-SNAPSHOT + 3.2.3 resteasy-connector OpenStack RESTEasy Connector diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index 9a412ead4..848ed574d 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 openstack-client OpenStack Client diff --git a/openstack-console/pom.xml b/openstack-console/pom.xml index 8110402c9..03a851bed 100644 --- a/openstack-console/pom.xml +++ b/openstack-console/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 openstack-console OpenStack Console @@ -22,12 +22,12 @@ com.woorea keystone-client - 3.2.3-SNAPSHOT + 3.2.3 com.woorea nova-client - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index 21c6c1568..f0af046c6 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 openstack-examples OpenStack Examples @@ -12,37 +12,37 @@ com.woorea keystone-client - 3.2.3-SNAPSHOT + 3.2.3 com.woorea nova-client - 3.2.3-SNAPSHOT + 3.2.3 com.woorea heat-client - 3.2.3-SNAPSHOT + 3.2.3 com.woorea swift-client - 3.2.3-SNAPSHOT + 3.2.3 com.woorea quantum-client - 3.2.3-SNAPSHOT + 3.2.3 com.woorea ceilometer-client - 3.2.3-SNAPSHOT + 3.2.3 com.woorea glance-client - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/pom.xml b/pom.xml index 2b6579bde..b3659ef56 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 pom OpenStack Java SDK OpenStack Java SDK diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index 59fc2f0bf..02843515f 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 quantum-client OpenStack Quantum Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.3-SNAPSHOT + 3.2.3 com.woorea quantum-model - 3.2.3-SNAPSHOT + 3.2.3 diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index 3d55fb615..2995e805d 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 quantum-model OpenStack Quantum Model diff --git a/swift-client/pom.xml b/swift-client/pom.xml index 1414c54a0..aac02645d 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 swift-client OpenStack Swift Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.3-SNAPSHOT + 3.2.3 com.woorea swift-model - 3.2.3-SNAPSHOT + 3.2.3 \ No newline at end of file diff --git a/swift-model/pom.xml b/swift-model/pom.xml index 0191af90b..dda394ebc 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3-SNAPSHOT + 3.2.3 swift-model OpenStack Swift Model From c6f9f5db1d85b7eee7a80512c03eb4b4ca28a0f9 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Tue, 24 Jul 2018 09:29:21 +0200 Subject: [PATCH 14/40] [maven-release-plugin] prepare for next development iteration --- ceilometer-client/pom.xml | 6 +++--- ceilometer-model/pom.xml | 2 +- cinder-client/pom.xml | 6 +++--- cinder-model/pom.xml | 2 +- glance-client/pom.xml | 6 +++--- glance-model/pom.xml | 2 +- heat-client/pom.xml | 6 +++--- heat-model/pom.xml | 2 +- keystone-client/pom.xml | 6 +++--- keystone-model/pom.xml | 2 +- nova-client/pom.xml | 6 +++--- nova-model/pom.xml | 2 +- .../jersey2-connector/pom.xml | 4 ++-- openstack-client-connectors/pom.xml | 4 ++-- .../resteasy-connector/pom.xml | 2 +- openstack-client/pom.xml | 2 +- openstack-console/pom.xml | 6 +++--- openstack-examples/pom.xml | 16 ++++++++-------- pom.xml | 2 +- quantum-client/pom.xml | 6 +++--- quantum-model/pom.xml | 2 +- swift-client/pom.xml | 6 +++--- swift-model/pom.xml | 2 +- 23 files changed, 50 insertions(+), 50 deletions(-) diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index c6e21e67e..5aa7ade89 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT ceilometer-client OpenStack Ceilometer Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.3 + 3.2.4-SNAPSHOT com.woorea ceilometer-model - 3.2.3 + 3.2.4-SNAPSHOT diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index 0e839e76a..f679ca001 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT ceilometer-model OpenStack Ceilometer Model diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index b3d2b87a4..5460d91e9 100644 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT cinder-client OpenStack Cinder Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.3 + 3.2.4-SNAPSHOT com.woorea cinder-model - 3.2.3 + 3.2.4-SNAPSHOT \ No newline at end of file diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index 716814120..ac3c7ce7d 100644 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT cinder-model OpenStack Cinder Model diff --git a/glance-client/pom.xml b/glance-client/pom.xml index 30a3cd798..d72012b65 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT glance-client OpenStack Glance Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.3 + 3.2.4-SNAPSHOT com.woorea glance-model - 3.2.3 + 3.2.4-SNAPSHOT \ No newline at end of file diff --git a/glance-model/pom.xml b/glance-model/pom.xml index a76a3d542..0f19435ff 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT glance-model OpenStack Glance Model diff --git a/heat-client/pom.xml b/heat-client/pom.xml index a96586300..5a13cc7af 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT heat-client OpenStack Heat Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.3 + 3.2.4-SNAPSHOT com.woorea heat-model - 3.2.3 + 3.2.4-SNAPSHOT \ No newline at end of file diff --git a/heat-model/pom.xml b/heat-model/pom.xml index bf757fbf3..34da11b4b 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT heat-model OpenStack Heat Model diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index 7326d5038..0eb0e4c1a 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT keystone-client OpenStack Keystone Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.3 + 3.2.4-SNAPSHOT com.woorea keystone-model - 3.2.3 + 3.2.4-SNAPSHOT \ No newline at end of file diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index 54d872b11..681f0e8fa 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT keystone-model OpenStack Keystone Model diff --git a/nova-client/pom.xml b/nova-client/pom.xml index c593e5681..ed778acae 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT nova-client OpenStack Nova Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.3 + 3.2.4-SNAPSHOT com.woorea nova-model - 3.2.3 + 3.2.4-SNAPSHOT \ No newline at end of file diff --git a/nova-model/pom.xml b/nova-model/pom.xml index c2c7a07a7..7aa8a1a89 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT nova-model OpenStack Nova Model diff --git a/openstack-client-connectors/jersey2-connector/pom.xml b/openstack-client-connectors/jersey2-connector/pom.xml index cf40f2b29..d4de831b1 100644 --- a/openstack-client-connectors/jersey2-connector/pom.xml +++ b/openstack-client-connectors/jersey2-connector/pom.xml @@ -4,7 +4,7 @@ com.woorea openstack-client-connectors - 3.2.3 + 3.2.4-SNAPSHOT jersey2-connector OpenStack Jersey2 Connector @@ -27,7 +27,7 @@ com.woorea openstack-client - 3.2.3 + 3.2.4-SNAPSHOT diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index 603483e8b..712a34193 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT openstack-client-connectors OpenStack Client Connectors @@ -42,7 +42,7 @@ com.woorea openstack-client - 3.2.3 + 3.2.4-SNAPSHOT \ No newline at end of file diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index 3069a4ecb..17c5fd733 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.3 + 3.2.4-SNAPSHOT resteasy-connector OpenStack RESTEasy Connector diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index 848ed574d..599084dfb 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT openstack-client OpenStack Client diff --git a/openstack-console/pom.xml b/openstack-console/pom.xml index 03a851bed..06796cd7f 100644 --- a/openstack-console/pom.xml +++ b/openstack-console/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT openstack-console OpenStack Console @@ -22,12 +22,12 @@ com.woorea keystone-client - 3.2.3 + 3.2.4-SNAPSHOT com.woorea nova-client - 3.2.3 + 3.2.4-SNAPSHOT diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index f0af046c6..7ea3dd5b0 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT openstack-examples OpenStack Examples @@ -12,37 +12,37 @@ com.woorea keystone-client - 3.2.3 + 3.2.4-SNAPSHOT com.woorea nova-client - 3.2.3 + 3.2.4-SNAPSHOT com.woorea heat-client - 3.2.3 + 3.2.4-SNAPSHOT com.woorea swift-client - 3.2.3 + 3.2.4-SNAPSHOT com.woorea quantum-client - 3.2.3 + 3.2.4-SNAPSHOT com.woorea ceilometer-client - 3.2.3 + 3.2.4-SNAPSHOT com.woorea glance-client - 3.2.3 + 3.2.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index b3659ef56..c047c40f0 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT pom OpenStack Java SDK OpenStack Java SDK diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index 02843515f..8d2b1bc38 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT quantum-client OpenStack Quantum Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.3 + 3.2.4-SNAPSHOT com.woorea quantum-model - 3.2.3 + 3.2.4-SNAPSHOT diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index 2995e805d..29d52ac1d 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT quantum-model OpenStack Quantum Model diff --git a/swift-client/pom.xml b/swift-client/pom.xml index aac02645d..643c10c3a 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT swift-client OpenStack Swift Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.3 + 3.2.4-SNAPSHOT com.woorea swift-model - 3.2.3 + 3.2.4-SNAPSHOT \ No newline at end of file diff --git a/swift-model/pom.xml b/swift-model/pom.xml index dda394ebc..52c8d9841 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.3 + 3.2.4-SNAPSHOT swift-model OpenStack Swift Model From b6ed0e293a0716af94f71aa79842f6598b43c78b Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Tue, 24 Jul 2018 18:04:26 +0200 Subject: [PATCH 15/40] Align required versions The examples and the jersey-connector reference the current version of openstack-java-sdk. --- .../jersey-connector/pom.xml | 2 +- openstack-examples/pom.xml | 26 +++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/openstack-client-connectors/jersey-connector/pom.xml b/openstack-client-connectors/jersey-connector/pom.xml index b9b95c496..c4ed454be 100644 --- a/openstack-client-connectors/jersey-connector/pom.xml +++ b/openstack-client-connectors/jersey-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.2-SNAPSHOT + 3.2.4-SNAPSHOT jersey-connector OpenStack Jersey Connector diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index 7ea3dd5b0..1469ddf3d 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -5,6 +5,10 @@ openstack-java-sdk 3.2.4-SNAPSHOT + + UTF-8 + 3.2.4-SNAPSHOT + openstack-examples OpenStack Examples OpenStack Examples @@ -12,37 +16,37 @@ com.woorea keystone-client - 3.2.4-SNAPSHOT + ${openstack-sdk.version} com.woorea nova-client - 3.2.4-SNAPSHOT + ${openstack-sdk.version} com.woorea heat-client - 3.2.4-SNAPSHOT + ${openstack-sdk.version} com.woorea swift-client - 3.2.4-SNAPSHOT + ${openstack-sdk.version} com.woorea quantum-client - 3.2.4-SNAPSHOT + ${openstack-sdk.version} com.woorea ceilometer-client - 3.2.4-SNAPSHOT + ${openstack-sdk.version} com.woorea glance-client - 3.2.4-SNAPSHOT + ${openstack-sdk.version} @@ -52,7 +56,7 @@ com.woorea jersey-connector - 3.0.0-SNAPSHOT + ${openstack-sdk.version} @@ -65,7 +69,7 @@ com.woorea jersey2-connector - 3.1.0-SNAPSHOT + ${openstack-sdk.version} @@ -75,9 +79,9 @@ com.woorea resteasy-connector - 3.1.0-SNAPSHOT + ${openstack-sdk.version} - \ No newline at end of file + From a37e9538630d475853ecc4fb445cfd88d776e60c Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Thu, 26 Jul 2018 16:38:20 +0200 Subject: [PATCH 16/40] Add NEWS This file contains highlights, important fixes, or notable enhancement back to version 3.1.0. --- NEWS.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 NEWS.md diff --git a/NEWS.md b/NEWS.md new file mode 100644 index 000000000..f183a57ef --- /dev/null +++ b/NEWS.md @@ -0,0 +1,31 @@ +# 3.2.3 / 2018-06-24 +* No user visible changes + +# 3.2.2 / 2018-06-23 +* Add keystone v3 support +* Add missing nova utility methods for server actions +* Add heat support +* Add router support +* All fixes and improvements up to 3.1.3 + +# 3.1.3 / 2018-05-18 +* Cinder: Add support for `os-terminate_connection` +* neutron: Support parameter mtu + +# 3.1.2 / 2017-01-28 +* RESTEasyConnector: Isolate the creation of ClientExecutor + +# 3.1.1 / 2015-05-06 +* cinder: introduce client and model +* java 7 +* Fixes and improvements up to 3.0.6 + +# 3.2.1 / 2013-07-26 +* No user visible changes + +# 3.2.0 / 2013-07-26 +* support quota/limits/usage operations +* logging enhancements + +# 3.1.0 / 2013-07-21 + From c36054ad8f29d62cb7cd0c58cf00cbb8e044e603 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Tue, 31 Jul 2018 16:27:27 +0200 Subject: [PATCH 17/40] Add backward compatibility to OpenStackRequest In 5882b5763b854da74b887cf91d5e0fa62ca276c1 the signature of the constructor of OpenStackRequest was modifed. To improve the backward compatibility, the old signature is added as additional method again. --- NEWS.md | 3 +++ .../com/woorea/openstack/base/client/OpenStackRequest.java | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index f183a57ef..6dec902f0 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +# 3.2.4 / 2018 +* Improved backward compatibility to 3.1.3 + # 3.2.3 / 2018-06-24 * No user visible changes diff --git a/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackRequest.java b/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackRequest.java index 38cf2b643..5da28bef8 100644 --- a/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackRequest.java +++ b/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackRequest.java @@ -8,12 +8,16 @@ import java.util.Map; public class OpenStackRequest { - + private OpenStackClient client; public OpenStackRequest() { } + + public OpenStackRequest(OpenStackClient client, HttpMethod method, String path, Entity entity, Class returnType) { + this(client, method, (CharSequence)path, entity, returnType); + } public OpenStackRequest(OpenStackClient client, HttpMethod method, CharSequence path, Entity entity, Class returnType) { this.client = client; From 5396617148183394eb597fe3fe7a7f09b9a9a61a Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Tue, 31 Jul 2018 16:37:10 +0200 Subject: [PATCH 18/40] RESTEasyConnector: Improve backward compatibility 72b1c2379c78c753f226d915c0dcb7e339ad3bb0 breaks compatibility with applications which are creating raw OpenStackRequest with empty path. But 72b1c2379c78c753f226d915c0dcb7e339ad3bb0 cannot be reverted, this would produce URLs containing double slashes in the path. For this reasons, the empty path case is handled explicitly. --- .../com/woorea/openstack/connector/RESTEasyConnector.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java index c31a2cee5..ac8d3fd5d 100644 --- a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java +++ b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java @@ -85,7 +85,11 @@ protected ClientExecutor createClientExecutor() { } public OpenStackResponse request(OpenStackRequest request) { - ClientRequest client = new ClientRequest(UriBuilder.fromUri(request.endpoint() + request.path()), + String requestPath = request.path(); + if (requestPath != null && requestPath.isEmpty()) { + requestPath = "/"; + } + ClientRequest client = new ClientRequest(UriBuilder.fromUri(request.endpoint() + requestPath), createClientExecutor(), providerFactory); for(Map.Entry > entry : request.queryParams().entrySet()) { From 62a8ad12ee0ca20f41ddee8c457f6c74247a29a3 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Tue, 14 Aug 2018 17:13:24 +0200 Subject: [PATCH 19/40] [maven-release-plugin] prepare release openstack-java-sdk-3.2.4 --- ceilometer-client/pom.xml | 6 +++--- ceilometer-model/pom.xml | 2 +- cinder-client/pom.xml | 6 +++--- cinder-model/pom.xml | 2 +- glance-client/pom.xml | 6 +++--- glance-model/pom.xml | 2 +- heat-client/pom.xml | 6 +++--- heat-model/pom.xml | 2 +- keystone-client/pom.xml | 6 +++--- keystone-model/pom.xml | 2 +- nova-client/pom.xml | 6 +++--- nova-model/pom.xml | 2 +- openstack-client-connectors/jersey-connector/pom.xml | 2 +- openstack-client-connectors/jersey2-connector/pom.xml | 4 ++-- openstack-client-connectors/pom.xml | 4 ++-- openstack-client-connectors/resteasy-connector/pom.xml | 2 +- openstack-client/pom.xml | 2 +- openstack-console/pom.xml | 6 +++--- openstack-examples/pom.xml | 4 ++-- pom.xml | 2 +- quantum-client/pom.xml | 6 +++--- quantum-model/pom.xml | 2 +- swift-client/pom.xml | 6 +++--- swift-model/pom.xml | 2 +- 24 files changed, 45 insertions(+), 45 deletions(-) diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index 5aa7ade89..0ea68bae7 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 ceilometer-client OpenStack Ceilometer Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.4-SNAPSHOT + 3.2.4 com.woorea ceilometer-model - 3.2.4-SNAPSHOT + 3.2.4 diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index f679ca001..5ab92bfbd 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 ceilometer-model OpenStack Ceilometer Model diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index 5460d91e9..9c86e149a 100644 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 cinder-client OpenStack Cinder Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.4-SNAPSHOT + 3.2.4 com.woorea cinder-model - 3.2.4-SNAPSHOT + 3.2.4 \ No newline at end of file diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index ac3c7ce7d..f55f1f0de 100644 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 cinder-model OpenStack Cinder Model diff --git a/glance-client/pom.xml b/glance-client/pom.xml index d72012b65..d890824d6 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 glance-client OpenStack Glance Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.4-SNAPSHOT + 3.2.4 com.woorea glance-model - 3.2.4-SNAPSHOT + 3.2.4 \ No newline at end of file diff --git a/glance-model/pom.xml b/glance-model/pom.xml index 0f19435ff..facdef831 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 glance-model OpenStack Glance Model diff --git a/heat-client/pom.xml b/heat-client/pom.xml index 5a13cc7af..903073c97 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 heat-client OpenStack Heat Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.4-SNAPSHOT + 3.2.4 com.woorea heat-model - 3.2.4-SNAPSHOT + 3.2.4 \ No newline at end of file diff --git a/heat-model/pom.xml b/heat-model/pom.xml index 34da11b4b..b661b2fec 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 heat-model OpenStack Heat Model diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index 0eb0e4c1a..256379fab 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 keystone-client OpenStack Keystone Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.4-SNAPSHOT + 3.2.4 com.woorea keystone-model - 3.2.4-SNAPSHOT + 3.2.4 \ No newline at end of file diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index 681f0e8fa..8bd42b553 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 keystone-model OpenStack Keystone Model diff --git a/nova-client/pom.xml b/nova-client/pom.xml index ed778acae..8ecb106a9 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 nova-client OpenStack Nova Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.4-SNAPSHOT + 3.2.4 com.woorea nova-model - 3.2.4-SNAPSHOT + 3.2.4 \ No newline at end of file diff --git a/nova-model/pom.xml b/nova-model/pom.xml index 7aa8a1a89..58b3f8288 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 nova-model OpenStack Nova Model diff --git a/openstack-client-connectors/jersey-connector/pom.xml b/openstack-client-connectors/jersey-connector/pom.xml index c4ed454be..7d7664b30 100644 --- a/openstack-client-connectors/jersey-connector/pom.xml +++ b/openstack-client-connectors/jersey-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.4-SNAPSHOT + 3.2.4 jersey-connector OpenStack Jersey Connector diff --git a/openstack-client-connectors/jersey2-connector/pom.xml b/openstack-client-connectors/jersey2-connector/pom.xml index d4de831b1..184d6566f 100644 --- a/openstack-client-connectors/jersey2-connector/pom.xml +++ b/openstack-client-connectors/jersey2-connector/pom.xml @@ -4,7 +4,7 @@ com.woorea openstack-client-connectors - 3.2.4-SNAPSHOT + 3.2.4 jersey2-connector OpenStack Jersey2 Connector @@ -27,7 +27,7 @@ com.woorea openstack-client - 3.2.4-SNAPSHOT + 3.2.4 diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index 712a34193..f6dc9d3cf 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 openstack-client-connectors OpenStack Client Connectors @@ -42,7 +42,7 @@ com.woorea openstack-client - 3.2.4-SNAPSHOT + 3.2.4 \ No newline at end of file diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index 17c5fd733..039da6d27 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.4-SNAPSHOT + 3.2.4 resteasy-connector OpenStack RESTEasy Connector diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index 599084dfb..bcb82e00b 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 openstack-client OpenStack Client diff --git a/openstack-console/pom.xml b/openstack-console/pom.xml index 06796cd7f..a7be1ac18 100644 --- a/openstack-console/pom.xml +++ b/openstack-console/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 openstack-console OpenStack Console @@ -22,12 +22,12 @@ com.woorea keystone-client - 3.2.4-SNAPSHOT + 3.2.4 com.woorea nova-client - 3.2.4-SNAPSHOT + 3.2.4 diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index 1469ddf3d..58621a0e1 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -3,11 +3,11 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 UTF-8 - 3.2.4-SNAPSHOT + 3.2.4 openstack-examples OpenStack Examples diff --git a/pom.xml b/pom.xml index c047c40f0..63a2b4cec 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 pom OpenStack Java SDK OpenStack Java SDK diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index 8d2b1bc38..899d90898 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 quantum-client OpenStack Quantum Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.4-SNAPSHOT + 3.2.4 com.woorea quantum-model - 3.2.4-SNAPSHOT + 3.2.4 diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index 29d52ac1d..baf90c386 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 quantum-model OpenStack Quantum Model diff --git a/swift-client/pom.xml b/swift-client/pom.xml index 643c10c3a..fca0888b9 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 swift-client OpenStack Swift Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.4-SNAPSHOT + 3.2.4 com.woorea swift-model - 3.2.4-SNAPSHOT + 3.2.4 \ No newline at end of file diff --git a/swift-model/pom.xml b/swift-model/pom.xml index 52c8d9841..bfc454c0e 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4-SNAPSHOT + 3.2.4 swift-model OpenStack Swift Model From e235d79aa2161b3be0b46747d4c5c072ecccbf28 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Tue, 14 Aug 2018 17:17:24 +0200 Subject: [PATCH 20/40] [maven-release-plugin] prepare for next development iteration --- ceilometer-client/pom.xml | 6 +++--- ceilometer-model/pom.xml | 2 +- cinder-client/pom.xml | 6 +++--- cinder-model/pom.xml | 2 +- glance-client/pom.xml | 6 +++--- glance-model/pom.xml | 2 +- heat-client/pom.xml | 6 +++--- heat-model/pom.xml | 2 +- keystone-client/pom.xml | 6 +++--- keystone-model/pom.xml | 2 +- nova-client/pom.xml | 6 +++--- nova-model/pom.xml | 2 +- openstack-client-connectors/jersey-connector/pom.xml | 2 +- openstack-client-connectors/jersey2-connector/pom.xml | 4 ++-- openstack-client-connectors/pom.xml | 4 ++-- openstack-client-connectors/resteasy-connector/pom.xml | 2 +- openstack-client/pom.xml | 2 +- openstack-console/pom.xml | 6 +++--- openstack-examples/pom.xml | 4 ++-- pom.xml | 2 +- quantum-client/pom.xml | 6 +++--- quantum-model/pom.xml | 2 +- swift-client/pom.xml | 6 +++--- swift-model/pom.xml | 2 +- 24 files changed, 45 insertions(+), 45 deletions(-) diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index 0ea68bae7..4628e3c70 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT ceilometer-client OpenStack Ceilometer Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.4 + 3.2.5-SNAPSHOT com.woorea ceilometer-model - 3.2.4 + 3.2.5-SNAPSHOT diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index 5ab92bfbd..6192dd760 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT ceilometer-model OpenStack Ceilometer Model diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index 9c86e149a..982ac0f97 100644 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT cinder-client OpenStack Cinder Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.4 + 3.2.5-SNAPSHOT com.woorea cinder-model - 3.2.4 + 3.2.5-SNAPSHOT \ No newline at end of file diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index f55f1f0de..6106d1113 100644 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT cinder-model OpenStack Cinder Model diff --git a/glance-client/pom.xml b/glance-client/pom.xml index d890824d6..d857e4c8f 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT glance-client OpenStack Glance Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.4 + 3.2.5-SNAPSHOT com.woorea glance-model - 3.2.4 + 3.2.5-SNAPSHOT \ No newline at end of file diff --git a/glance-model/pom.xml b/glance-model/pom.xml index facdef831..e0eeb45db 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT glance-model OpenStack Glance Model diff --git a/heat-client/pom.xml b/heat-client/pom.xml index 903073c97..fdd885a3a 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT heat-client OpenStack Heat Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.4 + 3.2.5-SNAPSHOT com.woorea heat-model - 3.2.4 + 3.2.5-SNAPSHOT \ No newline at end of file diff --git a/heat-model/pom.xml b/heat-model/pom.xml index b661b2fec..e44444b9a 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT heat-model OpenStack Heat Model diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index 256379fab..cadbed05f 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT keystone-client OpenStack Keystone Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.4 + 3.2.5-SNAPSHOT com.woorea keystone-model - 3.2.4 + 3.2.5-SNAPSHOT \ No newline at end of file diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index 8bd42b553..6b8404a3e 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT keystone-model OpenStack Keystone Model diff --git a/nova-client/pom.xml b/nova-client/pom.xml index 8ecb106a9..2a45b7abf 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT nova-client OpenStack Nova Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.4 + 3.2.5-SNAPSHOT com.woorea nova-model - 3.2.4 + 3.2.5-SNAPSHOT \ No newline at end of file diff --git a/nova-model/pom.xml b/nova-model/pom.xml index 58b3f8288..cdf3073b1 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT nova-model OpenStack Nova Model diff --git a/openstack-client-connectors/jersey-connector/pom.xml b/openstack-client-connectors/jersey-connector/pom.xml index 7d7664b30..99da61d9c 100644 --- a/openstack-client-connectors/jersey-connector/pom.xml +++ b/openstack-client-connectors/jersey-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.4 + 3.2.5-SNAPSHOT jersey-connector OpenStack Jersey Connector diff --git a/openstack-client-connectors/jersey2-connector/pom.xml b/openstack-client-connectors/jersey2-connector/pom.xml index 184d6566f..3dbed3196 100644 --- a/openstack-client-connectors/jersey2-connector/pom.xml +++ b/openstack-client-connectors/jersey2-connector/pom.xml @@ -4,7 +4,7 @@ com.woorea openstack-client-connectors - 3.2.4 + 3.2.5-SNAPSHOT jersey2-connector OpenStack Jersey2 Connector @@ -27,7 +27,7 @@ com.woorea openstack-client - 3.2.4 + 3.2.5-SNAPSHOT diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index f6dc9d3cf..71c25b49e 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT openstack-client-connectors OpenStack Client Connectors @@ -42,7 +42,7 @@ com.woorea openstack-client - 3.2.4 + 3.2.5-SNAPSHOT \ No newline at end of file diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index 039da6d27..6853baad0 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.4 + 3.2.5-SNAPSHOT resteasy-connector OpenStack RESTEasy Connector diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index bcb82e00b..29afacbfa 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT openstack-client OpenStack Client diff --git a/openstack-console/pom.xml b/openstack-console/pom.xml index a7be1ac18..b4fc7839c 100644 --- a/openstack-console/pom.xml +++ b/openstack-console/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT openstack-console OpenStack Console @@ -22,12 +22,12 @@ com.woorea keystone-client - 3.2.4 + 3.2.5-SNAPSHOT com.woorea nova-client - 3.2.4 + 3.2.5-SNAPSHOT diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index 58621a0e1..690e5606f 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -3,11 +3,11 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT UTF-8 - 3.2.4 + 3.2.5-SNAPSHOT openstack-examples OpenStack Examples diff --git a/pom.xml b/pom.xml index 63a2b4cec..a993e34dc 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT pom OpenStack Java SDK OpenStack Java SDK diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index 899d90898..0be8a1282 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT quantum-client OpenStack Quantum Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.4 + 3.2.5-SNAPSHOT com.woorea quantum-model - 3.2.4 + 3.2.5-SNAPSHOT diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index baf90c386..6ed8db4d6 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT quantum-model OpenStack Quantum Model diff --git a/swift-client/pom.xml b/swift-client/pom.xml index fca0888b9..08e0c767b 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT swift-client OpenStack Swift Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.4 + 3.2.5-SNAPSHOT com.woorea swift-model - 3.2.4 + 3.2.5-SNAPSHOT \ No newline at end of file diff --git a/swift-model/pom.xml b/swift-model/pom.xml index bfc454c0e..b97619f8a 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.4 + 3.2.5-SNAPSHOT swift-model OpenStack Swift Model From 35788166003da8e785154b9c90070105ee48c610 Mon Sep 17 00:00:00 2001 From: Miguel Duarte Barroso Date: Wed, 14 Nov 2018 13:55:59 +0100 Subject: [PATCH 21/40] Implement the port_security_enabled attribute for neutron networks The port_security_enabled attribute is used to specify the default port security value of all ports created in the given network. --- NEWS.md | 3 +++ .../openstack/quantum/model/Network.java | 26 ++++++++++++++++++- .../openstack/quantum/model/NetworkTest.java | 5 ++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 6dec902f0..72c0742d1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +# 3.2.5 / 2018-11-14 +* neutron: Add support for `port_security_enabled` on Networks + # 3.2.4 / 2018 * Improved backward compatibility to 3.1.3 diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java index 853858fc5..40e037018 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java @@ -43,6 +43,9 @@ public class Network implements Serializable { private Integer mtu; + @JsonProperty("port_security_enabled") + private Boolean portSecurityEnabled; + /** * @return the status */ @@ -276,6 +279,26 @@ public void setMtu(Integer mtu) { this.mtu = mtu; } + /** + * @return the portSecurityEnabled + */ + @JsonIgnore + public boolean isPortSecurityEnabled() { + return portSecurityEnabled; + } + + public Boolean getPortSecurityEnabled() { + return portSecurityEnabled; + } + + /** + * + * @param portSecurityEnabled enable / disable the default portSecurityEnabled for all future ports in this network + */ + public void setPortSecurityEnabled(Boolean portSecurityEnabled) { + this.portSecurityEnabled = portSecurityEnabled; + } + /* * (non-Javadoc) * @@ -287,6 +310,7 @@ public String toString() { + subnets + ", status=" + status + ", admin_state_up=" + adminStateUp + ", tenant_id=" + tenantId + ", shared=" + shared + ", mtu=" + mtu + ", provider:physical_network=" + providerPhysicalNetwork + ", provider:network_type=" + providerNetworkType + ", router:external=" + - routerExternal + ", provider:segmentation_id=" + providerSegmentationId + "]"; + routerExternal + ", provider:segmentation_id=" + providerSegmentationId + + ", port_security_enabled=" + portSecurityEnabled + "]"; } } diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworkTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworkTest.java index b6255b993..d0649fb81 100644 --- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworkTest.java +++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworkTest.java @@ -37,6 +37,8 @@ public class NetworkTest { private static final String ROUTER_EXTERNAL = "routerExternal"; + private static final Boolean PORT_SECURITY_ENABLED = Boolean.FALSE; + /** * JSON with read only attributes. */ @@ -70,6 +72,7 @@ public void testSerialization() throws Exception { network.setName(NAME); network.setShared(SHARED); network.setTenantId(TENANT_ID); + network.setPortSecurityEnabled(PORT_SECURITY_ENABLED); serializedNetwork = objectMapper.writeValueAsString(network); assertThat(serializedNetwork, not(containsString(ID))); @@ -83,6 +86,7 @@ public void testSerialization() throws Exception { assertThat(serializedNetwork, containsString(PROVIDER_NETWORK_TYPE)); assertThat(serializedNetwork, containsString(PROVIDER_PHYSICAL_NETWORK)); assertThat(serializedNetwork, containsString(Integer.toString(PROVIDER_SEGMENTATION_ID))); + assertThat(serializedNetwork, containsString("\"port_security_enabled\" : " + PORT_SECURITY_ENABLED)); } @Test @@ -115,5 +119,6 @@ public void testDeserialization() throws Exception { assertThat(network.getProviderNetworkType(), is(equalTo(PROVIDER_NETWORK_TYPE))); assertThat(network.getProviderPhysicalNetwork(), is(equalTo(PROVIDER_PHYSICAL_NETWORK))); assertThat(network.getProviderSegmentationId(), is(equalTo(PROVIDER_SEGMENTATION_ID))); + assertThat(network.getPortSecurityEnabled(), is(equalTo(PORT_SECURITY_ENABLED))); } } From b152d3cded1e0acb3359fd9b777983e268e3a938 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Thu, 22 Nov 2018 13:30:20 +0100 Subject: [PATCH 22/40] [maven-release-plugin] prepare release openstack-java-sdk-3.2.5 --- ceilometer-client/pom.xml | 6 +++--- ceilometer-model/pom.xml | 2 +- cinder-client/pom.xml | 6 +++--- cinder-model/pom.xml | 2 +- glance-client/pom.xml | 6 +++--- glance-model/pom.xml | 2 +- heat-client/pom.xml | 6 +++--- heat-model/pom.xml | 2 +- keystone-client/pom.xml | 6 +++--- keystone-model/pom.xml | 2 +- nova-client/pom.xml | 6 +++--- nova-model/pom.xml | 2 +- openstack-client-connectors/jersey2-connector/pom.xml | 4 ++-- openstack-client-connectors/pom.xml | 4 ++-- openstack-client-connectors/resteasy-connector/pom.xml | 2 +- openstack-client/pom.xml | 2 +- openstack-console/pom.xml | 6 +++--- openstack-examples/pom.xml | 4 ++-- pom.xml | 2 +- quantum-client/pom.xml | 6 +++--- quantum-model/pom.xml | 2 +- swift-client/pom.xml | 6 +++--- swift-model/pom.xml | 2 +- 23 files changed, 44 insertions(+), 44 deletions(-) diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index 4628e3c70..041015b08 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 ceilometer-client OpenStack Ceilometer Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.5-SNAPSHOT + 3.2.5 com.woorea ceilometer-model - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index 6192dd760..d9912ee76 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 ceilometer-model OpenStack Ceilometer Model diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index 982ac0f97..445d947da 100644 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 cinder-client OpenStack Cinder Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.5-SNAPSHOT + 3.2.5 com.woorea cinder-model - 3.2.5-SNAPSHOT + 3.2.5 \ No newline at end of file diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index 6106d1113..3cb77a469 100644 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 cinder-model OpenStack Cinder Model diff --git a/glance-client/pom.xml b/glance-client/pom.xml index d857e4c8f..b137a676e 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 glance-client OpenStack Glance Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.5-SNAPSHOT + 3.2.5 com.woorea glance-model - 3.2.5-SNAPSHOT + 3.2.5 \ No newline at end of file diff --git a/glance-model/pom.xml b/glance-model/pom.xml index e0eeb45db..77440c4e6 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 glance-model OpenStack Glance Model diff --git a/heat-client/pom.xml b/heat-client/pom.xml index fdd885a3a..b3d20890a 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 heat-client OpenStack Heat Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.5-SNAPSHOT + 3.2.5 com.woorea heat-model - 3.2.5-SNAPSHOT + 3.2.5 \ No newline at end of file diff --git a/heat-model/pom.xml b/heat-model/pom.xml index e44444b9a..3dd48b3f2 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 heat-model OpenStack Heat Model diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index cadbed05f..5728c346b 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 keystone-client OpenStack Keystone Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.5-SNAPSHOT + 3.2.5 com.woorea keystone-model - 3.2.5-SNAPSHOT + 3.2.5 \ No newline at end of file diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index 6b8404a3e..76491670f 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 keystone-model OpenStack Keystone Model diff --git a/nova-client/pom.xml b/nova-client/pom.xml index 2a45b7abf..5334816d5 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 nova-client OpenStack Nova Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.5-SNAPSHOT + 3.2.5 com.woorea nova-model - 3.2.5-SNAPSHOT + 3.2.5 \ No newline at end of file diff --git a/nova-model/pom.xml b/nova-model/pom.xml index cdf3073b1..b6a27cc1b 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 nova-model OpenStack Nova Model diff --git a/openstack-client-connectors/jersey2-connector/pom.xml b/openstack-client-connectors/jersey2-connector/pom.xml index 3dbed3196..c44ce0f87 100644 --- a/openstack-client-connectors/jersey2-connector/pom.xml +++ b/openstack-client-connectors/jersey2-connector/pom.xml @@ -4,7 +4,7 @@ com.woorea openstack-client-connectors - 3.2.5-SNAPSHOT + 3.2.5 jersey2-connector OpenStack Jersey2 Connector @@ -27,7 +27,7 @@ com.woorea openstack-client - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index 71c25b49e..61a917f7f 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 openstack-client-connectors OpenStack Client Connectors @@ -42,7 +42,7 @@ com.woorea openstack-client - 3.2.5-SNAPSHOT + 3.2.5 \ No newline at end of file diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index 6853baad0..330888fe5 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.5-SNAPSHOT + 3.2.5 resteasy-connector OpenStack RESTEasy Connector diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index 29afacbfa..fa39cee5a 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 openstack-client OpenStack Client diff --git a/openstack-console/pom.xml b/openstack-console/pom.xml index b4fc7839c..6e6bb02f1 100644 --- a/openstack-console/pom.xml +++ b/openstack-console/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 openstack-console OpenStack Console @@ -22,12 +22,12 @@ com.woorea keystone-client - 3.2.5-SNAPSHOT + 3.2.5 com.woorea nova-client - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index 690e5606f..189e412a9 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -3,11 +3,11 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 UTF-8 - 3.2.5-SNAPSHOT + 3.2.5 openstack-examples OpenStack Examples diff --git a/pom.xml b/pom.xml index a993e34dc..76e6846b7 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 pom OpenStack Java SDK OpenStack Java SDK diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index 0be8a1282..da3bb93ef 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 quantum-client OpenStack Quantum Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.5-SNAPSHOT + 3.2.5 com.woorea quantum-model - 3.2.5-SNAPSHOT + 3.2.5 diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index 6ed8db4d6..08c193c0b 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 quantum-model OpenStack Quantum Model diff --git a/swift-client/pom.xml b/swift-client/pom.xml index 08e0c767b..c11b7e4de 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 swift-client OpenStack Swift Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.5-SNAPSHOT + 3.2.5 com.woorea swift-model - 3.2.5-SNAPSHOT + 3.2.5 \ No newline at end of file diff --git a/swift-model/pom.xml b/swift-model/pom.xml index b97619f8a..ae4d9d4f5 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5-SNAPSHOT + 3.2.5 swift-model OpenStack Swift Model From 82923e21771d371cec8bab9e74428479d73f61c1 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Thu, 22 Nov 2018 13:30:51 +0100 Subject: [PATCH 23/40] [maven-release-plugin] prepare for next development iteration --- ceilometer-client/pom.xml | 6 +++--- ceilometer-model/pom.xml | 2 +- cinder-client/pom.xml | 6 +++--- cinder-model/pom.xml | 2 +- glance-client/pom.xml | 6 +++--- glance-model/pom.xml | 2 +- heat-client/pom.xml | 6 +++--- heat-model/pom.xml | 2 +- keystone-client/pom.xml | 6 +++--- keystone-model/pom.xml | 2 +- nova-client/pom.xml | 6 +++--- nova-model/pom.xml | 2 +- openstack-client-connectors/jersey2-connector/pom.xml | 4 ++-- openstack-client-connectors/pom.xml | 4 ++-- openstack-client-connectors/resteasy-connector/pom.xml | 2 +- openstack-client/pom.xml | 2 +- openstack-console/pom.xml | 6 +++--- openstack-examples/pom.xml | 2 +- pom.xml | 2 +- quantum-client/pom.xml | 6 +++--- quantum-model/pom.xml | 2 +- swift-client/pom.xml | 6 +++--- swift-model/pom.xml | 2 +- 23 files changed, 43 insertions(+), 43 deletions(-) diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index 041015b08..63a16992f 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT ceilometer-client OpenStack Ceilometer Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.5 + 3.2.6-SNAPSHOT com.woorea ceilometer-model - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index d9912ee76..3c6c7ddc8 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT ceilometer-model OpenStack Ceilometer Model diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index 445d947da..30aced054 100644 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT cinder-client OpenStack Cinder Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.5 + 3.2.6-SNAPSHOT com.woorea cinder-model - 3.2.5 + 3.2.6-SNAPSHOT \ No newline at end of file diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index 3cb77a469..75ad7c4b7 100644 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT cinder-model OpenStack Cinder Model diff --git a/glance-client/pom.xml b/glance-client/pom.xml index b137a676e..2a35404e9 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT glance-client OpenStack Glance Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.5 + 3.2.6-SNAPSHOT com.woorea glance-model - 3.2.5 + 3.2.6-SNAPSHOT \ No newline at end of file diff --git a/glance-model/pom.xml b/glance-model/pom.xml index 77440c4e6..38fbb18f0 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT glance-model OpenStack Glance Model diff --git a/heat-client/pom.xml b/heat-client/pom.xml index b3d20890a..e0f6def87 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT heat-client OpenStack Heat Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.5 + 3.2.6-SNAPSHOT com.woorea heat-model - 3.2.5 + 3.2.6-SNAPSHOT \ No newline at end of file diff --git a/heat-model/pom.xml b/heat-model/pom.xml index 3dd48b3f2..6a36a1dce 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT heat-model OpenStack Heat Model diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index 5728c346b..9cd2b15cb 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT keystone-client OpenStack Keystone Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.5 + 3.2.6-SNAPSHOT com.woorea keystone-model - 3.2.5 + 3.2.6-SNAPSHOT \ No newline at end of file diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index 76491670f..0a562f77d 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT keystone-model OpenStack Keystone Model diff --git a/nova-client/pom.xml b/nova-client/pom.xml index 5334816d5..8dc894fb7 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT nova-client OpenStack Nova Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.5 + 3.2.6-SNAPSHOT com.woorea nova-model - 3.2.5 + 3.2.6-SNAPSHOT \ No newline at end of file diff --git a/nova-model/pom.xml b/nova-model/pom.xml index b6a27cc1b..813a7f228 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT nova-model OpenStack Nova Model diff --git a/openstack-client-connectors/jersey2-connector/pom.xml b/openstack-client-connectors/jersey2-connector/pom.xml index c44ce0f87..f99daabe5 100644 --- a/openstack-client-connectors/jersey2-connector/pom.xml +++ b/openstack-client-connectors/jersey2-connector/pom.xml @@ -4,7 +4,7 @@ com.woorea openstack-client-connectors - 3.2.5 + 3.2.6-SNAPSHOT jersey2-connector OpenStack Jersey2 Connector @@ -27,7 +27,7 @@ com.woorea openstack-client - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index 61a917f7f..36ef44181 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT openstack-client-connectors OpenStack Client Connectors @@ -42,7 +42,7 @@ com.woorea openstack-client - 3.2.5 + 3.2.6-SNAPSHOT \ No newline at end of file diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index 330888fe5..dbf3fdea2 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.5 + 3.2.6-SNAPSHOT resteasy-connector OpenStack RESTEasy Connector diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index fa39cee5a..e40d0ad0a 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT openstack-client OpenStack Client diff --git a/openstack-console/pom.xml b/openstack-console/pom.xml index 6e6bb02f1..6c9e76e09 100644 --- a/openstack-console/pom.xml +++ b/openstack-console/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT openstack-console OpenStack Console @@ -22,12 +22,12 @@ com.woorea keystone-client - 3.2.5 + 3.2.6-SNAPSHOT com.woorea nova-client - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index 189e412a9..f643a0621 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT UTF-8 diff --git a/pom.xml b/pom.xml index 76e6846b7..e4f7f8678 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT pom OpenStack Java SDK OpenStack Java SDK diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index da3bb93ef..4d202cf45 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT quantum-client OpenStack Quantum Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.5 + 3.2.6-SNAPSHOT com.woorea quantum-model - 3.2.5 + 3.2.6-SNAPSHOT diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index 08c193c0b..551cc2d4e 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT quantum-model OpenStack Quantum Model diff --git a/swift-client/pom.xml b/swift-client/pom.xml index c11b7e4de..89085796e 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT swift-client OpenStack Swift Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.5 + 3.2.6-SNAPSHOT com.woorea swift-model - 3.2.5 + 3.2.6-SNAPSHOT \ No newline at end of file diff --git a/swift-model/pom.xml b/swift-model/pom.xml index ae4d9d4f5..1acc4fcde 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.5 + 3.2.6-SNAPSHOT swift-model OpenStack Swift Model From c1b1ee08e9cbb5c1a01b8f9d71d5d18c6fc50adb Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Thu, 22 Nov 2018 17:56:57 +0100 Subject: [PATCH 24/40] Align versions The examples and the jersey-connector reference the current version of openstack-java-sdk. --- openstack-client-connectors/jersey-connector/pom.xml | 2 +- openstack-examples/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openstack-client-connectors/jersey-connector/pom.xml b/openstack-client-connectors/jersey-connector/pom.xml index 99da61d9c..1ebbd381d 100644 --- a/openstack-client-connectors/jersey-connector/pom.xml +++ b/openstack-client-connectors/jersey-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.5-SNAPSHOT + 3.2.6-SNAPSHOT jersey-connector OpenStack Jersey Connector diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index f643a0621..e0c19554e 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -7,7 +7,7 @@ UTF-8 - 3.2.5 + 3.2.6-SNAPSHOT openstack-examples OpenStack Examples From 46e40a1c5d64ee4855d1b8100d95f61a05d0a1ab Mon Sep 17 00:00:00 2001 From: HelloCoCooo <46306510+HelloCoCooo@users.noreply.github.com> Date: Thu, 31 Jan 2019 10:16:30 +0800 Subject: [PATCH 25/40] fix dependency conflict issue fix dependency conflict issue for org.codehaus.jackson:jackson-core-asl: jar --- openstack-client-connectors/resteasy-connector/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index dbf3fdea2..dbd7dfd11 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -17,7 +17,7 @@ org.codehaus.jackson jackson-jaxrs - 1.9.4 + 1.9.13 commons-httpclient @@ -25,4 +25,4 @@ 3.1 - \ No newline at end of file + From bcd60e62da2f9b1b2c8d42c0cd8fc058b7424569 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Thu, 2 May 2019 17:02:10 +0200 Subject: [PATCH 26/40] RESTEasyConnector: Support RESTEasy 3.6.3.Final Avoid extending the ResteasyProviderFactory and using hte related protected methods. --- .../connector/RESTEasyConnector.java | 37 +++++++------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java index ac8d3fd5d..41b1bafa4 100644 --- a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java +++ b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java @@ -4,8 +4,11 @@ import java.util.Map; import java.util.Map.Entry; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.ext.ContextResolver; +import javax.ws.rs.ext.Provider; import org.apache.commons.httpclient.HttpStatus; import org.codehaus.jackson.jaxrs.JacksonJsonProvider; @@ -31,32 +34,15 @@ public class RESTEasyConnector implements OpenStackClientConnector { public static ObjectMapper WRAPPED_MAPPER; - static class OpenStackProviderFactory extends ResteasyProviderFactory { - - private JacksonJsonProvider jsonProvider; - private InputStreamProvider streamProvider; - - public OpenStackProviderFactory() { - super(); - - addContextResolver(new ContextResolver() { - public ObjectMapper getContext(Class type) { - return type.getAnnotation(JsonRootName.class) == null ? DEFAULT_MAPPER : WRAPPED_MAPPER; - } - }); - - jsonProvider = new JacksonJsonProvider(); - addMessageBodyReader(jsonProvider); - addMessageBodyWriter(jsonProvider); - - streamProvider = new InputStreamProvider(); - addMessageBodyReader(streamProvider); - addMessageBodyWriter(streamProvider); + @Provider + @Produces(MediaType.APPLICATION_JSON) + static class ObjectMapperContextResolver implements ContextResolver { + public ObjectMapper getContext(Class type) { + return type.getAnnotation(JsonRootName.class) == null ? DEFAULT_MAPPER : WRAPPED_MAPPER; } - } - private static OpenStackProviderFactory providerFactory; + private static ResteasyProviderFactory providerFactory; static { DEFAULT_MAPPER = new ObjectMapper(); @@ -77,7 +63,10 @@ public ObjectMapper getContext(Class type) { WRAPPED_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES); WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT); - providerFactory = new OpenStackProviderFactory(); + providerFactory = new ResteasyProviderFactory(); + providerFactory.registerProviderInstance(new JacksonJsonProvider()); + providerFactory.registerProviderInstance(new ObjectMapperContextResolver()); + providerFactory.registerProviderInstance(new InputStreamProvider()); } protected ClientExecutor createClientExecutor() { From 89a969eeede2a6dde6672d96e2535642ede8614c Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Fri, 3 May 2019 13:15:19 +0200 Subject: [PATCH 27/40] [maven-release-plugin] prepare release openstack-java-sdk-3.2.6 --- ceilometer-client/pom.xml | 6 +++--- ceilometer-model/pom.xml | 2 +- cinder-client/pom.xml | 6 +++--- cinder-model/pom.xml | 2 +- glance-client/pom.xml | 6 +++--- glance-model/pom.xml | 2 +- heat-client/pom.xml | 6 +++--- heat-model/pom.xml | 2 +- keystone-client/pom.xml | 6 +++--- keystone-model/pom.xml | 2 +- nova-client/pom.xml | 6 +++--- nova-model/pom.xml | 2 +- openstack-client-connectors/jersey-connector/pom.xml | 2 +- openstack-client-connectors/jersey2-connector/pom.xml | 4 ++-- openstack-client-connectors/pom.xml | 4 ++-- openstack-client-connectors/resteasy-connector/pom.xml | 2 +- openstack-client/pom.xml | 2 +- openstack-console/pom.xml | 6 +++--- openstack-examples/pom.xml | 4 ++-- pom.xml | 2 +- quantum-client/pom.xml | 6 +++--- quantum-model/pom.xml | 2 +- swift-client/pom.xml | 6 +++--- swift-model/pom.xml | 2 +- 24 files changed, 45 insertions(+), 45 deletions(-) diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index 63a16992f..24c8c3353 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 ceilometer-client OpenStack Ceilometer Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.6-SNAPSHOT + 3.2.6 com.woorea ceilometer-model - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index 3c6c7ddc8..3e8f0719f 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 ceilometer-model OpenStack Ceilometer Model diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index 30aced054..e52925acc 100644 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 cinder-client OpenStack Cinder Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.6-SNAPSHOT + 3.2.6 com.woorea cinder-model - 3.2.6-SNAPSHOT + 3.2.6 \ No newline at end of file diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index 75ad7c4b7..b7f80bdcf 100644 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 cinder-model OpenStack Cinder Model diff --git a/glance-client/pom.xml b/glance-client/pom.xml index 2a35404e9..f2584ae39 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 glance-client OpenStack Glance Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.6-SNAPSHOT + 3.2.6 com.woorea glance-model - 3.2.6-SNAPSHOT + 3.2.6 \ No newline at end of file diff --git a/glance-model/pom.xml b/glance-model/pom.xml index 38fbb18f0..678b58ea2 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 glance-model OpenStack Glance Model diff --git a/heat-client/pom.xml b/heat-client/pom.xml index e0f6def87..cffe73e9f 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 heat-client OpenStack Heat Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.6-SNAPSHOT + 3.2.6 com.woorea heat-model - 3.2.6-SNAPSHOT + 3.2.6 \ No newline at end of file diff --git a/heat-model/pom.xml b/heat-model/pom.xml index 6a36a1dce..27d5bc6a4 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 heat-model OpenStack Heat Model diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index 9cd2b15cb..b0a922ab7 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 keystone-client OpenStack Keystone Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.6-SNAPSHOT + 3.2.6 com.woorea keystone-model - 3.2.6-SNAPSHOT + 3.2.6 \ No newline at end of file diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index 0a562f77d..06127a955 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 keystone-model OpenStack Keystone Model diff --git a/nova-client/pom.xml b/nova-client/pom.xml index 8dc894fb7..db100d08f 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 nova-client OpenStack Nova Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.6-SNAPSHOT + 3.2.6 com.woorea nova-model - 3.2.6-SNAPSHOT + 3.2.6 \ No newline at end of file diff --git a/nova-model/pom.xml b/nova-model/pom.xml index 813a7f228..ba7e50789 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 nova-model OpenStack Nova Model diff --git a/openstack-client-connectors/jersey-connector/pom.xml b/openstack-client-connectors/jersey-connector/pom.xml index 1ebbd381d..073f7f413 100644 --- a/openstack-client-connectors/jersey-connector/pom.xml +++ b/openstack-client-connectors/jersey-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.6-SNAPSHOT + 3.2.6 jersey-connector OpenStack Jersey Connector diff --git a/openstack-client-connectors/jersey2-connector/pom.xml b/openstack-client-connectors/jersey2-connector/pom.xml index f99daabe5..13072f5e4 100644 --- a/openstack-client-connectors/jersey2-connector/pom.xml +++ b/openstack-client-connectors/jersey2-connector/pom.xml @@ -4,7 +4,7 @@ com.woorea openstack-client-connectors - 3.2.6-SNAPSHOT + 3.2.6 jersey2-connector OpenStack Jersey2 Connector @@ -27,7 +27,7 @@ com.woorea openstack-client - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index 36ef44181..d4c6e70d5 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 openstack-client-connectors OpenStack Client Connectors @@ -42,7 +42,7 @@ com.woorea openstack-client - 3.2.6-SNAPSHOT + 3.2.6 \ No newline at end of file diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index dbd7dfd11..74044d457 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.6-SNAPSHOT + 3.2.6 resteasy-connector OpenStack RESTEasy Connector diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index e40d0ad0a..b5667d3c2 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 openstack-client OpenStack Client diff --git a/openstack-console/pom.xml b/openstack-console/pom.xml index 6c9e76e09..44ae0f5ee 100644 --- a/openstack-console/pom.xml +++ b/openstack-console/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 openstack-console OpenStack Console @@ -22,12 +22,12 @@ com.woorea keystone-client - 3.2.6-SNAPSHOT + 3.2.6 com.woorea nova-client - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index e0c19554e..36a0bedc0 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -3,11 +3,11 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 UTF-8 - 3.2.6-SNAPSHOT + 3.2.6 openstack-examples OpenStack Examples diff --git a/pom.xml b/pom.xml index e4f7f8678..420d01498 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 pom OpenStack Java SDK OpenStack Java SDK diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index 4d202cf45..41969ee98 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 quantum-client OpenStack Quantum Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.6-SNAPSHOT + 3.2.6 com.woorea quantum-model - 3.2.6-SNAPSHOT + 3.2.6 diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index 551cc2d4e..a25a1fd08 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 quantum-model OpenStack Quantum Model diff --git a/swift-client/pom.xml b/swift-client/pom.xml index 89085796e..dfb156fbd 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 swift-client OpenStack Swift Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.6-SNAPSHOT + 3.2.6 com.woorea swift-model - 3.2.6-SNAPSHOT + 3.2.6 \ No newline at end of file diff --git a/swift-model/pom.xml b/swift-model/pom.xml index 1acc4fcde..48446760e 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6-SNAPSHOT + 3.2.6 swift-model OpenStack Swift Model From be161d6128614f3d7439a41e3d3a8176f638c18f Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Fri, 3 May 2019 13:15:59 +0200 Subject: [PATCH 28/40] [maven-release-plugin] prepare for next development iteration --- ceilometer-client/pom.xml | 6 +++--- ceilometer-model/pom.xml | 2 +- cinder-client/pom.xml | 6 +++--- cinder-model/pom.xml | 2 +- glance-client/pom.xml | 6 +++--- glance-model/pom.xml | 2 +- heat-client/pom.xml | 6 +++--- heat-model/pom.xml | 2 +- keystone-client/pom.xml | 6 +++--- keystone-model/pom.xml | 2 +- nova-client/pom.xml | 6 +++--- nova-model/pom.xml | 2 +- openstack-client-connectors/jersey-connector/pom.xml | 2 +- openstack-client-connectors/jersey2-connector/pom.xml | 4 ++-- openstack-client-connectors/pom.xml | 4 ++-- openstack-client-connectors/resteasy-connector/pom.xml | 2 +- openstack-client/pom.xml | 2 +- openstack-console/pom.xml | 6 +++--- openstack-examples/pom.xml | 2 +- pom.xml | 2 +- quantum-client/pom.xml | 6 +++--- quantum-model/pom.xml | 2 +- swift-client/pom.xml | 6 +++--- swift-model/pom.xml | 2 +- 24 files changed, 44 insertions(+), 44 deletions(-) diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index 24c8c3353..880aebdee 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT ceilometer-client OpenStack Ceilometer Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.6 + 3.2.7-SNAPSHOT com.woorea ceilometer-model - 3.2.6 + 3.2.7-SNAPSHOT diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index 3e8f0719f..23a42a6cf 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT ceilometer-model OpenStack Ceilometer Model diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index e52925acc..2dbbbbc5f 100644 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT cinder-client OpenStack Cinder Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.6 + 3.2.7-SNAPSHOT com.woorea cinder-model - 3.2.6 + 3.2.7-SNAPSHOT \ No newline at end of file diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index b7f80bdcf..3ccf80ad0 100644 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT cinder-model OpenStack Cinder Model diff --git a/glance-client/pom.xml b/glance-client/pom.xml index f2584ae39..0a33d0ed4 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT glance-client OpenStack Glance Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.6 + 3.2.7-SNAPSHOT com.woorea glance-model - 3.2.6 + 3.2.7-SNAPSHOT \ No newline at end of file diff --git a/glance-model/pom.xml b/glance-model/pom.xml index 678b58ea2..aacf927a6 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT glance-model OpenStack Glance Model diff --git a/heat-client/pom.xml b/heat-client/pom.xml index cffe73e9f..05f94751c 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT heat-client OpenStack Heat Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.6 + 3.2.7-SNAPSHOT com.woorea heat-model - 3.2.6 + 3.2.7-SNAPSHOT \ No newline at end of file diff --git a/heat-model/pom.xml b/heat-model/pom.xml index 27d5bc6a4..53385d5f9 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT heat-model OpenStack Heat Model diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index b0a922ab7..4166f5491 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT keystone-client OpenStack Keystone Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.6 + 3.2.7-SNAPSHOT com.woorea keystone-model - 3.2.6 + 3.2.7-SNAPSHOT \ No newline at end of file diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index 06127a955..870b16a33 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT keystone-model OpenStack Keystone Model diff --git a/nova-client/pom.xml b/nova-client/pom.xml index db100d08f..4324da54b 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT nova-client OpenStack Nova Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.6 + 3.2.7-SNAPSHOT com.woorea nova-model - 3.2.6 + 3.2.7-SNAPSHOT \ No newline at end of file diff --git a/nova-model/pom.xml b/nova-model/pom.xml index ba7e50789..71eefd224 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT nova-model OpenStack Nova Model diff --git a/openstack-client-connectors/jersey-connector/pom.xml b/openstack-client-connectors/jersey-connector/pom.xml index 073f7f413..94fbe52d7 100644 --- a/openstack-client-connectors/jersey-connector/pom.xml +++ b/openstack-client-connectors/jersey-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.6 + 3.2.7-SNAPSHOT jersey-connector OpenStack Jersey Connector diff --git a/openstack-client-connectors/jersey2-connector/pom.xml b/openstack-client-connectors/jersey2-connector/pom.xml index 13072f5e4..938bb160b 100644 --- a/openstack-client-connectors/jersey2-connector/pom.xml +++ b/openstack-client-connectors/jersey2-connector/pom.xml @@ -4,7 +4,7 @@ com.woorea openstack-client-connectors - 3.2.6 + 3.2.7-SNAPSHOT jersey2-connector OpenStack Jersey2 Connector @@ -27,7 +27,7 @@ com.woorea openstack-client - 3.2.6 + 3.2.7-SNAPSHOT diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index d4c6e70d5..b70f92b9e 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT openstack-client-connectors OpenStack Client Connectors @@ -42,7 +42,7 @@ com.woorea openstack-client - 3.2.6 + 3.2.7-SNAPSHOT \ No newline at end of file diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index 74044d457..8855ea87a 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.6 + 3.2.7-SNAPSHOT resteasy-connector OpenStack RESTEasy Connector diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index b5667d3c2..00fda3102 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT openstack-client OpenStack Client diff --git a/openstack-console/pom.xml b/openstack-console/pom.xml index 44ae0f5ee..06497b003 100644 --- a/openstack-console/pom.xml +++ b/openstack-console/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT openstack-console OpenStack Console @@ -22,12 +22,12 @@ com.woorea keystone-client - 3.2.6 + 3.2.7-SNAPSHOT com.woorea nova-client - 3.2.6 + 3.2.7-SNAPSHOT diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index 36a0bedc0..16198a0b7 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT UTF-8 diff --git a/pom.xml b/pom.xml index 420d01498..0cf0929c8 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT pom OpenStack Java SDK OpenStack Java SDK diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index 41969ee98..871d26257 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT quantum-client OpenStack Quantum Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.6 + 3.2.7-SNAPSHOT com.woorea quantum-model - 3.2.6 + 3.2.7-SNAPSHOT diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index a25a1fd08..1d93ebc34 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT quantum-model OpenStack Quantum Model diff --git a/swift-client/pom.xml b/swift-client/pom.xml index dfb156fbd..2d6326a53 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT swift-client OpenStack Swift Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.6 + 3.2.7-SNAPSHOT com.woorea swift-model - 3.2.6 + 3.2.7-SNAPSHOT \ No newline at end of file diff --git a/swift-model/pom.xml b/swift-model/pom.xml index 48446760e..3384ca430 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.6 + 3.2.7-SNAPSHOT swift-model OpenStack Swift Model From 8aca0cb670cada8c6197a65826e02f3b75b1af81 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Fri, 3 May 2019 17:09:28 +0200 Subject: [PATCH 29/40] Remove maven-gpg-plugin --- pom.xml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/pom.xml b/pom.xml index 0cf0929c8..eb915629b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,10 +7,6 @@ OpenStack Java SDK OpenStack Java SDK - - false - - org.sonatype.oss oss-parent @@ -104,23 +100,6 @@ UTF-8 - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - ${skip.sign} - - - - sign-artifacts - verify - - sign - - - - org.apache.maven.plugins maven-eclipse-plugin From 1e4d8d2f390ee946f5fc4571f4765a20306e1bce Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Fri, 3 May 2019 17:12:47 +0200 Subject: [PATCH 30/40] Update NEWS --- NEWS.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS.md b/NEWS.md index 72c0742d1..9eced7fc2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +# 3.2.7 / 2019-05-03 +* Remove maven-gpg-plugin + +# 3.2.6 / 2019-05-03 +* RESTEasyConnector: Support RESTEasy 3.6.3.Final + # 3.2.5 / 2018-11-14 * neutron: Add support for `port_security_enabled` on Networks From c9bffcddb6184e339a136c56d3bc6a9a32d7f76f Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Fri, 3 May 2019 17:26:30 +0200 Subject: [PATCH 31/40] [maven-release-plugin] prepare release openstack-java-sdk-3.2.7 --- ceilometer-client/pom.xml | 6 +++--- ceilometer-model/pom.xml | 2 +- cinder-client/pom.xml | 6 +++--- cinder-model/pom.xml | 2 +- glance-client/pom.xml | 6 +++--- glance-model/pom.xml | 2 +- heat-client/pom.xml | 6 +++--- heat-model/pom.xml | 2 +- keystone-client/pom.xml | 6 +++--- keystone-model/pom.xml | 2 +- nova-client/pom.xml | 6 +++--- nova-model/pom.xml | 2 +- openstack-client-connectors/jersey-connector/pom.xml | 2 +- openstack-client-connectors/jersey2-connector/pom.xml | 4 ++-- openstack-client-connectors/pom.xml | 4 ++-- openstack-client-connectors/resteasy-connector/pom.xml | 2 +- openstack-client/pom.xml | 2 +- openstack-console/pom.xml | 6 +++--- openstack-examples/pom.xml | 4 ++-- pom.xml | 2 +- quantum-client/pom.xml | 6 +++--- quantum-model/pom.xml | 2 +- swift-client/pom.xml | 6 +++--- swift-model/pom.xml | 2 +- 24 files changed, 45 insertions(+), 45 deletions(-) diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index 880aebdee..cf890738b 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 ceilometer-client OpenStack Ceilometer Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.7-SNAPSHOT + 3.2.7 com.woorea ceilometer-model - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index 23a42a6cf..10d0c4df8 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 ceilometer-model OpenStack Ceilometer Model diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index 2dbbbbc5f..c6f075bc7 100644 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 cinder-client OpenStack Cinder Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.7-SNAPSHOT + 3.2.7 com.woorea cinder-model - 3.2.7-SNAPSHOT + 3.2.7 \ No newline at end of file diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index 3ccf80ad0..143e701b9 100644 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 cinder-model OpenStack Cinder Model diff --git a/glance-client/pom.xml b/glance-client/pom.xml index 0a33d0ed4..a8c5f2e08 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 glance-client OpenStack Glance Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.7-SNAPSHOT + 3.2.7 com.woorea glance-model - 3.2.7-SNAPSHOT + 3.2.7 \ No newline at end of file diff --git a/glance-model/pom.xml b/glance-model/pom.xml index aacf927a6..0faa482ae 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 glance-model OpenStack Glance Model diff --git a/heat-client/pom.xml b/heat-client/pom.xml index 05f94751c..693be992a 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 heat-client OpenStack Heat Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.7-SNAPSHOT + 3.2.7 com.woorea heat-model - 3.2.7-SNAPSHOT + 3.2.7 \ No newline at end of file diff --git a/heat-model/pom.xml b/heat-model/pom.xml index 53385d5f9..8c30b6d21 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 heat-model OpenStack Heat Model diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index 4166f5491..d66af32bb 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 keystone-client OpenStack Keystone Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.7-SNAPSHOT + 3.2.7 com.woorea keystone-model - 3.2.7-SNAPSHOT + 3.2.7 \ No newline at end of file diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index 870b16a33..afd86ca57 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 keystone-model OpenStack Keystone Model diff --git a/nova-client/pom.xml b/nova-client/pom.xml index 4324da54b..1aa5d1a77 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 nova-client OpenStack Nova Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.7-SNAPSHOT + 3.2.7 com.woorea nova-model - 3.2.7-SNAPSHOT + 3.2.7 \ No newline at end of file diff --git a/nova-model/pom.xml b/nova-model/pom.xml index 71eefd224..3b61e01c2 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 nova-model OpenStack Nova Model diff --git a/openstack-client-connectors/jersey-connector/pom.xml b/openstack-client-connectors/jersey-connector/pom.xml index 94fbe52d7..6face1bc5 100644 --- a/openstack-client-connectors/jersey-connector/pom.xml +++ b/openstack-client-connectors/jersey-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.7-SNAPSHOT + 3.2.7 jersey-connector OpenStack Jersey Connector diff --git a/openstack-client-connectors/jersey2-connector/pom.xml b/openstack-client-connectors/jersey2-connector/pom.xml index 938bb160b..e5c2a248d 100644 --- a/openstack-client-connectors/jersey2-connector/pom.xml +++ b/openstack-client-connectors/jersey2-connector/pom.xml @@ -4,7 +4,7 @@ com.woorea openstack-client-connectors - 3.2.7-SNAPSHOT + 3.2.7 jersey2-connector OpenStack Jersey2 Connector @@ -27,7 +27,7 @@ com.woorea openstack-client - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index b70f92b9e..3d1a698b0 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 openstack-client-connectors OpenStack Client Connectors @@ -42,7 +42,7 @@ com.woorea openstack-client - 3.2.7-SNAPSHOT + 3.2.7 \ No newline at end of file diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index 8855ea87a..dc309907c 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.7-SNAPSHOT + 3.2.7 resteasy-connector OpenStack RESTEasy Connector diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index 00fda3102..6d631c89b 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 openstack-client OpenStack Client diff --git a/openstack-console/pom.xml b/openstack-console/pom.xml index 06497b003..509438d4f 100644 --- a/openstack-console/pom.xml +++ b/openstack-console/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 openstack-console OpenStack Console @@ -22,12 +22,12 @@ com.woorea keystone-client - 3.2.7-SNAPSHOT + 3.2.7 com.woorea nova-client - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index 16198a0b7..84fd55c53 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -3,11 +3,11 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 UTF-8 - 3.2.6 + 3.2.7 openstack-examples OpenStack Examples diff --git a/pom.xml b/pom.xml index eb915629b..659684be1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 pom OpenStack Java SDK OpenStack Java SDK diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index 871d26257..24100d99f 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 quantum-client OpenStack Quantum Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.7-SNAPSHOT + 3.2.7 com.woorea quantum-model - 3.2.7-SNAPSHOT + 3.2.7 diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index 1d93ebc34..26adfd6c3 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 quantum-model OpenStack Quantum Model diff --git a/swift-client/pom.xml b/swift-client/pom.xml index 2d6326a53..24937c50b 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 swift-client OpenStack Swift Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.7-SNAPSHOT + 3.2.7 com.woorea swift-model - 3.2.7-SNAPSHOT + 3.2.7 \ No newline at end of file diff --git a/swift-model/pom.xml b/swift-model/pom.xml index 3384ca430..62a2e840e 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7-SNAPSHOT + 3.2.7 swift-model OpenStack Swift Model From f051e742337e8a6796e92f6f05913f3510e448c5 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Fri, 3 May 2019 17:29:20 +0200 Subject: [PATCH 32/40] [maven-release-plugin] prepare for next development iteration --- ceilometer-client/pom.xml | 6 +++--- ceilometer-model/pom.xml | 2 +- cinder-client/pom.xml | 6 +++--- cinder-model/pom.xml | 2 +- glance-client/pom.xml | 6 +++--- glance-model/pom.xml | 2 +- heat-client/pom.xml | 6 +++--- heat-model/pom.xml | 2 +- keystone-client/pom.xml | 6 +++--- keystone-model/pom.xml | 2 +- nova-client/pom.xml | 6 +++--- nova-model/pom.xml | 2 +- openstack-client-connectors/jersey-connector/pom.xml | 2 +- openstack-client-connectors/jersey2-connector/pom.xml | 4 ++-- openstack-client-connectors/pom.xml | 4 ++-- openstack-client-connectors/resteasy-connector/pom.xml | 2 +- openstack-client/pom.xml | 2 +- openstack-console/pom.xml | 6 +++--- openstack-examples/pom.xml | 4 ++-- pom.xml | 2 +- quantum-client/pom.xml | 6 +++--- quantum-model/pom.xml | 2 +- swift-client/pom.xml | 6 +++--- swift-model/pom.xml | 2 +- 24 files changed, 45 insertions(+), 45 deletions(-) diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index cf890738b..7827feaaa 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT ceilometer-client OpenStack Ceilometer Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.7 + 3.2.8-SNAPSHOT com.woorea ceilometer-model - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index 10d0c4df8..cca729a10 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT ceilometer-model OpenStack Ceilometer Model diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index c6f075bc7..67852c8ac 100644 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT cinder-client OpenStack Cinder Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.7 + 3.2.8-SNAPSHOT com.woorea cinder-model - 3.2.7 + 3.2.8-SNAPSHOT \ No newline at end of file diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index 143e701b9..bc1ecde54 100644 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT cinder-model OpenStack Cinder Model diff --git a/glance-client/pom.xml b/glance-client/pom.xml index a8c5f2e08..fdcccfa19 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT glance-client OpenStack Glance Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.7 + 3.2.8-SNAPSHOT com.woorea glance-model - 3.2.7 + 3.2.8-SNAPSHOT \ No newline at end of file diff --git a/glance-model/pom.xml b/glance-model/pom.xml index 0faa482ae..307bf335a 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT glance-model OpenStack Glance Model diff --git a/heat-client/pom.xml b/heat-client/pom.xml index 693be992a..fe2df7444 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT heat-client OpenStack Heat Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.7 + 3.2.8-SNAPSHOT com.woorea heat-model - 3.2.7 + 3.2.8-SNAPSHOT \ No newline at end of file diff --git a/heat-model/pom.xml b/heat-model/pom.xml index 8c30b6d21..febbdec5d 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT heat-model OpenStack Heat Model diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index d66af32bb..7e4c6e1c4 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT keystone-client OpenStack Keystone Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.7 + 3.2.8-SNAPSHOT com.woorea keystone-model - 3.2.7 + 3.2.8-SNAPSHOT \ No newline at end of file diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index afd86ca57..1a690bd9c 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT keystone-model OpenStack Keystone Model diff --git a/nova-client/pom.xml b/nova-client/pom.xml index 1aa5d1a77..91421416c 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT nova-client OpenStack Nova Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.7 + 3.2.8-SNAPSHOT com.woorea nova-model - 3.2.7 + 3.2.8-SNAPSHOT \ No newline at end of file diff --git a/nova-model/pom.xml b/nova-model/pom.xml index 3b61e01c2..20445f54a 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT nova-model OpenStack Nova Model diff --git a/openstack-client-connectors/jersey-connector/pom.xml b/openstack-client-connectors/jersey-connector/pom.xml index 6face1bc5..36677c4b9 100644 --- a/openstack-client-connectors/jersey-connector/pom.xml +++ b/openstack-client-connectors/jersey-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.7 + 3.2.8-SNAPSHOT jersey-connector OpenStack Jersey Connector diff --git a/openstack-client-connectors/jersey2-connector/pom.xml b/openstack-client-connectors/jersey2-connector/pom.xml index e5c2a248d..9bceae888 100644 --- a/openstack-client-connectors/jersey2-connector/pom.xml +++ b/openstack-client-connectors/jersey2-connector/pom.xml @@ -4,7 +4,7 @@ com.woorea openstack-client-connectors - 3.2.7 + 3.2.8-SNAPSHOT jersey2-connector OpenStack Jersey2 Connector @@ -27,7 +27,7 @@ com.woorea openstack-client - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index 3d1a698b0..2878a9059 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT openstack-client-connectors OpenStack Client Connectors @@ -42,7 +42,7 @@ com.woorea openstack-client - 3.2.7 + 3.2.8-SNAPSHOT \ No newline at end of file diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index dc309907c..5a6de809f 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.7 + 3.2.8-SNAPSHOT resteasy-connector OpenStack RESTEasy Connector diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index 6d631c89b..760d34902 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT openstack-client OpenStack Client diff --git a/openstack-console/pom.xml b/openstack-console/pom.xml index 509438d4f..741f625dc 100644 --- a/openstack-console/pom.xml +++ b/openstack-console/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT openstack-console OpenStack Console @@ -22,12 +22,12 @@ com.woorea keystone-client - 3.2.7 + 3.2.8-SNAPSHOT com.woorea nova-client - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index 84fd55c53..4f23e9165 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -3,11 +3,11 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT UTF-8 - 3.2.7 + 3.2.8-SNAPSHOT openstack-examples OpenStack Examples diff --git a/pom.xml b/pom.xml index 659684be1..d6134bc4c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT pom OpenStack Java SDK OpenStack Java SDK diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index 24100d99f..295ddbe20 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT quantum-client OpenStack Quantum Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.7 + 3.2.8-SNAPSHOT com.woorea quantum-model - 3.2.7 + 3.2.8-SNAPSHOT diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index 26adfd6c3..b3d7d6d03 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT quantum-model OpenStack Quantum Model diff --git a/swift-client/pom.xml b/swift-client/pom.xml index 24937c50b..65e1da30c 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT swift-client OpenStack Swift Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.7 + 3.2.8-SNAPSHOT com.woorea swift-model - 3.2.7 + 3.2.8-SNAPSHOT \ No newline at end of file diff --git a/swift-model/pom.xml b/swift-model/pom.xml index 62a2e840e..de6c1e6e9 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.7 + 3.2.8-SNAPSHOT swift-model OpenStack Swift Model From 9879d1a4ba2f8261d0075cadd8d3f4caa468da3b Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Fri, 31 Jan 2020 16:59:22 +0100 Subject: [PATCH 33/40] Add explicit dependency to jaxb-api The explicit dependency to jaxb-api is required for Java11 compatibility. --- nova-model/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nova-model/pom.xml b/nova-model/pom.xml index 20445f54a..e3c594888 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -5,6 +5,13 @@ openstack-java-sdk 3.2.8-SNAPSHOT + + + javax.xml.bind + jaxb-api + 2.2.12 + + nova-model OpenStack Nova Model OpenStack Nova Model From 237db5ca16c1dc0e60dfa56b87d169fcec5288f6 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Wed, 29 Jan 2020 17:47:23 +0100 Subject: [PATCH 34/40] jackson upgraded to com.fasterxml version 2.9.x --- NEWS.md | 3 ++ .../openstack/ceilometer/v2/model/Meter.java | 2 +- .../ceilometer/v2/model/Resource.java | 2 +- .../openstack/ceilometer/v2/model/Sample.java | 2 +- .../ceilometer/v2/model/Statistics.java | 2 +- .../cinder/model/BaseConnection.java | 2 +- .../openstack/cinder/model/Capabilities.java | 4 +-- .../cinder/model/ConnectionForInitialize.java | 2 +- .../cinder/model/ConnectionForTerminate.java | 2 +- .../cinder/model/ConnectionInfo.java | 4 +-- .../woorea/openstack/cinder/model/Limits.java | 4 +-- .../woorea/openstack/cinder/model/Pool.java | 4 +-- .../woorea/openstack/cinder/model/Pools.java | 2 +- .../openstack/cinder/model/Snapshot.java | 4 +-- .../cinder/model/SnapshotForCreate.java | 4 +-- .../cinder/model/SnapshotForUpdate.java | 2 +- .../openstack/cinder/model/Snapshots.java | 2 +- .../woorea/openstack/cinder/model/Volume.java | 4 +-- .../cinder/model/VolumeForCreate.java | 4 +-- .../cinder/model/VolumeForExtend.java | 4 +-- .../cinder/model/VolumeForImageCreate.java | 4 +-- .../cinder/model/VolumeForUpdate.java | 2 +- .../openstack/cinder/model/VolumeType.java | 4 +-- .../cinder/model/VolumeTypeForCreate.java | 4 +-- .../openstack/cinder/model/VolumeTypes.java | 2 +- .../openstack/cinder/model/Volumes.java | 2 +- .../openstack/glance/ImagesResource.java | 2 +- .../woorea/openstack/glance/model/Image.java | 6 ++-- .../openstack/glance/model/ImageMember.java | 2 +- .../openstack/glance/model/ImageMembers.java | 2 +- .../woorea/openstack/glance/model/Images.java | 2 +- .../openstack/glance/model/SharedImages.java | 2 +- .../heat/model/CreateStackParam.java | 2 +- .../openstack/heat/model/Explanation.java | 4 +-- .../com/woorea/openstack/heat/model/Link.java | 2 +- .../woorea/openstack/heat/model/Resource.java | 2 +- .../openstack/heat/model/Resources.java | 2 +- .../woorea/openstack/heat/model/Stack.java | 6 ++-- .../woorea/openstack/heat/model/Stacks.java | 2 +- .../openstack/keystone/model/Access.java | 6 ++-- .../keystone/model/Authentication.java | 2 +- .../openstack/keystone/model/Endpoint.java | 4 +-- .../openstack/keystone/model/Endpoints.java | 2 +- .../openstack/keystone/model/Error.java | 2 +- .../woorea/openstack/keystone/model/Role.java | 2 +- .../openstack/keystone/model/Roles.java | 2 +- .../openstack/keystone/model/Service.java | 2 +- .../openstack/keystone/model/Services.java | 2 +- .../openstack/keystone/model/Tenant.java | 4 +-- .../openstack/keystone/model/Tenants.java | 2 +- .../openstack/keystone/model/Token.java | 2 +- .../woorea/openstack/keystone/model/User.java | 4 +-- .../openstack/keystone/model/Users.java | 2 +- .../model/authentication/AccessKey.java | 2 +- .../authentication/TokenAuthentication.java | 2 +- .../authentication/UsernamePassword.java | 2 +- .../keystone/v3/model/Authentication.java | 2 +- .../keystone/v3/model/Credential.java | 2 +- .../keystone/v3/model/Credentials.java | 2 +- .../openstack/keystone/v3/model/Domain.java | 2 +- .../openstack/keystone/v3/model/Domains.java | 2 +- .../openstack/keystone/v3/model/Endpoint.java | 4 +-- .../keystone/v3/model/Endpoints.java | 2 +- .../openstack/keystone/v3/model/Group.java | 4 +-- .../openstack/keystone/v3/model/Groups.java | 2 +- .../openstack/keystone/v3/model/Policies.java | 2 +- .../openstack/keystone/v3/model/Policy.java | 2 +- .../openstack/keystone/v3/model/Project.java | 4 +-- .../openstack/keystone/v3/model/Projects.java | 2 +- .../openstack/keystone/v3/model/Role.java | 2 +- .../openstack/keystone/v3/model/Roles.java | 2 +- .../openstack/keystone/v3/model/Service.java | 2 +- .../openstack/keystone/v3/model/Services.java | 2 +- .../openstack/keystone/v3/model/Token.java | 6 ++-- .../openstack/keystone/v3/model/User.java | 4 +-- .../openstack/keystone/v3/model/Users.java | 2 +- .../openstack/nova/model/Certificate.java | 4 +-- .../openstack/nova/model/Cloudpipe.java | 2 +- .../openstack/nova/model/Cloudpipes.java | 2 +- .../openstack/nova/model/Extension.java | 2 +- .../openstack/nova/model/Extensions.java | 2 +- .../woorea/openstack/nova/model/Flavor.java | 4 +-- .../openstack/nova/model/FlavorForCreate.java | 4 +-- .../woorea/openstack/nova/model/Flavors.java | 2 +- .../openstack/nova/model/FloatingIp.java | 4 +-- .../nova/model/FloatingIpDomain.java | 4 +-- .../nova/model/FloatingIpDomains.java | 2 +- .../openstack/nova/model/FloatingIpPools.java | 2 +- .../openstack/nova/model/FloatingIps.java | 2 +- .../com/woorea/openstack/nova/model/Host.java | 2 +- .../openstack/nova/model/HostAggregate.java | 4 +-- .../openstack/nova/model/HostAggregates.java | 2 +- .../woorea/openstack/nova/model/Hosts.java | 2 +- .../openstack/nova/model/Hypervisor.java | 4 +-- .../openstack/nova/model/Hypervisors.java | 2 +- .../woorea/openstack/nova/model/Image.java | 4 +-- .../openstack/nova/model/ImageFromVolume.java | 4 +-- .../woorea/openstack/nova/model/Images.java | 2 +- .../woorea/openstack/nova/model/KeyPair.java | 4 +-- .../woorea/openstack/nova/model/KeyPairs.java | 2 +- .../woorea/openstack/nova/model/Limits.java | 4 +-- .../woorea/openstack/nova/model/Network.java | 4 +-- .../nova/model/NetworkForCreate.java | 4 +-- .../woorea/openstack/nova/model/Networks.java | 2 +- .../woorea/openstack/nova/model/QuotaSet.java | 4 +-- .../openstack/nova/model/SecurityGroup.java | 4 +-- .../nova/model/SecurityGroupForCreate.java | 2 +- .../model/SecurityGroupRuleForCreate.java | 4 +-- .../openstack/nova/model/SecurityGroups.java | 2 +- .../woorea/openstack/nova/model/Server.java | 8 ++--- .../openstack/nova/model/ServerAction.java | 4 +-- .../openstack/nova/model/ServerForCreate.java | 4 +-- .../woorea/openstack/nova/model/Servers.java | 2 +- .../woorea/openstack/nova/model/Service.java | 4 +-- .../woorea/openstack/nova/model/Services.java | 2 +- .../nova/model/SimpleTenantUsage.java | 4 +-- .../nova/model/SimpleTenantUsages.java | 2 +- .../woorea/openstack/nova/model/Snapshot.java | 4 +-- .../nova/model/SnapshotForCreate.java | 4 +-- .../openstack/nova/model/Snapshots.java | 2 +- .../woorea/openstack/nova/model/Volume.java | 4 +-- .../nova/model/VolumeAttachment.java | 2 +- .../nova/model/VolumeAttachments.java | 2 +- .../openstack/nova/model/VolumeForCreate.java | 4 +-- .../nova/model/VolumeForImageCreate.java | 4 +-- .../openstack/nova/model/VolumeType.java | 2 +- .../openstack/nova/model/VolumeTypes.java | 2 +- .../woorea/openstack/nova/model/Volumes.java | 2 +- .../jersey-connector/pom.xml | 6 ++-- .../openstack/connector/JerseyConnector.java | 36 +++++++++---------- .../woorea/openstack/connector/OpenStack.java | 35 +++++++++--------- .../resteasy-connector/pom.xml | 6 ++-- .../connector/RESTEasyConnector.java | 36 +++++++++---------- pom.xml | 6 ++-- .../quantum/api/query/AbsOpenStackCmd.java | 2 +- .../openstack/quantum/model/GatewayInfo.java | 2 +- .../openstack/quantum/model/Network.java | 8 ++--- .../quantum/model/NetworkForCreate.java | 2 +- .../openstack/quantum/model/Networks.java | 2 +- .../woorea/openstack/quantum/model/Port.java | 11 +++--- .../quantum/model/PortForCreate.java | 2 +- .../woorea/openstack/quantum/model/Ports.java | 2 +- .../openstack/quantum/model/Router.java | 4 +-- .../quantum/model/RouterForAddInterface.java | 2 +- .../quantum/model/RouterForCreate.java | 4 +-- .../quantum/model/RouterInterface.java | 4 +-- .../openstack/quantum/model/Routers.java | 2 +- .../openstack/quantum/model/Subnet.java | 13 +++---- .../quantum/model/SubnetForCreate.java | 4 +-- .../openstack/quantum/model/Subnets.java | 2 +- .../openstack/quantum/model/NetworkTest.java | 2 +- .../openstack/quantum/model/PortTest.java | 19 +++++----- .../openstack/quantum/model/SubnetTest.java | 2 +- .../openstack/swift/model/Container.java | 2 +- .../woorea/openstack/swift/model/Object.java | 3 +- 155 files changed, 297 insertions(+), 291 deletions(-) diff --git a/NEWS.md b/NEWS.md index 9eced7fc2..d73bd803b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +# 3.2.8 / 2020-01-29 +* jackson upgraded to com.fasterxml version 2.9.x + # 3.2.7 / 2019-05-03 * Remove maven-gpg-plugin diff --git a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Meter.java b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Meter.java index df9182f9c..53f192b54 100644 --- a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Meter.java +++ b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Meter.java @@ -1,6 +1,6 @@ package com.woorea.openstack.ceilometer.v2.model; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Meter { diff --git a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Resource.java b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Resource.java index 24e14aa3d..7ca1fb089 100644 --- a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Resource.java +++ b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Resource.java @@ -2,7 +2,7 @@ import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Resource { //{"resource_id": "23b55841eedd41e99d5f3f32149ca086", "timestamp": "2013-03-03T15:19:00", "project_id": "23b55841eedd41e99d5f3f32149ca086", "user_id": null, "metadata": {}} diff --git a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Sample.java b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Sample.java index 8827de466..c17d34159 100644 --- a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Sample.java +++ b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Sample.java @@ -2,7 +2,7 @@ import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Sample { diff --git a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Statistics.java b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Statistics.java index 5a34fe54b..f8236aa21 100644 --- a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Statistics.java +++ b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Statistics.java @@ -2,7 +2,7 @@ import java.math.BigDecimal; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Statistics { diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/BaseConnection.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/BaseConnection.java index cca3514f2..e2fc8c2ed 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/BaseConnection.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/BaseConnection.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public abstract class BaseConnection implements Serializable { @JsonProperty("connector") diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Capabilities.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Capabilities.java index 1f16002a2..c8cd98b6b 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Capabilities.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Capabilities.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; /** * Model for Volume diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForInitialize.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForInitialize.java index 76ff7b784..47218054c 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForInitialize.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForInitialize.java @@ -1,6 +1,6 @@ package com.woorea.openstack.cinder.model; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; import java.io.Serializable; diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForTerminate.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForTerminate.java index 0777ab472..7fee326b4 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForTerminate.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForTerminate.java @@ -1,6 +1,6 @@ package com.woorea.openstack.cinder.model; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; import java.io.Serializable; diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionInfo.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionInfo.java index 039fc8088..362aaca02 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionInfo.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionInfo.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("connection_info") public class ConnectionInfo implements Serializable { diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Limits.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Limits.java index 356b6bde7..d6ef7762d 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Limits.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Limits.java @@ -1,7 +1,7 @@ package com.woorea.openstack.cinder.model; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; import java.io.Serializable; import java.util.Calendar; diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Pool.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Pool.java index 4ba069fac..1e8da7166 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Pool.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Pool.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; /** * Model for Pool diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Pools.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Pools.java index c7d0ec7e6..3816362f7 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Pools.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Pools.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Model for List of pools diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Snapshot.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Snapshot.java index 3f45febc8..60b7ef13f 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Snapshot.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Snapshot.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("snapshot") public class Snapshot implements Serializable { diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/SnapshotForCreate.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/SnapshotForCreate.java index 738b550c9..3634fcb0a 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/SnapshotForCreate.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/SnapshotForCreate.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("snapshot") public class SnapshotForCreate implements Serializable { diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/SnapshotForUpdate.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/SnapshotForUpdate.java index 4dbe13366..525ef3c31 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/SnapshotForUpdate.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/SnapshotForUpdate.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("snapshot") public class SnapshotForUpdate implements Serializable { diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Snapshots.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Snapshots.java index 6ee9ddd39..176b1c459 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Snapshots.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Snapshots.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Snapshots implements Iterable, Serializable { diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Volume.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Volume.java index ddd2c3f1d..a5fda3f20 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Volume.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Volume.java @@ -1,7 +1,7 @@ package com.woorea.openstack.cinder.model; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; import java.io.Serializable; import java.util.List; diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForCreate.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForCreate.java index ea0b92ba0..44e6eced8 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForCreate.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForCreate.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("volume") public class VolumeForCreate implements Serializable { diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForExtend.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForExtend.java index 7c4c3d3c6..5a73dc870 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForExtend.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForExtend.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("os-extend") public class VolumeForExtend implements Serializable { diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForImageCreate.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForImageCreate.java index eb6d913a6..4e67566f6 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForImageCreate.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForImageCreate.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("os-volume_upload_image") public class VolumeForImageCreate implements Serializable { diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForUpdate.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForUpdate.java index 3d2c079f9..6ea3306ca 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForUpdate.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForUpdate.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("volume") public class VolumeForUpdate implements Serializable { diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeType.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeType.java index 21a5556cf..702fc41b2 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeType.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeType.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("volume_type") public class VolumeType implements Serializable { diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeTypeForCreate.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeTypeForCreate.java index 9c7d8483f..aaa6992e4 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeTypeForCreate.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeTypeForCreate.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("volume_type") public class VolumeTypeForCreate implements Serializable { diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeTypes.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeTypes.java index 7a6826e11..f341cafdd 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeTypes.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeTypes.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class VolumeTypes implements Iterable, Serializable { diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Volumes.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Volumes.java index 4f8781e0a..6de026556 100644 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Volumes.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Volumes.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Volumes implements Iterable, Serializable { diff --git a/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java b/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java index ae46548db..aa56b7a0b 100644 --- a/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java +++ b/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import com.woorea.openstack.base.client.Entity; import com.woorea.openstack.base.client.HttpMethod; diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java index 5d1167a28..3ad874629 100644 --- a/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java +++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java @@ -5,9 +5,9 @@ import java.util.HashMap; import java.util.Map; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("image") @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java index 4b8c3e753..0977fa34e 100644 --- a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java +++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class ImageMember implements Serializable { diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java index 68aa17612..fc5193253 100644 --- a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java +++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class ImageMembers implements Iterable, Serializable { diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java index af612ba1d..348ac29c1 100644 --- a/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java +++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Images implements Iterable, Serializable { diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java index 111d0942b..78ca09764 100644 --- a/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java +++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class SharedImages implements Iterable, Serializable { diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java index ebdddfa09..f602719d6 100644 --- a/heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java +++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java @@ -1,6 +1,6 @@ package com.woorea.openstack.heat.model; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Explanation.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Explanation.java index 7e255643a..b14577418 100644 --- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Explanation.java +++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Explanation.java @@ -1,7 +1,7 @@ package com.woorea.openstack.heat.model; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("error") public class Explanation { diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Link.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Link.java index ec1970fd6..1f9d5826e 100644 --- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Link.java +++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Link.java @@ -1,6 +1,6 @@ package com.woorea.openstack.heat.model; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Link { @JsonProperty("href") diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Resource.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Resource.java index 159bbcda2..58c1a1ae4 100644 --- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Resource.java +++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Resource.java @@ -1,6 +1,6 @@ package com.woorea.openstack.heat.model; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Date; import java.util.List; diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Resources.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Resources.java index 068c5e08c..a8d9023f8 100644 --- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Resources.java +++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Resources.java @@ -1,6 +1,6 @@ package com.woorea.openstack.heat.model; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; import java.util.Iterator; diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java index 9ed8f245c..b27bbc1ab 100644 --- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java +++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Stack.java @@ -1,8 +1,8 @@ package com.woorea.openstack.heat.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; import java.util.Date; import java.util.List; diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/Stacks.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/Stacks.java index 6f174aa1b..5731f5b7a 100644 --- a/heat-model/src/main/java/com/woorea/openstack/heat/model/Stacks.java +++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/Stacks.java @@ -1,6 +1,6 @@ package com.woorea.openstack.heat.model; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; import java.util.Iterator; diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Access.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Access.java index a7968ff44..f4f37d80a 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Access.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Access.java @@ -4,9 +4,9 @@ import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("access") public class Access implements Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Authentication.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Authentication.java index f5c8f5c9d..b795b3d05 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Authentication.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Authentication.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; public abstract class Authentication implements Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoint.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoint.java index f179e2542..77f195d7d 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoint.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoint.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("endpoint") public class Endpoint implements Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoints.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoints.java index d7a58983c..395ce3671 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoints.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoints.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Endpoints implements Iterable, Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Error.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Error.java index 5549f4c83..b8997c565 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Error.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Error.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("error") public class Error implements Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Role.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Role.java index 993b0d9e2..cddd06ee7 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Role.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Role.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("role") public class Role implements Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Roles.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Roles.java index 22e18ed95..669612b57 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Roles.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Roles.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Roles implements Iterable, Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Service.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Service.java index ed9eb53ec..b4c85a8f5 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Service.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Service.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("OS-KSADM:service") public class Service implements Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Services.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Services.java index 5c7958cf1..8596ad34f 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Services.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Services.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Services implements Iterable, Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenant.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenant.java index a20b71b7e..1498082da 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenant.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenant.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("tenant") @JsonIgnoreProperties(ignoreUnknown=true) diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenants.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenants.java index 51e370c02..3af7c3486 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenants.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenants.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Tenants implements Iterable, Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Token.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Token.java index 0f0b6ccb2..934387bcd 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Token.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Token.java @@ -1,6 +1,6 @@ package com.woorea.openstack.keystone.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.Calendar; diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java index a308d609e..cce8cfb27 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("user") public class User implements Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Users.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Users.java index c88aabcf9..772b0050a 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Users.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Users.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Users implements Iterable, Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java index 4767450a5..40e99822b 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/AccessKey.java @@ -1,6 +1,6 @@ package com.woorea.openstack.keystone.model.authentication; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; import com.woorea.openstack.keystone.model.Authentication; diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java index 68cfcd2c5..99ea64efb 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/TokenAuthentication.java @@ -1,6 +1,6 @@ package com.woorea.openstack.keystone.model.authentication; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; import com.woorea.openstack.keystone.model.Authentication; diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java index ee94692bd..69f7c6573 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/UsernamePassword.java @@ -1,6 +1,6 @@ package com.woorea.openstack.keystone.model.authentication; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; import com.woorea.openstack.keystone.model.Authentication; diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java index 7caffb0b7..df5236383 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("auth") public class Authentication implements Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java index ef40a2a51..a0c14ce67 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("credential") public class Credential { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credentials.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credentials.java index 36eeda6ea..39ba56771 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credentials.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credentials.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Credentials implements Iterable, Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domain.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domain.java index 9df4fe2d7..875c4b63c 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domain.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domain.java @@ -1,6 +1,6 @@ package com.woorea.openstack.keystone.v3.model; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("domain") public class Domain { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domains.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domains.java index e42a6c495..ee03fbc47 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domains.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domains.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Domains implements Iterable, Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoint.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoint.java index 213e6905b..08456bc1f 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoint.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoint.java @@ -1,7 +1,7 @@ package com.woorea.openstack.keystone.v3.model; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("endpoint") public class Endpoint { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoints.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoints.java index 146e88b5b..617db7edd 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoints.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoints.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Endpoints implements Iterable, Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Group.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Group.java index 5e718b536..7cd28ad7a 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Group.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Group.java @@ -1,7 +1,7 @@ package com.woorea.openstack.keystone.v3.model; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("group") public class Group { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Groups.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Groups.java index cc7b276fa..4085636d2 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Groups.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Groups.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Groups implements Iterable, Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policies.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policies.java index 42da856d5..25e10c106 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policies.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policies.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Policies implements Iterable, Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policy.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policy.java index 5abf84440..d0ccde815 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policy.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policy.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("policy") public class Policy { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Project.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Project.java index 070336eb1..cca3d73c1 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Project.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Project.java @@ -1,7 +1,7 @@ package com.woorea.openstack.keystone.v3.model; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("project") public class Project { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Projects.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Projects.java index fa390644a..1826fb8b9 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Projects.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Projects.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Projects implements Iterable, Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Role.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Role.java index 09d47a110..bd2933b1d 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Role.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Role.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("role") public class Role implements Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Roles.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Roles.java index 5a4e3b41f..92b688dc9 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Roles.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Roles.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Roles implements Iterable, Serializable { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Service.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Service.java index 578f2c181..6e123603b 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Service.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Service.java @@ -1,6 +1,6 @@ package com.woorea.openstack.keystone.v3.model; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("service") public class Service { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Services.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Services.java index 4383aeca2..7066fe45a 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Services.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Services.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import com.woorea.openstack.keystone.model.Service; diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Token.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Token.java index aee6fe550..3151adfcd 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Token.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Token.java @@ -4,9 +4,9 @@ import java.util.Calendar; import java.util.List; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("token") @JsonIgnoreProperties(ignoreUnknown=true) diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/User.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/User.java index 3b1787ba3..ed68e16b5 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/User.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/User.java @@ -1,7 +1,7 @@ package com.woorea.openstack.keystone.v3.model; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("user") public class User { diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Users.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Users.java index fa3c6d4ac..c7af1899b 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Users.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Users.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import com.woorea.openstack.keystone.model.User; diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java index b69eb3c60..d93a978e6 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java @@ -1,7 +1,7 @@ package com.woorea.openstack.nova.model; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("certificate") public class Certificate { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java index 69d1b5a91..ff3e78445 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Calendar; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("cloudpipe") public class Cloudpipe implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java index 3a3f13e01..6d785de12 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Cloudpipes implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java index 20892b78b..0d7176f75 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java @@ -4,7 +4,7 @@ import java.util.Calendar; import java.util.List; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("extension") public class Extension implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java index 5d049d997..b8c3bed5f 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Extensions implements Iterable, Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java index 107606250..bdc2dd873 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("flavor") public class Flavor implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java index 295096d2a..36d5d5223 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("flavor") public class FlavorForCreate implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java index 0337a3bb5..e95706506 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Flavors implements Iterable, Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java index 3eda923f0..b2e96caa6 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("floating_ip") public class FloatingIp implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java index 4a6a280e6..806fde611 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("floating-ip-pool") public class FloatingIpDomain implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java index 292b59fb4..cd3d544d8 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class FloatingIpDomains implements Iterable, Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java index db1c0e3e2..2fc642b63 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import com.woorea.openstack.nova.model.FloatingIpPools.FloatingIpPool; diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java index 776c4ca8e..93c19a09b 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class FloatingIps implements Iterable, Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java index 40509642f..2982bbabc 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Host implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java index ad68faab9..4f90e71e4 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("aggregate") public class HostAggregate implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java index 6810e832e..2d61d4d13 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class HostAggregates implements Iterable, Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java index 1bac38e32..35d0b3806 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Hosts implements Iterable, Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisor.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisor.java index a9e4e7a66..8a60de7d3 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisor.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisor.java @@ -1,8 +1,8 @@ package com.woorea.openstack.nova.model; import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; /** * Model for Hypervisor diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisors.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisors.java index 76d89d9b6..8732790e3 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisors.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisors.java @@ -2,7 +2,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Model for List of Hypervisors diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java index 93949f234..a42d6771d 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("image") public class Image implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java index 30e38d8c6..3cd993c8e 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("os-volume_upload_image") public class ImageFromVolume implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java index e678e9782..e45505272 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Images implements Iterable, Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java index b2fdb3464..23fa2088e 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("keypair") public class KeyPair implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java index 62f158f73..d7f8730cc 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java @@ -5,7 +5,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class KeyPairs implements Iterable, Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java index 86e9acf3b..5d4e75864 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java @@ -4,8 +4,8 @@ import java.util.Calendar; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("limits") public class Limits implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java index 6e82c1d64..e842e3d88 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("network") public class Network implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java index f5785393b..d9ce4660a 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java @@ -1,7 +1,7 @@ package com.woorea.openstack.nova.model; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; public class NetworkForCreate { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java index 6e8a94150..3ac070abe 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Networks implements Iterable, Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java index 0a2f55dd7..3f142d66b 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java @@ -1,7 +1,7 @@ package com.woorea.openstack.nova.model; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("quota_set") public class QuotaSet { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java index 1b8917b4c..2b7c31747 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("security_group") public class SecurityGroup implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java index c3993bbec..17376f6b9 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("security_group") public class SecurityGroupForCreate implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java index c6a76c22c..12c9851b3 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java @@ -4,8 +4,8 @@ import javax.xml.bind.annotation.XmlElement; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("security_group_rule") public class SecurityGroupRuleForCreate implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java index 1c8cc5533..84a0096fe 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class SecurityGroups implements Iterable, Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java index 589ed540d..229b3329e 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonAnySetter; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("server") public class Server implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java index 26fa5a4a6..161eb6a76 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; public interface ServerAction extends Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java index 9f28a8113..8b50774a0 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("server") public class ServerForCreate implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java index a144250dc..e6a5907d1 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Servers implements Iterable, Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Service.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Service.java index a10df7d6d..7a673e78e 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Service.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Service.java @@ -1,8 +1,8 @@ package com.woorea.openstack.nova.model; import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; /** * Model for Service diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Services.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Services.java index 0443dcb5f..797a5fb70 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Services.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Services.java @@ -2,7 +2,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Model for List of Services diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java index f75414d99..31b49a0a9 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java @@ -4,8 +4,8 @@ import java.math.BigDecimal; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("tenant_usage") public class SimpleTenantUsage implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java index 33c46254d..d5b9e9c66 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class SimpleTenantUsages implements Iterable, Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java index 06b9c4d76..fb84a1755 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("snapshot") public class Snapshot implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java index 5db392e49..9f90d6bfb 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("snapshot") public class SnapshotForCreate implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java index 006d30cb4..00f45f1e6 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Snapshots implements Iterable, Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java index d4b7e6e68..7498dcf3b 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("volume") public class Volume implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java index 54abc9e82..6db93bbb4 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("volumeAttachment") public class VolumeAttachment implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java index be5ea8e33..20f248d85 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class VolumeAttachments implements Iterable, Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java index c4a09a334..1f8f26708 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("volume") public class VolumeForCreate implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java index 994d49a4d..d4ee00646 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("os-volume_upload_image") public class VolumeForImageCreate implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeType.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeType.java index 4c25e4b81..bd1b30efd 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeType.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeType.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("volume-type") public class VolumeType implements Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java index 42d8162d2..3c51d75c5 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class VolumeTypes implements Iterable, Serializable { diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java index 349ef874a..de662355c 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Volumes implements Iterable, Serializable { diff --git a/openstack-client-connectors/jersey-connector/pom.xml b/openstack-client-connectors/jersey-connector/pom.xml index 36677c4b9..4d2486fcf 100644 --- a/openstack-client-connectors/jersey-connector/pom.xml +++ b/openstack-client-connectors/jersey-connector/pom.xml @@ -15,9 +15,9 @@ 1.17.1 - org.codehaus.jackson - jackson-jaxrs - 1.9.12 + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.9.8 diff --git a/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyConnector.java b/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyConnector.java index c8ed12387..117f64340 100644 --- a/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyConnector.java +++ b/openstack-client-connectors/jersey-connector/src/main/java/com/woorea/openstack/connector/JerseyConnector.java @@ -7,12 +7,12 @@ import javax.ws.rs.ext.ContextResolver; import javax.ws.rs.ext.Provider; -import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; -import org.codehaus.jackson.map.annotate.JsonRootName; -import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.annotation.JsonRootName; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; @@ -78,20 +78,20 @@ public static class OpenStackObjectMapper implements ContextResolver() { diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index 5a6de809f..41ec0404f 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -15,9 +15,9 @@ 2.3.2.Final - org.codehaus.jackson - jackson-jaxrs - 1.9.13 + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.9.8 commons-httpclient diff --git a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java index 41b1bafa4..74630303e 100644 --- a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java +++ b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java @@ -10,13 +10,13 @@ import javax.ws.rs.ext.ContextResolver; import javax.ws.rs.ext.Provider; +import com.fasterxml.jackson.annotation.JsonInclude; import org.apache.commons.httpclient.HttpStatus; -import org.codehaus.jackson.jaxrs.JacksonJsonProvider; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; -import org.codehaus.jackson.map.annotate.JsonRootName; -import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; +import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.annotation.JsonRootName; import org.jboss.resteasy.client.ClientExecutor; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; @@ -47,21 +47,21 @@ public ObjectMapper getContext(Class type) { static { DEFAULT_MAPPER = new ObjectMapper(); - DEFAULT_MAPPER.setSerializationInclusion(Inclusion.NON_NULL); - DEFAULT_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT); - DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY); - DEFAULT_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES); - DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT); + DEFAULT_MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL); + DEFAULT_MAPPER.enable(SerializationFeature.INDENT_OUTPUT); + DEFAULT_MAPPER.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); + DEFAULT_MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + DEFAULT_MAPPER.enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT); WRAPPED_MAPPER = new ObjectMapper(); - WRAPPED_MAPPER.setSerializationInclusion(Inclusion.NON_NULL); - WRAPPED_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT); - WRAPPED_MAPPER.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE); - WRAPPED_MAPPER.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE); - WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY); - WRAPPED_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES); - WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT); + WRAPPED_MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL); + WRAPPED_MAPPER.enable(SerializationFeature.INDENT_OUTPUT); + WRAPPED_MAPPER.enable(SerializationFeature.WRAP_ROOT_VALUE); + WRAPPED_MAPPER.enable(DeserializationFeature.UNWRAP_ROOT_VALUE); + WRAPPED_MAPPER.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); + WRAPPED_MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + WRAPPED_MAPPER.enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT); providerFactory = new ResteasyProviderFactory(); providerFactory.registerProviderInstance(new JacksonJsonProvider()); diff --git a/pom.xml b/pom.xml index d6134bc4c..4bace3e32 100644 --- a/pom.xml +++ b/pom.xml @@ -82,9 +82,9 @@ - org.codehaus.jackson - jackson-mapper-asl - 1.9.13 + com.fasterxml.jackson.core + jackson-databind + 2.9.8 diff --git a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java index 8de5abf48..342d9c3f8 100644 --- a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java +++ b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import com.woorea.openstack.base.client.OpenStackRequest; diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java index 2a7766f75..eddfc3326 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java @@ -3,7 +3,7 @@ import java.util.List; import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class GatewayInfo implements Serializable { diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java index 40e037018..c79766857 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java @@ -3,10 +3,10 @@ import java.io.Serializable; import java.util.List; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @SuppressWarnings("serial") @JsonRootName("network") diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NetworkForCreate.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NetworkForCreate.java index 507e39b05..1d4d5cb69 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NetworkForCreate.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NetworkForCreate.java @@ -1,6 +1,6 @@ package com.woorea.openstack.quantum.model; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @SuppressWarnings("serial") @JsonRootName("network") diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Networks.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Networks.java index a4fd330de..f5b251ceb 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Networks.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Networks.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Networks implements Iterable, Serializable{ diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Port.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Port.java index 8ca74f154..169809899 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Port.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Port.java @@ -4,11 +4,12 @@ import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.annotate.JsonUnwrapped; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + +import com.fasterxml.jackson.annotation.JsonUnwrapped; +import com.fasterxml.jackson.annotation.JsonRootName; @SuppressWarnings("serial") @JsonRootName("port") diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/PortForCreate.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/PortForCreate.java index 3c1af5060..f7df76f53 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/PortForCreate.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/PortForCreate.java @@ -1,6 +1,6 @@ package com.woorea.openstack.quantum.model; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; /** * @deprecated Please use {@link Port} directly. diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Ports.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Ports.java index 5f10d35dd..5d0ed3a2e 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Ports.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Ports.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; @SuppressWarnings("serial") public class Ports implements Iterable, Serializable { diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java index a94afd5e4..c1acb433e 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java @@ -3,8 +3,8 @@ import java.util.List; import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("router") public class Router implements Serializable { diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForAddInterface.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForAddInterface.java index 62ec3025a..24ca72d51 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForAddInterface.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForAddInterface.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class RouterForAddInterface implements Serializable { diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForCreate.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForCreate.java index b8c92912d..26ca202ec 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForCreate.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForCreate.java @@ -3,8 +3,8 @@ import java.util.List; import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("router") public class RouterForCreate implements Serializable { diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterInterface.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterInterface.java index 2d7551fbb..824779e03 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterInterface.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterInterface.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; public class RouterInterface implements Serializable { diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Routers.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Routers.java index e2a56b2bc..f180cdb6b 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Routers.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Routers.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Routers implements Iterable, Serializable{ diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnet.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnet.java index 73015146b..b300f71e8 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnet.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnet.java @@ -3,12 +3,13 @@ import java.io.Serializable; import java.util.List; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.annotate.JsonValue; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonRootName; @SuppressWarnings("serial") @JsonRootName("subnet") diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/SubnetForCreate.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/SubnetForCreate.java index 2c07ab255..fe0b19e2a 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/SubnetForCreate.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/SubnetForCreate.java @@ -1,7 +1,7 @@ package com.woorea.openstack.quantum.model; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonRootName; /** * Please use {@link Subnet} directly. diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnets.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnets.java index e9b21f47e..b520e5a91 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnets.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnets.java @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Subnets implements Serializable, Iterable { diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworkTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworkTest.java index d0649fb81..a54326873 100644 --- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworkTest.java +++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/NetworkTest.java @@ -9,7 +9,7 @@ import java.util.Arrays; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; import org.junit.Test; diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/PortTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/PortTest.java index bce504427..e63efbd3b 100644 --- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/PortTest.java +++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/PortTest.java @@ -11,10 +11,11 @@ import java.util.Arrays; import java.util.List; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; -import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.annotation.JsonSerialize.Inclusion; import org.hamcrest.CustomMatcher; import org.junit.Before; import org.junit.Test; @@ -68,11 +69,11 @@ public void setUp() throws Exception { public static ObjectMapper initializeObjectMapper() { ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.setSerializationInclusion(Inclusion.NON_NULL) - .enable(SerializationConfig.Feature.INDENT_OUTPUT) - .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE) - .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE) - .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY); + objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL) + .enable(SerializationFeature.INDENT_OUTPUT) + .enable(SerializationFeature.WRAP_ROOT_VALUE) + .enable(DeserializationFeature.UNWRAP_ROOT_VALUE) + .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); return objectMapper; } diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/SubnetTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/SubnetTest.java index 9136a38cc..013ca3028 100644 --- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/SubnetTest.java +++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/SubnetTest.java @@ -9,7 +9,7 @@ import java.util.Arrays; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.hamcrest.CustomMatcher; import org.junit.Before; import org.junit.Test; diff --git a/swift-model/src/main/java/com/woorea/openstack/swift/model/Container.java b/swift-model/src/main/java/com/woorea/openstack/swift/model/Container.java index 62a002ade..f61c435b2 100644 --- a/swift-model/src/main/java/com/woorea/openstack/swift/model/Container.java +++ b/swift-model/src/main/java/com/woorea/openstack/swift/model/Container.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class Container implements Serializable { diff --git a/swift-model/src/main/java/com/woorea/openstack/swift/model/Object.java b/swift-model/src/main/java/com/woorea/openstack/swift/model/Object.java index d53ee65d6..1ba18e1f3 100644 --- a/swift-model/src/main/java/com/woorea/openstack/swift/model/Object.java +++ b/swift-model/src/main/java/com/woorea/openstack/swift/model/Object.java @@ -3,8 +3,7 @@ import java.io.Serializable; import java.util.Calendar; -import org.codehaus.jackson.annotate.JsonProperty; - +import com.fasterxml.jackson.annotation.JsonProperty; public class Object implements Serializable { From 6833f89d08897f7f86f41b2774e227a5a878728c Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Fri, 31 Jan 2020 22:25:41 +0100 Subject: [PATCH 35/40] Use httpclient 4 --- NEWS.md | 1 + openstack-client-connectors/resteasy-connector/pom.xml | 8 ++++---- .../com/woorea/openstack/connector/RESTEasyConnector.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NEWS.md b/NEWS.md index d73bd803b..baa0c0dcd 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,6 @@ # 3.2.8 / 2020-01-29 * jackson upgraded to com.fasterxml version 2.9.x +* commons-httpclient upgraded to org.apache.httpcomponents 4.5 # 3.2.7 / 2019-05-03 * Remove maven-gpg-plugin diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index 41ec0404f..5c4a821e4 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -12,7 +12,7 @@ org.jboss.resteasy resteasy-jaxrs - 2.3.2.Final + 3.0.26.Final com.fasterxml.jackson.jaxrs @@ -20,9 +20,9 @@ 2.9.8 - commons-httpclient - commons-httpclient - 3.1 + org.apache.httpcomponents + httpclient + 4.5.5 diff --git a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java index 74630303e..5e078a344 100644 --- a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java +++ b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java @@ -11,7 +11,7 @@ import javax.ws.rs.ext.Provider; import com.fasterxml.jackson.annotation.JsonInclude; -import org.apache.commons.httpclient.HttpStatus; +import org.apache.http.HttpStatus; import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; From fea88ae3b138fc1b5e2680040926fccdeb0d70c6 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Sat, 1 Feb 2020 20:18:08 +0100 Subject: [PATCH 36/40] [maven-release-plugin] prepare release openstack-java-sdk-3.2.8 --- ceilometer-client/pom.xml | 6 +++--- ceilometer-model/pom.xml | 2 +- cinder-client/pom.xml | 6 +++--- cinder-model/pom.xml | 2 +- glance-client/pom.xml | 6 +++--- glance-model/pom.xml | 2 +- heat-client/pom.xml | 6 +++--- heat-model/pom.xml | 2 +- keystone-client/pom.xml | 6 +++--- keystone-model/pom.xml | 2 +- nova-client/pom.xml | 6 +++--- nova-model/pom.xml | 2 +- openstack-client-connectors/jersey-connector/pom.xml | 2 +- openstack-client-connectors/jersey2-connector/pom.xml | 4 ++-- openstack-client-connectors/pom.xml | 4 ++-- openstack-client-connectors/resteasy-connector/pom.xml | 2 +- openstack-client/pom.xml | 2 +- openstack-console/pom.xml | 6 +++--- openstack-examples/pom.xml | 4 ++-- pom.xml | 2 +- quantum-client/pom.xml | 6 +++--- quantum-model/pom.xml | 2 +- swift-client/pom.xml | 6 +++--- swift-model/pom.xml | 2 +- 24 files changed, 45 insertions(+), 45 deletions(-) diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index 7827feaaa..568f18eb3 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 ceilometer-client OpenStack Ceilometer Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.8-SNAPSHOT + 3.2.8 com.woorea ceilometer-model - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index cca729a10..b913844e2 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 ceilometer-model OpenStack Ceilometer Model diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index 67852c8ac..8f92a8ad7 100644 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 cinder-client OpenStack Cinder Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.8-SNAPSHOT + 3.2.8 com.woorea cinder-model - 3.2.8-SNAPSHOT + 3.2.8 \ No newline at end of file diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index bc1ecde54..1b179ac61 100644 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 cinder-model OpenStack Cinder Model diff --git a/glance-client/pom.xml b/glance-client/pom.xml index fdcccfa19..29bc750b5 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 glance-client OpenStack Glance Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.8-SNAPSHOT + 3.2.8 com.woorea glance-model - 3.2.8-SNAPSHOT + 3.2.8 \ No newline at end of file diff --git a/glance-model/pom.xml b/glance-model/pom.xml index 307bf335a..a25cf6ba8 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 glance-model OpenStack Glance Model diff --git a/heat-client/pom.xml b/heat-client/pom.xml index fe2df7444..e9009f1f6 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 heat-client OpenStack Heat Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.8-SNAPSHOT + 3.2.8 com.woorea heat-model - 3.2.8-SNAPSHOT + 3.2.8 \ No newline at end of file diff --git a/heat-model/pom.xml b/heat-model/pom.xml index febbdec5d..2f922723c 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 heat-model OpenStack Heat Model diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index 7e4c6e1c4..383a7751e 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 keystone-client OpenStack Keystone Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.8-SNAPSHOT + 3.2.8 com.woorea keystone-model - 3.2.8-SNAPSHOT + 3.2.8 \ No newline at end of file diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index 1a690bd9c..23e7a7124 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 keystone-model OpenStack Keystone Model diff --git a/nova-client/pom.xml b/nova-client/pom.xml index 91421416c..144b9c2d8 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 nova-client OpenStack Nova Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.8-SNAPSHOT + 3.2.8 com.woorea nova-model - 3.2.8-SNAPSHOT + 3.2.8 \ No newline at end of file diff --git a/nova-model/pom.xml b/nova-model/pom.xml index e3c594888..b61cdb993 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/openstack-client-connectors/jersey-connector/pom.xml b/openstack-client-connectors/jersey-connector/pom.xml index 4d2486fcf..48e394250 100644 --- a/openstack-client-connectors/jersey-connector/pom.xml +++ b/openstack-client-connectors/jersey-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.8-SNAPSHOT + 3.2.8 jersey-connector OpenStack Jersey Connector diff --git a/openstack-client-connectors/jersey2-connector/pom.xml b/openstack-client-connectors/jersey2-connector/pom.xml index 9bceae888..c0265fbbb 100644 --- a/openstack-client-connectors/jersey2-connector/pom.xml +++ b/openstack-client-connectors/jersey2-connector/pom.xml @@ -4,7 +4,7 @@ com.woorea openstack-client-connectors - 3.2.8-SNAPSHOT + 3.2.8 jersey2-connector OpenStack Jersey2 Connector @@ -27,7 +27,7 @@ com.woorea openstack-client - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index 2878a9059..663126785 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 openstack-client-connectors OpenStack Client Connectors @@ -42,7 +42,7 @@ com.woorea openstack-client - 3.2.8-SNAPSHOT + 3.2.8 \ No newline at end of file diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index 5c4a821e4..3c3b50b16 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.8-SNAPSHOT + 3.2.8 resteasy-connector OpenStack RESTEasy Connector diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index 760d34902..c03c09a36 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 openstack-client OpenStack Client diff --git a/openstack-console/pom.xml b/openstack-console/pom.xml index 741f625dc..690ec7b85 100644 --- a/openstack-console/pom.xml +++ b/openstack-console/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 openstack-console OpenStack Console @@ -22,12 +22,12 @@ com.woorea keystone-client - 3.2.8-SNAPSHOT + 3.2.8 com.woorea nova-client - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index 4f23e9165..8d250e451 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -3,11 +3,11 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 UTF-8 - 3.2.8-SNAPSHOT + 3.2.8 openstack-examples OpenStack Examples diff --git a/pom.xml b/pom.xml index 4bace3e32..3f0caeb09 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 pom OpenStack Java SDK OpenStack Java SDK diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index 295ddbe20..cf8f6328f 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 quantum-client OpenStack Quantum Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.8-SNAPSHOT + 3.2.8 com.woorea quantum-model - 3.2.8-SNAPSHOT + 3.2.8 diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index b3d7d6d03..b60c99360 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 quantum-model OpenStack Quantum Model diff --git a/swift-client/pom.xml b/swift-client/pom.xml index 65e1da30c..604dc07fa 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 swift-client OpenStack Swift Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.8-SNAPSHOT + 3.2.8 com.woorea swift-model - 3.2.8-SNAPSHOT + 3.2.8 \ No newline at end of file diff --git a/swift-model/pom.xml b/swift-model/pom.xml index de6c1e6e9..73b12dd48 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8-SNAPSHOT + 3.2.8 swift-model OpenStack Swift Model From 7deccdd10f780d171fad86048be3fa16f4398bd9 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Sat, 1 Feb 2020 20:19:57 +0100 Subject: [PATCH 37/40] [maven-release-plugin] prepare for next development iteration --- ceilometer-client/pom.xml | 6 +++--- ceilometer-model/pom.xml | 2 +- cinder-client/pom.xml | 6 +++--- cinder-model/pom.xml | 2 +- glance-client/pom.xml | 6 +++--- glance-model/pom.xml | 2 +- heat-client/pom.xml | 6 +++--- heat-model/pom.xml | 2 +- keystone-client/pom.xml | 6 +++--- keystone-model/pom.xml | 2 +- nova-client/pom.xml | 6 +++--- nova-model/pom.xml | 2 +- openstack-client-connectors/jersey-connector/pom.xml | 2 +- openstack-client-connectors/jersey2-connector/pom.xml | 4 ++-- openstack-client-connectors/pom.xml | 4 ++-- openstack-client-connectors/resteasy-connector/pom.xml | 2 +- openstack-client/pom.xml | 2 +- openstack-console/pom.xml | 6 +++--- openstack-examples/pom.xml | 2 +- pom.xml | 2 +- quantum-client/pom.xml | 6 +++--- quantum-model/pom.xml | 2 +- swift-client/pom.xml | 6 +++--- swift-model/pom.xml | 2 +- 24 files changed, 44 insertions(+), 44 deletions(-) diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index 568f18eb3..50ad674de 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT ceilometer-client OpenStack Ceilometer Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.8 + 3.2.9-SNAPSHOT com.woorea ceilometer-model - 3.2.8 + 3.2.9-SNAPSHOT diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index b913844e2..f6c655f5e 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT ceilometer-model OpenStack Ceilometer Model diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index 8f92a8ad7..739d0d9d7 100644 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT cinder-client OpenStack Cinder Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.8 + 3.2.9-SNAPSHOT com.woorea cinder-model - 3.2.8 + 3.2.9-SNAPSHOT \ No newline at end of file diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index 1b179ac61..8074146e1 100644 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT cinder-model OpenStack Cinder Model diff --git a/glance-client/pom.xml b/glance-client/pom.xml index 29bc750b5..763b10075 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT glance-client OpenStack Glance Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.8 + 3.2.9-SNAPSHOT com.woorea glance-model - 3.2.8 + 3.2.9-SNAPSHOT \ No newline at end of file diff --git a/glance-model/pom.xml b/glance-model/pom.xml index a25cf6ba8..0fb19b4e7 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT glance-model OpenStack Glance Model diff --git a/heat-client/pom.xml b/heat-client/pom.xml index e9009f1f6..ea122659e 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT heat-client OpenStack Heat Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.8 + 3.2.9-SNAPSHOT com.woorea heat-model - 3.2.8 + 3.2.9-SNAPSHOT \ No newline at end of file diff --git a/heat-model/pom.xml b/heat-model/pom.xml index 2f922723c..7475641d4 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT heat-model OpenStack Heat Model diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index 383a7751e..0d7237b1d 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT keystone-client OpenStack Keystone Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.8 + 3.2.9-SNAPSHOT com.woorea keystone-model - 3.2.8 + 3.2.9-SNAPSHOT \ No newline at end of file diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index 23e7a7124..dd6093ecb 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT keystone-model OpenStack Keystone Model diff --git a/nova-client/pom.xml b/nova-client/pom.xml index 144b9c2d8..2e81a5623 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT nova-client OpenStack Nova Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.8 + 3.2.9-SNAPSHOT com.woorea nova-model - 3.2.8 + 3.2.9-SNAPSHOT \ No newline at end of file diff --git a/nova-model/pom.xml b/nova-model/pom.xml index b61cdb993..69dd1350e 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT diff --git a/openstack-client-connectors/jersey-connector/pom.xml b/openstack-client-connectors/jersey-connector/pom.xml index 48e394250..f68d77ed5 100644 --- a/openstack-client-connectors/jersey-connector/pom.xml +++ b/openstack-client-connectors/jersey-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.8 + 3.2.9-SNAPSHOT jersey-connector OpenStack Jersey Connector diff --git a/openstack-client-connectors/jersey2-connector/pom.xml b/openstack-client-connectors/jersey2-connector/pom.xml index c0265fbbb..8ac81782a 100644 --- a/openstack-client-connectors/jersey2-connector/pom.xml +++ b/openstack-client-connectors/jersey2-connector/pom.xml @@ -4,7 +4,7 @@ com.woorea openstack-client-connectors - 3.2.8 + 3.2.9-SNAPSHOT jersey2-connector OpenStack Jersey2 Connector @@ -27,7 +27,7 @@ com.woorea openstack-client - 3.2.8 + 3.2.9-SNAPSHOT diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index 663126785..13c99194b 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT openstack-client-connectors OpenStack Client Connectors @@ -42,7 +42,7 @@ com.woorea openstack-client - 3.2.8 + 3.2.9-SNAPSHOT \ No newline at end of file diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index 3c3b50b16..dd9600506 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.8 + 3.2.9-SNAPSHOT resteasy-connector OpenStack RESTEasy Connector diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index c03c09a36..f5719cdef 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT openstack-client OpenStack Client diff --git a/openstack-console/pom.xml b/openstack-console/pom.xml index 690ec7b85..234709200 100644 --- a/openstack-console/pom.xml +++ b/openstack-console/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT openstack-console OpenStack Console @@ -22,12 +22,12 @@ com.woorea keystone-client - 3.2.8 + 3.2.9-SNAPSHOT com.woorea nova-client - 3.2.8 + 3.2.9-SNAPSHOT diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index 8d250e451..0e1c3fbf4 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT UTF-8 diff --git a/pom.xml b/pom.xml index 3f0caeb09..b0294419b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT pom OpenStack Java SDK OpenStack Java SDK diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index cf8f6328f..dcdf1bbc5 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT quantum-client OpenStack Quantum Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.8 + 3.2.9-SNAPSHOT com.woorea quantum-model - 3.2.8 + 3.2.9-SNAPSHOT diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index b60c99360..d3b09d00a 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT quantum-model OpenStack Quantum Model diff --git a/swift-client/pom.xml b/swift-client/pom.xml index 604dc07fa..f597c501a 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT swift-client OpenStack Swift Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.8 + 3.2.9-SNAPSHOT com.woorea swift-model - 3.2.8 + 3.2.9-SNAPSHOT \ No newline at end of file diff --git a/swift-model/pom.xml b/swift-model/pom.xml index 73b12dd48..7c3fd53db 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.8 + 3.2.9-SNAPSHOT swift-model OpenStack Swift Model From f3d15ad7a0310bc549baf50e007ce119b3d5fff4 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Wed, 25 Mar 2020 10:28:04 +0100 Subject: [PATCH 38/40] glance: Add Support for Image Service API v2 --- NEWS.md | 3 + .../woorea/openstack/glance/v2/Glance.java | 22 ++ .../openstack/glance/v2/ImagesResource.java | 90 ++++++++ .../openstack/glance/model/v2/Image.java | 212 ++++++++++++++++++ .../glance/model/v2/ImageDownload.java | 23 ++ .../openstack/glance/model/v2/Images.java | 26 +++ 6 files changed, 376 insertions(+) create mode 100644 glance-client/src/main/java/com/woorea/openstack/glance/v2/Glance.java create mode 100644 glance-client/src/main/java/com/woorea/openstack/glance/v2/ImagesResource.java create mode 100644 glance-model/src/main/java/com/woorea/openstack/glance/model/v2/Image.java create mode 100644 glance-model/src/main/java/com/woorea/openstack/glance/model/v2/ImageDownload.java create mode 100644 glance-model/src/main/java/com/woorea/openstack/glance/model/v2/Images.java diff --git a/NEWS.md b/NEWS.md index baa0c0dcd..1ebc1c989 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +# 3.2.9 / 2020-04-07 +* glance: Add Support for Image Service API v2 + # 3.2.8 / 2020-01-29 * jackson upgraded to com.fasterxml version 2.9.x * commons-httpclient upgraded to org.apache.httpcomponents 4.5 diff --git a/glance-client/src/main/java/com/woorea/openstack/glance/v2/Glance.java b/glance-client/src/main/java/com/woorea/openstack/glance/v2/Glance.java new file mode 100644 index 000000000..ecfc4fc83 --- /dev/null +++ b/glance-client/src/main/java/com/woorea/openstack/glance/v2/Glance.java @@ -0,0 +1,22 @@ +package com.woorea.openstack.glance.v2; + +import com.woorea.openstack.base.client.OpenStackClient; +import com.woorea.openstack.base.client.OpenStackClientConnector; + +public class Glance extends OpenStackClient { + + private final ImagesResource IMAGES; + + public Glance(String endpoint, OpenStackClientConnector connector) { + super(endpoint, connector); + IMAGES = new ImagesResource(this); + } + + public Glance(String endpoint) { + this(endpoint, null); + } + + public final ImagesResource images() { + return IMAGES; + } +} diff --git a/glance-client/src/main/java/com/woorea/openstack/glance/v2/ImagesResource.java b/glance-client/src/main/java/com/woorea/openstack/glance/v2/ImagesResource.java new file mode 100644 index 000000000..3b850689b --- /dev/null +++ b/glance-client/src/main/java/com/woorea/openstack/glance/v2/ImagesResource.java @@ -0,0 +1,90 @@ +package com.woorea.openstack.glance.v2; + +import com.woorea.openstack.base.client.Entity; +import com.woorea.openstack.base.client.HttpMethod; +import com.woorea.openstack.base.client.OpenStackClient; +import com.woorea.openstack.base.client.OpenStackRequest; +import com.woorea.openstack.base.client.OpenStackResponse; +import com.woorea.openstack.glance.model.v2.Image; +import com.woorea.openstack.glance.model.v2.ImageDownload; +import com.woorea.openstack.glance.model.v2.Images; + +public class ImagesResource { + + private final OpenStackClient CLIENT; + + public ImagesResource(OpenStackClient client) { + CLIENT = client; + } + + public List list(boolean detail) { + return new List(detail); + } + + public Create create(Image image) { + return new Create(image); + } + + public Show show(String id) { + return new Show(id); + } + + public Delete delete(String id) { + return new Delete(id); + } + + public Download download(String id) { + return new Download(id); + } + + public class List extends OpenStackRequest { + + public List(boolean detail) { + super(CLIENT, HttpMethod.GET, "/images", null, Images.class); + } + + } + + public class Create extends OpenStackRequest { + + public Create(Image image) { + super(CLIENT, HttpMethod.POST, "/images", Entity.json(image), Image.class); + } + + } + + public class Delete extends OpenStackRequest { + + public Delete(String id) { + super(CLIENT, HttpMethod.DELETE, new StringBuilder("/images/").append(id).toString(), null, Void.class); + } + + } + + public class Show extends OpenStackRequest { + + public Show(String id) { + super(CLIENT, HttpMethod.GET, new StringBuilder("/images/").append(id).toString(), null, Image.class); + } + + } + + public class Download extends OpenStackRequest { + + public Download(String id) { + super(CLIENT, HttpMethod.GET, new StringBuilder("/images/").append(id).append("/file").toString(), + null, ImageDownload.class); + header("Accept", "application/octet-stream"); + } + + @Override + public ImageDownload execute() { + // custom parsing here + OpenStackResponse response = CLIENT.request(this); + ImageDownload imageDownload = new ImageDownload(); + imageDownload.setInputStream(response.getInputStream()); + return imageDownload; + } + + } +} diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/v2/Image.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/v2/Image.java new file mode 100644 index 000000000..fe0531b65 --- /dev/null +++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/v2/Image.java @@ -0,0 +1,212 @@ +package com.woorea.openstack.glance.model.v2; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.io.Serializable; +import java.util.Calendar; + +@JsonIgnoreProperties(ignoreUnknown = true) +public class Image implements Serializable { + + private String id; + + private String self; + + private String name; + + private String file; + + @JsonProperty("disk_format") + private String diskFormat; + + @JsonProperty("container_format") + private String containerFormat; + + private Long size; + + @JsonProperty("virtual_size") + private Long virtualSize; + + private String checksum; + + @JsonProperty("created_at") + private Calendar createdAt; + + @JsonProperty("updated_at") + private Calendar updatedAt; + + private String status; + + private String visibility; + + @JsonProperty("min_ram") + private Integer minRam; + + @JsonProperty("min_disk") + private Integer minDisk; + + private String owner; + + @JsonProperty("protected") + private boolean isProtected; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSelf() { + return self; + } + + public void setSelf(String self) { + this.self = self; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDiskFormat() { + return diskFormat; + } + + public void setDiskFormat(String diskFormat) { + this.diskFormat = diskFormat; + } + + public String getContainerFormat() { + return containerFormat; + } + + public void setContainerFormat(String containerFormat) { + this.containerFormat = containerFormat; + } + + public Long getSize() { + return size; + } + + public void setSize(Long size) { + this.size = size; + } + + public Long getVirtualSize() { + return virtualSize; + } + + public void setVirtualSize(Long virtualSize) { + this.virtualSize = virtualSize; + } + + public String getChecksum() { + return checksum; + } + + public void setChecksum(String checksum) { + this.checksum = checksum; + } + + public Calendar getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Calendar createdAt) { + this.createdAt = createdAt; + } + + public Calendar getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Calendar updatedAt) { + this.updatedAt = updatedAt; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Integer getMinRam() { + return minRam; + } + + public void setMinRam(Integer minRam) { + this.minRam = minRam; + } + + public Integer getMinDisk() { + return minDisk; + } + + public void setMinDisk(Integer minDisk) { + this.minDisk = minDisk; + } + + public String getOwner() { + return owner; + } + + public void setOwner(String owner) { + this.owner = owner; + } + + public boolean isProtected() { + return isProtected; + } + + public void setProtected(boolean aProtected) { + isProtected = aProtected; + } + + public String getFile() { + return file; + } + + public void setFile(String file) { + this.file = file; + } + + public String getVisibility() { + return visibility; + } + + public void setVisibility(String visibility) { + this.visibility = visibility; + } + + @Override + public String toString() { + return "Image{" + + "id='" + id + '\'' + + ", self='" + self + '\'' + + ", name='" + name + '\'' + + ", file='" + file + '\'' + + ", diskFormat='" + diskFormat + '\'' + + ", containerFormat='" + containerFormat + '\'' + + ", size=" + size + + ", virtualSize=" + virtualSize + + ", checksum='" + checksum + '\'' + + ", createdAt=" + createdAt + + ", updatedAt=" + updatedAt + + ", status='" + status + '\'' + + ", visibility='" + visibility + '\'' + + ", minRam=" + minRam + + ", minDisk=" + minDisk + + ", owner='" + owner + '\'' + + ", isProtected=" + isProtected + + '}'; + } +} diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/v2/ImageDownload.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/v2/ImageDownload.java new file mode 100644 index 000000000..56f2cdce4 --- /dev/null +++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/v2/ImageDownload.java @@ -0,0 +1,23 @@ +package com.woorea.openstack.glance.model.v2; + +import java.io.InputStream; + +public class ImageDownload { + + private InputStream inputStream; + + /** + * @return the inputStream + */ + public InputStream getInputStream() { + return inputStream; + } + + /** + * @param inputStream the inputStream to set + */ + public void setInputStream(InputStream inputStream) { + this.inputStream = inputStream; + } + +} diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/v2/Images.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/v2/Images.java new file mode 100644 index 000000000..0fed85be2 --- /dev/null +++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/v2/Images.java @@ -0,0 +1,26 @@ +package com.woorea.openstack.glance.model.v2; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.io.Serializable; +import java.util.Iterator; +import java.util.List; + +public class Images implements Iterable, Serializable { + + @JsonProperty("images") + private List list; + + /** + * @return the list + */ + public List getList() { + return list; + } + + @Override + public Iterator iterator() { + return list.iterator(); + } + +} From 7ca15b44b1294e09a1a13e2c52238ac81ed8c170 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Tue, 7 Apr 2020 10:02:27 +0200 Subject: [PATCH 39/40] [maven-release-plugin] prepare release openstack-java-sdk-3.2.9 --- ceilometer-client/pom.xml | 6 +++--- ceilometer-model/pom.xml | 2 +- cinder-client/pom.xml | 6 +++--- cinder-model/pom.xml | 2 +- glance-client/pom.xml | 6 +++--- glance-model/pom.xml | 2 +- heat-client/pom.xml | 6 +++--- heat-model/pom.xml | 2 +- keystone-client/pom.xml | 6 +++--- keystone-model/pom.xml | 2 +- nova-client/pom.xml | 6 +++--- nova-model/pom.xml | 2 +- openstack-client-connectors/jersey-connector/pom.xml | 2 +- openstack-client-connectors/jersey2-connector/pom.xml | 4 ++-- openstack-client-connectors/pom.xml | 4 ++-- openstack-client-connectors/resteasy-connector/pom.xml | 2 +- openstack-client/pom.xml | 2 +- openstack-console/pom.xml | 6 +++--- openstack-examples/pom.xml | 2 +- pom.xml | 2 +- quantum-client/pom.xml | 6 +++--- quantum-model/pom.xml | 2 +- swift-client/pom.xml | 6 +++--- swift-model/pom.xml | 2 +- 24 files changed, 44 insertions(+), 44 deletions(-) diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index 50ad674de..c7789a419 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 ceilometer-client OpenStack Ceilometer Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.9-SNAPSHOT + 3.2.9 com.woorea ceilometer-model - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index f6c655f5e..ff80cd09e 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 ceilometer-model OpenStack Ceilometer Model diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index 739d0d9d7..8f916d343 100644 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 cinder-client OpenStack Cinder Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.9-SNAPSHOT + 3.2.9 com.woorea cinder-model - 3.2.9-SNAPSHOT + 3.2.9 \ No newline at end of file diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index 8074146e1..7b964e46c 100644 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 cinder-model OpenStack Cinder Model diff --git a/glance-client/pom.xml b/glance-client/pom.xml index 763b10075..9c4d31c1e 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 glance-client OpenStack Glance Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.9-SNAPSHOT + 3.2.9 com.woorea glance-model - 3.2.9-SNAPSHOT + 3.2.9 \ No newline at end of file diff --git a/glance-model/pom.xml b/glance-model/pom.xml index 0fb19b4e7..495400404 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 glance-model OpenStack Glance Model diff --git a/heat-client/pom.xml b/heat-client/pom.xml index ea122659e..ebd095629 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 heat-client OpenStack Heat Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.9-SNAPSHOT + 3.2.9 com.woorea heat-model - 3.2.9-SNAPSHOT + 3.2.9 \ No newline at end of file diff --git a/heat-model/pom.xml b/heat-model/pom.xml index 7475641d4..708c453f0 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 heat-model OpenStack Heat Model diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index 0d7237b1d..af0c251ab 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 keystone-client OpenStack Keystone Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.9-SNAPSHOT + 3.2.9 com.woorea keystone-model - 3.2.9-SNAPSHOT + 3.2.9 \ No newline at end of file diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index dd6093ecb..9be0a9479 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 keystone-model OpenStack Keystone Model diff --git a/nova-client/pom.xml b/nova-client/pom.xml index 2e81a5623..189b7dc98 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 nova-client OpenStack Nova Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.9-SNAPSHOT + 3.2.9 com.woorea nova-model - 3.2.9-SNAPSHOT + 3.2.9 \ No newline at end of file diff --git a/nova-model/pom.xml b/nova-model/pom.xml index 69dd1350e..85a34fc26 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/openstack-client-connectors/jersey-connector/pom.xml b/openstack-client-connectors/jersey-connector/pom.xml index f68d77ed5..0281df1d6 100644 --- a/openstack-client-connectors/jersey-connector/pom.xml +++ b/openstack-client-connectors/jersey-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.9-SNAPSHOT + 3.2.9 jersey-connector OpenStack Jersey Connector diff --git a/openstack-client-connectors/jersey2-connector/pom.xml b/openstack-client-connectors/jersey2-connector/pom.xml index 8ac81782a..86c69d6be 100644 --- a/openstack-client-connectors/jersey2-connector/pom.xml +++ b/openstack-client-connectors/jersey2-connector/pom.xml @@ -4,7 +4,7 @@ com.woorea openstack-client-connectors - 3.2.9-SNAPSHOT + 3.2.9 jersey2-connector OpenStack Jersey2 Connector @@ -27,7 +27,7 @@ com.woorea openstack-client - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index 13c99194b..34619634e 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 openstack-client-connectors OpenStack Client Connectors @@ -42,7 +42,7 @@ com.woorea openstack-client - 3.2.9-SNAPSHOT + 3.2.9 \ No newline at end of file diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index dd9600506..026ff5156 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.9-SNAPSHOT + 3.2.9 resteasy-connector OpenStack RESTEasy Connector diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index f5719cdef..e98145825 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 openstack-client OpenStack Client diff --git a/openstack-console/pom.xml b/openstack-console/pom.xml index 234709200..1712746da 100644 --- a/openstack-console/pom.xml +++ b/openstack-console/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 openstack-console OpenStack Console @@ -22,12 +22,12 @@ com.woorea keystone-client - 3.2.9-SNAPSHOT + 3.2.9 com.woorea nova-client - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index 0e1c3fbf4..dda360944 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 UTF-8 diff --git a/pom.xml b/pom.xml index b0294419b..f21b3b882 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 pom OpenStack Java SDK OpenStack Java SDK diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index dcdf1bbc5..acd5deac4 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 quantum-client OpenStack Quantum Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.9-SNAPSHOT + 3.2.9 com.woorea quantum-model - 3.2.9-SNAPSHOT + 3.2.9 diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index d3b09d00a..86e34b689 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 quantum-model OpenStack Quantum Model diff --git a/swift-client/pom.xml b/swift-client/pom.xml index f597c501a..7b6661a20 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 swift-client OpenStack Swift Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.9-SNAPSHOT + 3.2.9 com.woorea swift-model - 3.2.9-SNAPSHOT + 3.2.9 \ No newline at end of file diff --git a/swift-model/pom.xml b/swift-model/pom.xml index 7c3fd53db..49a8157ef 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9-SNAPSHOT + 3.2.9 swift-model OpenStack Swift Model From 426c1937d0e22ae581511e762d3f90a393688cc0 Mon Sep 17 00:00:00 2001 From: Dominik Holler Date: Tue, 7 Apr 2020 10:03:13 +0200 Subject: [PATCH 40/40] [maven-release-plugin] prepare for next development iteration --- ceilometer-client/pom.xml | 6 +++--- ceilometer-model/pom.xml | 2 +- cinder-client/pom.xml | 6 +++--- cinder-model/pom.xml | 2 +- glance-client/pom.xml | 6 +++--- glance-model/pom.xml | 2 +- heat-client/pom.xml | 6 +++--- heat-model/pom.xml | 2 +- keystone-client/pom.xml | 6 +++--- keystone-model/pom.xml | 2 +- nova-client/pom.xml | 6 +++--- nova-model/pom.xml | 2 +- openstack-client-connectors/jersey-connector/pom.xml | 2 +- openstack-client-connectors/jersey2-connector/pom.xml | 4 ++-- openstack-client-connectors/pom.xml | 4 ++-- openstack-client-connectors/resteasy-connector/pom.xml | 2 +- openstack-client/pom.xml | 2 +- openstack-console/pom.xml | 6 +++--- openstack-examples/pom.xml | 2 +- pom.xml | 2 +- quantum-client/pom.xml | 6 +++--- quantum-model/pom.xml | 2 +- swift-client/pom.xml | 6 +++--- swift-model/pom.xml | 2 +- 24 files changed, 44 insertions(+), 44 deletions(-) diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index c7789a419..0c0ea41c1 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT ceilometer-client OpenStack Ceilometer Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.9 + 3.2.10-SNAPSHOT com.woorea ceilometer-model - 3.2.9 + 3.2.10-SNAPSHOT diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index ff80cd09e..d2fd429ac 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT ceilometer-model OpenStack Ceilometer Model diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index 8f916d343..e953379d9 100644 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT cinder-client OpenStack Cinder Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.9 + 3.2.10-SNAPSHOT com.woorea cinder-model - 3.2.9 + 3.2.10-SNAPSHOT \ No newline at end of file diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index 7b964e46c..b5fcc3577 100644 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT cinder-model OpenStack Cinder Model diff --git a/glance-client/pom.xml b/glance-client/pom.xml index 9c4d31c1e..c0af557fa 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT glance-client OpenStack Glance Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.9 + 3.2.10-SNAPSHOT com.woorea glance-model - 3.2.9 + 3.2.10-SNAPSHOT \ No newline at end of file diff --git a/glance-model/pom.xml b/glance-model/pom.xml index 495400404..1d0431c4c 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT glance-model OpenStack Glance Model diff --git a/heat-client/pom.xml b/heat-client/pom.xml index ebd095629..b3ad84354 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT heat-client OpenStack Heat Client @@ -12,13 +12,13 @@ com.woorea openstack-client - 3.2.9 + 3.2.10-SNAPSHOT com.woorea heat-model - 3.2.9 + 3.2.10-SNAPSHOT \ No newline at end of file diff --git a/heat-model/pom.xml b/heat-model/pom.xml index 708c453f0..6b93b0149 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT heat-model OpenStack Heat Model diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index af0c251ab..8c190e32b 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT keystone-client OpenStack Keystone Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.9 + 3.2.10-SNAPSHOT com.woorea keystone-model - 3.2.9 + 3.2.10-SNAPSHOT \ No newline at end of file diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index 9be0a9479..2ee5b28f3 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT keystone-model OpenStack Keystone Model diff --git a/nova-client/pom.xml b/nova-client/pom.xml index 189b7dc98..1338768e9 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT nova-client OpenStack Nova Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.9 + 3.2.10-SNAPSHOT com.woorea nova-model - 3.2.9 + 3.2.10-SNAPSHOT \ No newline at end of file diff --git a/nova-model/pom.xml b/nova-model/pom.xml index 85a34fc26..729308bcd 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT diff --git a/openstack-client-connectors/jersey-connector/pom.xml b/openstack-client-connectors/jersey-connector/pom.xml index 0281df1d6..1b2ee1960 100644 --- a/openstack-client-connectors/jersey-connector/pom.xml +++ b/openstack-client-connectors/jersey-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.9 + 3.2.10-SNAPSHOT jersey-connector OpenStack Jersey Connector diff --git a/openstack-client-connectors/jersey2-connector/pom.xml b/openstack-client-connectors/jersey2-connector/pom.xml index 86c69d6be..e2c45a753 100644 --- a/openstack-client-connectors/jersey2-connector/pom.xml +++ b/openstack-client-connectors/jersey2-connector/pom.xml @@ -4,7 +4,7 @@ com.woorea openstack-client-connectors - 3.2.9 + 3.2.10-SNAPSHOT jersey2-connector OpenStack Jersey2 Connector @@ -27,7 +27,7 @@ com.woorea openstack-client - 3.2.9 + 3.2.10-SNAPSHOT diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index 34619634e..eeb26fb02 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT openstack-client-connectors OpenStack Client Connectors @@ -42,7 +42,7 @@ com.woorea openstack-client - 3.2.9 + 3.2.10-SNAPSHOT \ No newline at end of file diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml index 026ff5156..be0b2acb5 100644 --- a/openstack-client-connectors/resteasy-connector/pom.xml +++ b/openstack-client-connectors/resteasy-connector/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-client-connectors - 3.2.9 + 3.2.10-SNAPSHOT resteasy-connector OpenStack RESTEasy Connector diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index e98145825..58e160b63 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT openstack-client OpenStack Client diff --git a/openstack-console/pom.xml b/openstack-console/pom.xml index 1712746da..46d735c3e 100644 --- a/openstack-console/pom.xml +++ b/openstack-console/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT openstack-console OpenStack Console @@ -22,12 +22,12 @@ com.woorea keystone-client - 3.2.9 + 3.2.10-SNAPSHOT com.woorea nova-client - 3.2.9 + 3.2.10-SNAPSHOT diff --git a/openstack-examples/pom.xml b/openstack-examples/pom.xml index dda360944..b9bb31134 100644 --- a/openstack-examples/pom.xml +++ b/openstack-examples/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT UTF-8 diff --git a/pom.xml b/pom.xml index f21b3b882..f25f715d4 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT pom OpenStack Java SDK OpenStack Java SDK diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index acd5deac4..ae3968959 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT quantum-client OpenStack Quantum Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.9 + 3.2.10-SNAPSHOT com.woorea quantum-model - 3.2.9 + 3.2.10-SNAPSHOT diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index 86e34b689..a441743df 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT quantum-model OpenStack Quantum Model diff --git a/swift-client/pom.xml b/swift-client/pom.xml index 7b6661a20..2f30057a8 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT swift-client OpenStack Swift Client @@ -12,12 +12,12 @@ com.woorea openstack-client - 3.2.9 + 3.2.10-SNAPSHOT com.woorea swift-model - 3.2.9 + 3.2.10-SNAPSHOT \ No newline at end of file diff --git a/swift-model/pom.xml b/swift-model/pom.xml index 49a8157ef..da007e95e 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -3,7 +3,7 @@ com.woorea openstack-java-sdk - 3.2.9 + 3.2.10-SNAPSHOT swift-model OpenStack Swift Model