[ovirt-engine-sdk-java] Update to upstream version 3.4.3.0
Juan Hernandez
jhernand at fedoraproject.org
Fri Jul 18 13:06:41 UTC 2014
commit 4a83fa3afd2329ef2f3e2770b8230dab48c16ab4
Author: Juan Hernandez <juan.hernandez at redhat.com>
Date: Fri Jul 18 13:56:59 2014 +0200
Update to upstream version 3.4.3.0
Signed-off-by: Juan Hernandez <juan.hernandez at redhat.com>
.gitignore | 1 +
ovirt-engine-sdk-java-addapt-to-log4j-2.patch | 180 +++++++++++++++++++++++++
ovirt-engine-sdk-java.spec | 31 ++++-
sources | 2 +-
4 files changed, 209 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd46e01..9ebd0f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/ovirt-engine-sdk-java-1.0.0.18.tar.xz
/ovirt-engine-sdk-java-3.4.0.7.tar.xz
+/ovirt-engine-sdk-java-3.4.3.0.tar.xz
diff --git a/ovirt-engine-sdk-java-addapt-to-log4j-2.patch b/ovirt-engine-sdk-java-addapt-to-log4j-2.patch
new file mode 100644
index 0000000..f3a14a6
--- /dev/null
+++ b/ovirt-engine-sdk-java-addapt-to-log4j-2.patch
@@ -0,0 +1,180 @@
+From f84aaa4190616d7e2417cac82aa299320978c212 Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Fri, 18 Jul 2014 14:58:02 +0200
+Subject: [PATCH] Adapt to Log4j 2.0
+
+Change-Id: I7d0cd9dd9e6ec57d877152a618ef9ecd589ecbf4
+---
+ ovirt-engine-sdk-java/pom.xml | 6 +--
+ .../src/main/java/org/ovirt/engine/sdk/Api.java | 54 ----------------------
+ 2 files changed, 3 insertions(+), 57 deletions(-)
+
+diff --git a/ovirt-engine-sdk-java/pom.xml b/ovirt-engine-sdk-java/pom.xml
+index ce3e88f..339bbb7 100644
+--- a/ovirt-engine-sdk-java/pom.xml
++++ b/ovirt-engine-sdk-java/pom.xml
+@@ -18,7 +18,7 @@
+ <findbugs.version>2.5.1</findbugs.version>
+ <test-jar.plugin.version>2.2</test-jar.plugin.version>
+ <javassist.version>3.12.0.GA</javassist.version>
+- <log4j.version>1.2.16</log4j.version>
++ <log4j.version>2.0</log4j.version>
+ <maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
+ <resources.plugin.version>2.4.3</resources.plugin.version>
+ <release.plugin.version>2.0</release.plugin.version>
+@@ -48,8 +48,8 @@
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+- <groupId>log4j</groupId>
+- <artifactId>log4j</artifactId>
++ <groupId>org.apache.logging.log4j</groupId>
++ <artifactId>log4j-1.2-api</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java
+index d69bb86..379adcf 100644
+--- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java
++++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java
+@@ -23,10 +23,6 @@ package org.ovirt.engine.sdk;
+ import java.io.IOException;
+
+ import org.apache.http.client.ClientProtocolException;
+-import org.apache.log4j.ConsoleAppender;
+-import org.apache.log4j.Level;
+-import org.apache.log4j.Logger;
+-import org.apache.log4j.PatternLayout;
+ import org.ovirt.engine.sdk.web.ConnectionsPool;
+ import org.ovirt.engine.sdk.web.ConnectionsPoolBuilder;
+ import org.ovirt.engine.sdk.web.HttpProxy;
+@@ -90,7 +86,6 @@ public class Api implements AutoCloseable {
+ public Api(String url, String username, String password) throws ClientProtocolException,
+ ServerException, IOException, UnsecuredConnectionAttemptError {
+
+- configureLog4J();
+ ConnectionsPool pool = new ConnectionsPoolBuilder(url, username, password).build();
+ HttpProxy httpProxy = new HttpProxyBuilder(pool).build();
+ this.proxy = new HttpProxyBroker(httpProxy);
+@@ -121,7 +116,6 @@ public class Api implements AutoCloseable {
+ throws ClientProtocolException, ServerException, IOException,
+ UnsecuredConnectionAttemptError {
+
+- configureLog4J();
+ ConnectionsPool pool = new ConnectionsPoolBuilder(url, username, password)
+ .keyStorePath(keyStorePath)
+ .build();
+@@ -159,7 +153,6 @@ public class Api implements AutoCloseable {
+ String keyStorePassword, Boolean filter) throws ClientProtocolException,
+ ServerException, UnsecuredConnectionAttemptError, IOException {
+
+- configureLog4J();
+ ConnectionsPool pool = new ConnectionsPoolBuilder(url, username, password)
+ .keyStorePath(keyStorePath)
+ .keyStorePassword(keyStorePassword)
+@@ -191,7 +184,6 @@ public class Api implements AutoCloseable {
+ public Api(String url, String sessionid) throws ClientProtocolException, ServerException,
+ IOException, UnsecuredConnectionAttemptError {
+
+- configureLog4J();
+ ConnectionsPool pool = new ConnectionsPoolBuilder(url).build();
+ HttpProxy httpProxy = new HttpProxyBuilder(pool)
+ .sessionid(sessionid)
+@@ -225,7 +217,6 @@ public class Api implements AutoCloseable {
+ throws ClientProtocolException, ServerException, UnsecuredConnectionAttemptError,
+ IOException {
+
+- configureLog4J();
+ ConnectionsPool pool = new ConnectionsPoolBuilder(url, username, password)
+ .noHostVerification(noHostVerification)
+ .build();
+@@ -258,7 +249,6 @@ public class Api implements AutoCloseable {
+ throws ClientProtocolException, ServerException, UnsecuredConnectionAttemptError,
+ IOException {
+
+- configureLog4J();
+ ConnectionsPool pool = new ConnectionsPoolBuilder(url)
+ .noHostVerification(noHostVerification)
+ .build();
+@@ -296,7 +286,6 @@ public class Api implements AutoCloseable {
+ Boolean filter) throws ClientProtocolException, ServerException,
+ UnsecuredConnectionAttemptError, IOException {
+
+- configureLog4J();
+ ConnectionsPool pool = new ConnectionsPoolBuilder(url, username, password)
+ .noHostVerification(noHostVerification)
+ .build();
+@@ -345,7 +334,6 @@ public class Api implements AutoCloseable {
+ Boolean filter, Boolean debug) throws ClientProtocolException, ServerException,
+ UnsecuredConnectionAttemptError, IOException {
+
+- configureLog4J(debug);
+ ConnectionsPool pool = new ConnectionsPoolBuilder(url, username, password)
+ .port(port)
+ .requestTimeout(requestTimeout)
+@@ -401,7 +389,6 @@ public class Api implements AutoCloseable {
+ Boolean noHostVerification, Boolean filter, Boolean debug) throws ClientProtocolException,
+ ServerException, UnsecuredConnectionAttemptError, IOException {
+
+- configureLog4J(debug);
+ ConnectionsPool pool = new ConnectionsPoolBuilder(url, username, password)
+ .port(port)
+ .requestTimeout(requestTimeout)
+@@ -462,7 +449,6 @@ public class Api implements AutoCloseable {
+ Boolean filter, Boolean debug) throws ClientProtocolException,
+ ServerException, UnsecuredConnectionAttemptError, IOException {
+
+- configureLog4J(debug);
+ ConnectionsPool pool = new ConnectionsPoolBuilder(url, username, password)
+ .port(port)
+ .requestTimeout(requestTimeout)
+@@ -481,46 +467,6 @@ public class Api implements AutoCloseable {
+ }
+
+ /**
+- * Configures log4j
+- */
+- private void configureLog4J() {
+- configureLog4J(Boolean.FALSE);
+- }
+-
+- /**
+- * Configures log4j
+- *
+- * @param debug
+- */
+- private void configureLog4J(Boolean debug) {
+- String patternLayout = "%d %-5p [%c] %m%n";
+- if (debug != null && Boolean.TRUE.equals(debug)) {
+-
+- Logger rootLogger = Logger.getRootLogger();
+- if (!rootLogger.getAllAppenders().hasMoreElements()) {
+- rootLogger.setLevel(Level.INFO);
+- rootLogger.addAppender(new ConsoleAppender(
+- new PatternLayout(patternLayout)));
+-
+- }
+- Logger pkgLogger =
+- rootLogger.getLoggerRepository()
+- .getLogger("org.apache.http");
+- pkgLogger.setLevel(Level.DEBUG);
+- pkgLogger.addAppender(new ConsoleAppender(
+- new PatternLayout(patternLayout)));
+-
+- } else {
+- Logger rootLogger = Logger.getRootLogger();
+- if (!rootLogger.getAllAppenders().hasMoreElements()) {
+- rootLogger.setLevel(Level.OFF);
+- rootLogger.addAppender(new ConsoleAppender(
+- new PatternLayout(patternLayout)));
+- }
+- }
+- }
+-
+- /**
+ * Fetches /api entry point
+ *
+ * @return API object instance
+--
+1.9.3
+
diff --git a/ovirt-engine-sdk-java.spec b/ovirt-engine-sdk-java.spec
index f8824c2..9867ec9 100644
--- a/ovirt-engine-sdk-java.spec
+++ b/ovirt-engine-sdk-java.spec
@@ -1,6 +1,6 @@
Name: ovirt-engine-sdk-java
-Version: 3.4.0.7
-Release: 2%{?dist}
+Version: 3.4.3.0
+Release: 1%{?dist}
Summary: oVirt Engine Software Development Kit (Java)
Group: Development/Libraries
License: ASL 2.0
@@ -8,21 +8,25 @@ URL: http://ovirt.org
# git clone git://gerrit.ovirt.org/ovirt-engine-sdk-java
# cd ovirt-engine-sdk-java
-# git archive --prefix ovirt-engine-sdk-java-3.4.0.7/ 3.4.0.7 | xz > ovirt-engine-sdk-java-3.4.0.7.tar.xz
+# git archive --prefix ovirt-engine-sdk-java-3.4.3.0/ 3.4.3.0 | xz > ovirt-engine-sdk-java-3.4.3.0.tar.xz
Source: %{name}-%{version}.tar.xz
+# Adapt the source to use Log4j 2.0:
+Patch0: ovirt-engine-sdk-java-addapt-to-log4j-2.patch
+
BuildArch: noarch
BuildRequires: apache-commons-compress
BuildRequires: apache-commons-logging
BuildRequires: httpcomponents-client
BuildRequires: junit
+BuildRequires: log4j
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-source-plugin
BuildRequires: maven-local
+BuildRequires: maven-source-plugin
%description
@@ -44,6 +48,9 @@ This package provides %{name}.
# Extract the source:
%setup -q
+# Apply the patches:
+%patch0 -p1
+
# In the tree provided by the upstream project the relevant source for this
# package is inside a subdirectory, but our build tools expect the POM files in
# the current directory, so in order to simplify things we move everything to
@@ -73,6 +80,22 @@ mv ovirt-engine-sdk-java/* .
%changelog
+* Fri Jul 18 2014 Juan Hernandez <juan.hernandez at redhat.com> - 3.4.3.0-1
+- Update to upstream version 3.4.3.0.
+- Add patch to adapt to Log4j 2.0.
+- Add expect and correlationId parameters to network labels related
+ methods #1101531.
+- Add method to get entity by string id #1099818.
+- Added maintenance operation to VM.
+- Added hosted_engine element to Host.
+- Added labels to Network.
+- Added labels to HostNIC.
+- Added actions to preview, commit and undo snapshots.
+- Added support for affinity groups.
+- Added support to import a VM as template.
+- Removed external_id from users and groups.
+- Renamed cloud_init.hostname to cloud_init.host.address.
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.0.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 8a23926..159d6b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3b1bd034727f93e164272ae0cd828cba ovirt-engine-sdk-java-3.4.0.7.tar.xz
+b2e44aba11700024f7881f4fb650ddba ovirt-engine-sdk-java-3.4.3.0.tar.xz
More information about the scm-commits
mailing list