cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [5/5] git commit: updated refs/heads/master to ec847a8
Date Sat, 24 Dec 2016 04:09:49 GMT
Merge pull request #1638 from shapeblue/spring4-java8-only

CLOUDSTACK-9456: Migrate master to Spring 4.xThis changes makes CloudStack use spring 4:

```
- Bump spring-framework version to 4.x and Jetty to version that runs with JDK7
- Bump servet dependency version
- Migrates various xmls to use version independent schema uris
```

Outstanding issue:
    - Testing of various non-standard plugins such as network and storage plugins etc.

Since, this is a big change pinging for review -- @jburwell @karuturi @wido @murali-reddy
@abhinandanprateek @DaanHoogland @GaborApatiNagy @JayapalUradi @kishankavala @K0zka @nvazquez
@rafaelweingartner @pyr and others

@blueorangutan package

* pr/1638:
  CLOUDSTACK-9456: Update Spring version in maven poms

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ec847a89
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec847a89
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec847a89

Branch: refs/heads/master
Commit: ec847a890ee93a74c5a56c4d30cf303d5d941c49
Parents: a9f45df 0dce1c5
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Sat Dec 24 08:46:05 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Sat Dec 24 09:39:18 2016 +0530

----------------------------------------------------------------------
 .../api-config/spring-api-config-context.xml    |  6 +--
 .../api-planner/spring-api-planner-context.xml  |  6 +--
 client/pom.xml                                  |  7 ++++
 .../cloudstack/webApplicationContext.xml        |  6 +--
 core/pom.xml                                    |  2 +-
 .../allocator/spring-core-allocator-context.xml |  6 +--
 ...-lifecycle-allocator-context-inheritable.xml |  6 +--
 ...g-core-lifecycle-api-context-inheritable.xml |  6 +--
 .../spring-bootstrap-context-inheritable.xml    |  6 +--
 .../bootstrap/spring-bootstrap-context.xml      |  6 +--
 ...re-lifecycle-compute-context-inheritable.xml |  6 +--
 .../cloudstack/core/spring-core-context.xml     |  6 +--
 ...-core-lifecycle-core-context-inheritable.xml |  6 +--
 .../core/spring-core-registry-core-context.xml  |  6 +--
 ...lifecycle-discoverer-context-inheritable.xml |  6 +--
 ...re-lifecycle-network-context-inheritable.xml |  6 +--
 ...-outofbandmanagement-context-inheritable.xml |  6 +--
 ...re-lifecycle-planner-context-inheritable.xml |  6 +--
 ...ng-lifecycle-storage-context-inheritable.xml |  6 +--
 .../spring-core-system-context-inheritable.xml  |  6 +--
 .../system/spring-core-system-context.xml       |  6 +--
 .../core/spring-engine-api-core-context.xml     |  6 +--
 ...pring-engine-components-api-core-context.xml |  6 +--
 ...spring-engine-orchestration-core-context.xml |  8 ++--
 .../test/resource/provisioningContext.xml       |  8 ++--
 .../spring-engine-schema-core-daos-context.xml  |  6 +--
 ...ng-engine-schema-system-checkers-context.xml |  6 +--
 ...spring-engine-storage-cache-core-context.xml |  6 +--
 ...g-engine-storage-datamotion-core-context.xml |  6 +--
 ...ngine-storage-datamotion-storage-context.xml |  6 +--
 ...spring-engine-storage-image-core-context.xml |  6 +--
 .../test/resource/fakeDriverTestContext.xml     |  8 ++--
 .../resources/StorageAllocatorTestContext.xml   |  8 ++--
 .../test/resources/component.xml                |  8 ++--
 .../test/resources/storageContext.xml           |  8 ++--
 .../core/spring-engine-storage-core-context.xml |  6 +--
 ...engine-storage-storage-allocator-context.xml |  6 +--
 ...ing-engine-storage-snapshot-core-context.xml |  6 +--
 ...-engine-storage-snapshot-storage-context.xml |  6 +--
 .../resources/SnapshotManagerTestContext.xml    |  8 ++--
 ...pring-engine-storage-volume-core-context.xml |  6 +--
 .../volume/test/resource/testContext.xml        |  8 ++--
 .../spring-framework-cluster-core-context.xml   |  6 +--
 ...mework-config-system-context-inheritable.xml |  6 +--
 .../spring-framework-config-system-context.xml  |  6 +--
 .../spring-framework-db-system-context.xml      |  6 +--
 .../core/spring-framework-ipc-core-context.xml  |  6 +--
 .../test/resources/MessageBusTestContext.xml    |  8 ++--
 .../SampleManagementServerAppContext.xml        |  8 ++--
 .../core/spring-framework-jobs-core-context.xml |  6 +--
 .../resources/AsyncJobManagerTestContext.xml    |  8 ++--
 framework/jobs/test/resources/commonContext.xml |  8 ++--
 .../quota/spring-framework-quota-context.xml    |  6 +--
 .../spring-framework-security-core-context.xml  |  6 +--
 .../module/model/impl/defaults-context.xml      |  4 +-
 .../testfiles/all/empty-context-inheritable.xml |  4 +-
 .../resources/testfiles/all/empty-context.xml   |  4 +-
 .../all/empty2-context-inheritable.xml          |  4 +-
 .../resources/testfiles/all/empty2-context.xml  |  4 +-
 .../resources/testfiles/good/empty-context.xml  |  4 +-
 .../base/test-context-inheritable.xml           |  4 +-
 .../testhierarchy/base/test-context.xml         |  4 +-
 .../testhierarchy/child1-1/test-context.xml     |  4 +-
 .../child1/test-context-override.xml            |  4 +-
 .../testhierarchy/child1/test-context.xml       |  4 +-
 .../testhierarchy/child2/test-context.xml       |  4 +-
 .../testhierarchy/excluded/test-context.xml     |  4 +-
 .../testhierarchy/excluded2/test-context.xml    |  4 +-
 .../orphan-of-excluded/test-context.xml         |  4 +-
 .../testhierarchy/orphan1/test-context.xml      |  4 +-
 .../spring-acl-dynamic-role-based-context.xml   |  6 +--
 .../spring-acl-static-role-based-context.xml    |  6 +--
 .../spring-explicit-dedication-context.xml      |  6 +--
 .../spring-host-anti-affinity-context.xml       |  6 +--
 .../rate-limit/spring-rate-limit-context.xml    |  6 +--
 .../spring-solidfire-intg-test-context.xml      |  6 +--
 .../cloudstack/quota/spring-quota-context.xml   |  6 +--
 .../spring-dedicated-resources-core-context.xml |  6 +--
 .../test/resource/dedicatedContext.xml          |  8 ++--
 .../spring-implicit-dedication-context.xml      |  6 +--
 .../spring-user-concentrated-pod-context.xml    |  6 +--
 plugins/event-bus/kafka/pom.xml                 |  2 +-
 plugins/event-bus/rabbitmq/pom.xml              |  2 +-
 .../spring-skip-heurestics-context.xml          |  6 +--
 .../spring-host-allocator-random-context.xml    |  6 +--
 .../spring-baremetal-compute-context.xml        |  6 +--
 .../spring-baremetal-discoverer-context.xml     |  6 +--
 .../spring-baremetal-network-context.xml        |  6 +--
 .../spring-baremetal-planner-context.xml        |  6 +--
 .../spring-baremetal-storage-context.xml        |  6 +--
 .../core/spring-baremetal-core-context.xml      |  6 +--
 .../core/spring-hyperv-core-context.xml         |  6 +--
 .../spring-hyperv-compute-context.xml           |  6 +--
 .../spring-hyperv-discoverer-context.xml        |  6 +--
 .../kvm-compute/spring-kvm-compute-context.xml  |  6 +--
 .../ovm-compute/spring-ovm-compute-context.xml  |  6 +--
 .../spring-ovm-discoverer-context.xml           |  6 +--
 .../spring-ovm3-compute-context.xml             |  6 +--
 .../spring-ovm3-discoverer-context.xml          |  6 +--
 .../core/spring-simulator-core-context.xml      |  6 +--
 .../spring-simulator-compute-context.xml        |  6 +--
 .../spring-simulator-discover-context.xml       |  6 +--
 .../spring-simulator-storage-context.xml        |  6 +--
 .../cloudstack/core/spring-ucs-core-context.xml |  6 +--
 .../core/spring-vmware-core-context.xml         |  6 +--
 .../spring-vmware-compute-context.xml           |  6 +--
 .../spring-vmware-discoverer-context.xml        |  6 +--
 .../spring-vmware-network-context.xml           |  6 +--
 .../spring-vmware-storage-context.xml           |  6 +--
 .../spring-xenserver-compute-context.xml        |  6 +--
 .../spring-xenserver-discoverer-context.xml     |  6 +--
 .../bigswitch/spring-bigswitch-context.xml      |  6 +--
 .../cloudstack/vcs/spring-vcs-context.xml       |  6 +--
 .../cisco-vnmc/spring-cisco-vnmc-context.xml    |  6 +--
 .../cloudstack/elb/spring-elb-context.xml       |  6 +--
 .../cloudstack/f5/spring-f5-context.xml         |  6 +--
 plugins/network-elements/globodns/pom.xml       |  2 +-
 .../globodns/spring-globodns-context.xml        |  6 +--
 .../resource/GloboDnsResourceTest.java          |  7 ----
 .../core/spring-internallb-core-context.xml     |  6 +--
 .../test/resources/lb_element.xml               |  8 ++--
 .../test/resources/lb_mgr.xml                   |  8 ++--
 .../test/resources/lb_svc.xml                   |  8 ++--
 .../contrail/spring-contrail-context.xml        |  6 +--
 ...ring-contrail-system-context-inheritable.xml |  6 +--
 .../test/resources/commonContext.xml            |  8 ++--
 .../test/resources/providerContext.xml          |  8 ++--
 .../test/resources/publicNetworkContext.xml     |  8 ++--
 .../cloudstack/srx/spring-srx-context.xml       |  6 +--
 .../midonet/spring-midonet-context.xml          |  6 +--
 .../netscaler/spring-netscaler-context.xml      |  6 +--
 .../cloudstack/nvp/spring-nvp-context.xml       |  6 +--
 .../cloudstack/vsp/spring-vsp-context.xml       |  6 +--
 .../spring-opendaylight-context.xml             |  6 +--
 .../cloudstack/ovs/spring-ovs-context.xml       |  6 +--
 .../paloalto/spring-paloalto-context.xml        |  6 +--
 .../cloudstack/ssp/spring-ssp-context.xml       |  6 +--
 .../cloudstack/vxlan/spring-vxlan-context.xml   |  6 +--
 .../ipmitool/spring-ipmitool-context.xml        |  6 +--
 .../spring-storage-image-default-context.xml    |  6 +--
 .../spring-storage-image-s3-context.xml         |  6 +--
 .../spring-storage-image-swift-context.xml      |  6 +--
 plugins/storage/volume/cloudbyte/pom.xml        |  2 +-
 .../spring-storage-volume-cloudbyte-context.xml |  6 +--
 .../spring-storage-volume-default-context.xml   |  6 +--
 .../spring-storage-volume-nexenta-context.xml   |  6 +--
 .../spring-storage-volume-solidfire-context.xml |  6 +--
 .../solidfire/test/resource/storageContext.xml  |  8 ++--
 .../cloudstack/ldap/spring-ldap-context.xml     |  6 +--
 .../cloudstack/md5/spring-md5-context.xml       |  6 +--
 .../cloudstack/pbkdf2/spring-pbkdf2-context.xml |  6 +--
 .../plaintext/spring-plaintext-context.xml      |  6 +--
 .../cloudstack/saml2/spring-saml2-context.xml   |  6 +--
 .../spring-sha256salted-context.xml             |  6 +--
 pom.xml                                         | 39 ++++++++------------
 .../spring-quickcloud-core-context-override.xml |  6 +--
 .../spring-server-core-managers-context.xml     |  8 ++--
 .../core/spring-server-core-misc-context.xml    |  6 +--
 ...ing-server-alert-adapter-backend-context.xml |  6 +--
 ...ing-server-alert-adapter-compute-context.xml |  6 +--
 ...ing-server-alert-adapter-storage-context.xml |  6 +--
 .../spring-server-allocator-context.xml         |  6 +--
 .../server-api/spring-server-api-context.xml    |  6 +--
 .../spring-server-compute-context.xml           |  6 +--
 .../spring-server-discoverer-context.xml        |  6 +--
 .../spring-server-fencer-context.xml            |  6 +--
 .../spring-server-investigator-context.xml      |  6 +--
 .../spring-server-network-context.xml           |  6 +--
 .../spring-server-planner-context.xml           |  6 +--
 .../spring-server-storage-context.xml           |  6 +--
 .../spring-server-template-adapter-context.xml  |  6 +--
 .../system/spring-server-system-context.xml     |  6 +--
 .../cloud/upgrade/databaseCreatorContext.xml    |  8 ++--
 .../vm/DeploymentPlanningManagerImplTest.java   |  6 ++-
 .../resources/CloneSettingDaoTestContext.xml    |  8 ++--
 .../SecurityGroupManagerTestContext.xml         |  8 ++--
 .../test/resources/SnapshotDaoTestContext.xml   |  8 ++--
 .../resources/StoragePoolDaoTestContext.xml     |  8 ++--
 server/test/resources/UserVMDaoTestContext.xml  |  8 ++--
 server/test/resources/VpcApiUnitTestContext.xml |  8 ++--
 server/test/resources/VpcTestContext.xml        |  8 ++--
 server/test/resources/appLoadBalancer.xml       |  8 ++--
 server/test/resources/createNetworkOffering.xml |  8 ++--
 server/test/resources/testContext.xml           |  8 ++--
 .../spring-iam-access-checkers-context.xml      |  6 +--
 .../core/spring-iam-server-context.xml          |  6 +--
 ...econdary-storage-controller-core-context.xml |  6 +--
 ...ing-secondary-storage-discoverer-context.xml |  6 +--
 usage/pom.xml                                   |  6 +--
 usage/resources/usageApplicationContext.xml     |  8 ++--
 .../test/resources/UsageManagerTestContext.xml  |  8 ++--
 utils/pom.xml                                   |  2 +-
 .../com/cloud/utils/QualifierTestContext.xml    |  8 ++--
 .../utils/db/transactionContextBuilderTest.xml  |  8 ++--
 utils/src/test/resources/testContext.xml        |  8 ++--
 195 files changed, 610 insertions(+), 613 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec847a89/plugins/event-bus/kafka/pom.xml
----------------------------------------------------------------------
diff --cc plugins/event-bus/kafka/pom.xml
index abf083f,abf083f..7aea90c
--- a/plugins/event-bus/kafka/pom.xml
+++ b/plugins/event-bus/kafka/pom.xml
@@@ -36,7 -36,7 +36,7 @@@
      <dependency>
        <groupId>org.apache.kafka</groupId>
        <artifactId>kafka-clients</artifactId>
--      <version>0.9.0.1</version>
++      <version>0.10.1.1</version>
      </dependency>
    </dependencies>
    <build>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec847a89/plugins/event-bus/rabbitmq/pom.xml
----------------------------------------------------------------------
diff --cc plugins/event-bus/rabbitmq/pom.xml
index facfbba,facfbba..4998032
--- a/plugins/event-bus/rabbitmq/pom.xml
+++ b/plugins/event-bus/rabbitmq/pom.xml
@@@ -31,7 -31,7 +31,7 @@@
      <dependency>
      <groupId>com.rabbitmq</groupId>
        <artifactId>amqp-client</artifactId>
--        <version>3.6.1</version>
++        <version>3.6.6</version>
      </dependency>
      <dependency>
      <groupId>org.apache.cloudstack</groupId>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec847a89/plugins/network-elements/globodns/pom.xml
----------------------------------------------------------------------
diff --cc plugins/network-elements/globodns/pom.xml
index 0a6b6fa,0a6b6fa..e63ceef
--- a/plugins/network-elements/globodns/pom.xml
+++ b/plugins/network-elements/globodns/pom.xml
@@@ -31,7 -31,7 +31,7 @@@
      <dependency>
        <groupId>com.globo.globodns</groupId>
        <artifactId>globodns-client</artifactId>
--      <version>0.0.20</version>
++      <version>0.0.22</version>
      </dependency>
    </dependencies>
  </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec847a89/plugins/storage/volume/cloudbyte/pom.xml
----------------------------------------------------------------------
diff --cc plugins/storage/volume/cloudbyte/pom.xml
index c67ede5,c67ede5..dbfc84b
--- a/plugins/storage/volume/cloudbyte/pom.xml
+++ b/plugins/storage/volume/cloudbyte/pom.xml
@@@ -54,7 -54,7 +54,7 @@@
      <dependency>
  	<groupId>com.sun.jersey</groupId>
  	<artifactId>jersey-bundle</artifactId>
--	<version>1.19.1</version>
++	<version>1.19.3</version>
  </dependency>
    </dependencies>
    <build>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec847a89/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 4f2ddc6,a0decc5..73f6e7c
--- a/pom.xml
+++ b/pom.xml
@@@ -127,9 -120,9 +120,9 @@@
      <cs.joda-time.version>2.8.1</cs.joda-time.version>
      <cs.batik.version>1.8</cs.batik.version>
      <cs.servicemix.version>2.3.4_1</cs.servicemix.version>
-     <cs.jetty.version>9.2.15.v20160210</cs.jetty.version>
 -    <cs.jetty.version>9.2.19.v20160908</cs.jetty.version>
++    <cs.jetty.version>9.2.20.v20161216</cs.jetty.version>
      <cs.cxf.version>3.1.4</cs.cxf.version>
-     <cs.groovy.version>2.4.6</cs.groovy.version>
+     <cs.groovy.version>2.4.7</cs.groovy.version>
      <cs.nitro.version>10.1</cs.nitro.version>
    </properties>
  
@@@ -444,12 -437,12 +437,12 @@@
        <dependency>
          <groupId>org.aspectj</groupId>
          <artifactId>aspectjtools</artifactId>
--        <version>1.8.9</version>
++        <version>1.8.10</version>
        </dependency>
        <dependency>
          <groupId>org.aspectj</groupId>
          <artifactId>aspectjweaver</artifactId>
--        <version>1.8.9</version>
++        <version>1.8.10</version>
        </dependency>
        <dependency>
          <groupId>org.apache.axis</groupId>
@@@ -474,12 -467,12 +467,12 @@@
        <dependency>
          <groupId>org.slf4j</groupId>
          <artifactId>slf4j-api</artifactId>
--        <version>1.7.21</version>
++        <version>1.7.22</version>
        </dependency>
        <dependency>
          <groupId>org.slf4j</groupId>
          <artifactId>slf4j-log4j12</artifactId>
--        <version>1.7.21</version>
++        <version>1.7.22</version>
        </dependency>
      </dependencies>
    </dependencyManagement>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec847a89/usage/pom.xml
----------------------------------------------------------------------
diff --cc usage/pom.xml
index 8d60a6a,25d16e1..b5536b1
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@@ -53,12 -53,12 +53,12 @@@
       <dependency>
          <groupId>org.slf4j</groupId>
          <artifactId>slf4j-api</artifactId>
--        <version>1.7.21</version>
++        <version>1.7.22</version>
        </dependency>
        <dependency>
          <groupId>org.slf4j</groupId>
          <artifactId>slf4j-log4j12</artifactId>
--        <version>1.7.21</version>
++        <version>1.7.22</version>
        </dependency>
      <dependency>
        <groupId>org.dbunit</groupId>


Mime
View raw message