You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jclouds.apache.org by Adrian Cole <no...@github.com> on 2014/10/11 19:56:13 UTC

[jclouds-labs] Fold dmtf into vcloud-director (its only user). (#90)

Simplifies the build and localizes vcloud-director maintenance.
You can merge this Pull Request by running:

  git pull https://github.com/adriancole/jclouds-labs adrian.fold-dmtf-fix-imports

Or you can view, comment on it, or merge it online at:

  https://github.com/jclouds/jclouds-labs/pull/90

-- Commit Summary --

  * Fold dmtf into vcloud-director (its only user).

-- File Changes --

    D dmtf/pom.xml (52)
    M pom.xml (1)
    M vcloud-director/pom.xml (25)
    R vcloud-director/src/main/java/org/jclouds/dmtf/CIMPredicates.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/DMTFConstants.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleTypeAdapter.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimReference.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/OSType.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationCaption.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationChangeableType.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemCaption.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemChangeableType.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/functions/HardwareBuilderFromResourceAllocations.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/cim/package-info.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Configuration.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Disk.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Network.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSectionProperty.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/PropertyConfigurationValueType.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSectionItem.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EntityType.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EnvironmentType.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/Property.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/package-info.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/package-info.java (0)
    R vcloud-director/src/main/java/org/jclouds/dmtf/ovf/package-info.java (0)

-- Patch Links --

https://github.com/jclouds/jclouds-labs/pull/90.patch
https://github.com/jclouds/jclouds-labs/pull/90.diff

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs/pull/90

Re: [jclouds-labs] Fold dmtf into vcloud-director (its only user). (#90)

Posted by Andrew Phillips <no...@github.com>.
> @@ -52,43 +52,32 @@
>      <!-- URN format: ex. urn:vcloud:user:7212e451-76e1-4631-b2de-ba1dfd8080e4 -->
>      <test.vcloud-director.user-id />
>  
> -    <jclouds.osgi.export>org.jclouds.vcloud.director.v1_5*;version="${project.version}"</jclouds.osgi.export>
> -    <jclouds.osgi.import>
> -      org.jclouds.compute.internal;version="${jclouds.version}",
> -      org.jclouds.rest.internal;version="${jclouds.version}",
> -      org.jclouds.labs*;version="${project.version}",
> -      org.jclouds*;version="${jclouds.version}",
> -      *
> -    </jclouds.osgi.import>
> +    <jclouds.osgi.export>org.jclouds.vcloud.director.v1_5*;version="${project.version}",org.jclouds.dmtf*;version="${project.parent.version}"</jclouds.osgi.export>
> +    <jclouds.osgi.import>org.jclouds*;version="${project.parent.version}",*</jclouds.osgi.import>

Stick with `jclouds.version` here? It generally will be the same as the parent version, but not always. From what I can see (cf. e.g. the [Abiquo POM](https://github.com/jclouds/jclouds-labs/blob/master/abiquo/pom.xml)), versions of deps from jclouds core use `jclouds.version`

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs/pull/90/files#r18745281

Re: [jclouds-labs] Fold dmtf into vcloud-director (its only user). (#90)

Posted by Andrew Phillips <no...@github.com>.
Only one comment about the use of `jclouds.version` vs. `project.parent.version`. Otherwise, good to go for me. Thanks for the cleanup, @adriancole!

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs/pull/90#issuecomment-58770864

Re: [jclouds-labs] Fold dmtf into vcloud-director (its only user). (#90)

Posted by Adrian Cole <no...@github.com>.
> @@ -52,43 +52,32 @@
>      <!-- URN format: ex. urn:vcloud:user:7212e451-76e1-4631-b2de-ba1dfd8080e4 -->
>      <test.vcloud-director.user-id />
>  
> -    <jclouds.osgi.export>org.jclouds.vcloud.director.v1_5*;version="${project.version}"</jclouds.osgi.export>
> -    <jclouds.osgi.import>
> -      org.jclouds.compute.internal;version="${jclouds.version}",
> -      org.jclouds.rest.internal;version="${jclouds.version}",
> -      org.jclouds.labs*;version="${project.version}",
> -      org.jclouds*;version="${jclouds.version}",
> -      *
> -    </jclouds.osgi.import>
> +    <jclouds.osgi.export>org.jclouds.vcloud.director.v1_5*;version="${project.version}",org.jclouds.dmtf*;version="${project.parent.version}"</jclouds.osgi.export>
> +    <jclouds.osgi.import>org.jclouds*;version="${project.parent.version}",*</jclouds.osgi.import>

done.

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs/pull/90/files#r18745588

Re: [jclouds-labs] Fold dmtf into vcloud-director (its only user). (#90)

Posted by Andrew Phillips <no...@github.com>.
>      </dependency>
>      <dependency>
>        <groupId>org.apache.jclouds</groupId>
>        <artifactId>jclouds-core</artifactId>
> -      <version>${jclouds.version}</version>
> +      <version>${project.parent.version}</version>

See above comment for here and below

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs/pull/90/files#r18745283

Re: [jclouds-labs] Fold dmtf into vcloud-director (its only user). (#90)

Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-labs-pull-requests #310](https://jclouds.ci.cloudbees.com/job/jclouds-labs-pull-requests/310/) SUCCESS
This pull request looks good

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs/pull/90#issuecomment-58758555

Re: [jclouds-labs] Fold dmtf into vcloud-director (its only user). (#90)

Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-labs-pull-requests #314](https://jclouds.ci.cloudbees.com/job/jclouds-labs-pull-requests/314/) SUCCESS
This pull request looks good

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs/pull/90#issuecomment-58772530

Re: [jclouds-labs] Fold dmtf into vcloud-director (its only user). (#90)

Posted by Adrian Cole <no...@github.com>.
merged into master, can pick into 1.8.x post 1.8.1

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs/pull/90#issuecomment-58772639

Re: [jclouds-labs] Fold dmtf into vcloud-director (its only user). (#90)

Posted by Adrian Cole <no...@github.com>.
Closed #90.

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs/pull/90#event-177338577

Re: [jclouds-labs] Fold dmtf into vcloud-director (its only user). (#90)

Posted by BuildHive <no...@github.com>.
[jclouds » jclouds-labs #1681](https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs/1681/) SUCCESS
This pull request looks good
[(what's this?)](https://www.cloudbees.com/what-is-buildhive)

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs/pull/90#issuecomment-58772708

Re: [jclouds-labs] Fold dmtf into vcloud-director (its only user). (#90)

Posted by BuildHive <no...@github.com>.
[jclouds » jclouds-labs #1676](https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs/1676/) SUCCESS
This pull request looks good
[(what's this?)](https://www.cloudbees.com/what-is-buildhive)

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs/pull/90#issuecomment-58758903

Re: [jclouds-labs] Fold dmtf into vcloud-director (its only user). (#90)

Posted by Adrian Cole <no...@github.com>.
@andreaturli @ccustine @nacx 

fishing for a plus one. I'll handle the api method deduping next.

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs/pull/90#issuecomment-58758367

Re: [jclouds-labs] Fold dmtf into vcloud-director (its only user). (#90)

Posted by Andrew Phillips <no...@github.com>.
> merged into master

Thanks, @adriancole!

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs/pull/90#issuecomment-58802856