You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jclouds.apache.org by Zack Shoylev <no...@github.com> on 2013/07/23 07:13:42 UTC
[jclouds-karaf] Separates parent and top level pom. (#22)
Ensures jclouds dependencies use parent version.
https://issues.apache.org/jira/browse/JCLOUDS-104
You can merge this Pull Request by running:
git pull https://github.com/rackerlabs/jclouds-karaf mvn-separate-parent
Or you can view, comment on it, or merge it online at:
https://github.com/jclouds/jclouds-karaf/pull/22
-- Commit Summary --
* Separates parent and top level pom.
-- File Changes --
M .gitignore (1)
M cache/pom.xml (7)
M chef/cache/pom.xml (2)
M chef/commands/pom.xml (10)
M chef/core/pom.xml (3)
M chef/pom.xml (5)
M chef/services/pom.xml (5)
M commands/pom.xml (18)
M core/pom.xml (8)
M feature/pom.xml (8)
M feature/src/main/resources/feature.xml (596)
M itests/pom.xml (11)
A jclouds-karaf-project/pom.xml (492)
M pom.xml (503)
M recipe/pom.xml (5)
M services/pom.xml (21)
M urlhandler/pom.xml (6)
M utils/pom.xml (4)
-- Patch Links --
https://github.com/jclouds/jclouds-karaf/pull/22.patch
https://github.com/jclouds/jclouds-karaf/pull/22.diff
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -28,6 +28,10 @@ limitations under the License.
> <artifactId>jclouds-karaf</artifactId>
> <packaging>pom</packaging>
> <name>JClouds :: Karaf :: Feature</name>
> +
> + <properties>
> + <jclouds.test.listener></jclouds.test.listener>
`<jclouds.test.listener />`?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5396824
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
Closed #22.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -37,7 +36,7 @@ limitations under the License.
> <osgi.import>
> javax.script,
> org.codehaus.groovy.jsr223,
> - org.jclouds.karaf.cache*;version=${project.version},
> + org.jclouds.karaf.cache*;version=${jclouds.version},
> org.jclouds.compute;version=${jclouds.version},
Now **this** is a tricky one! `${project.version}` or `${project.parent.version}` will not work here, since I guess the Maven release plugin _won't_ identify this as an external dependency, and won't give you the chance to specify which "main" version we need.
The only thing I could imagine would work here would be `${project.parent.parent.version}` (i.e. the version of jclouds-project), but I'm not sure if Maven handles that. We'll need to run `mvn release:prepare` and examine the output to verify, I think...
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493784
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> </dependency>
> <dependency>
> <groupId>org.apache.jclouds.karaf.chef</groupId>
> <artifactId>core</artifactId>
> + <version>${jclouds.version}</version>
This and all the above: `${project.version}` or `${project.parent.version}` - they're modules of the dependent project.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493792
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> Because I am fine with not having it, but want to make sure there won't be a need for it.
Agreed. Luckily, we can also _add_ a separate `<version>` tags if that turns out to be required.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#issuecomment-21833640
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> </dependency>
> <dependency>
> <groupId>org.apache.jclouds.driver</groupId>
> <artifactId>jclouds-sshj</artifactId>
> + <version>${jclouds.version}</version>
Same comment as for the other POMs - `${project.version}` or `${project.parent.version}` should work both for dependencies from the dependent project as well as those from the main project
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493870
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> </dependency>
> <dependency>
> <groupId>org.apache.jclouds</groupId>
> <artifactId>jclouds-scriptbuilder</artifactId>
> + <version>${jclouds.version}</version>
Same comment as for the other POMs - `${project.version}` or `${project.parent.version}` should work both for dependencies from the dependent project as well as those from the main project
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493828
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
> @@ -28,6 +28,10 @@ limitations under the License.
> <artifactId>jclouds-karaf</artifactId>
> <packaging>pom</packaging>
> <name>JClouds :: Karaf :: Feature</name>
> +
> + <properties>
> + <jclouds.test.listener></jclouds.test.listener>
This took a while to figure out. My theory is that it is an inherited property one of the plugins uses to register a test listener, which fails in karaf.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5401885
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> <artifactId>chef</artifactId>
> <packaging>pom</packaging>
> - <version>1.7.0-SNAPSHOT</version>
> + <!-- Same version as parent. Children have their own version -->
Actually, children _don't_ have their own version? Comment not needed (standard Maven behaviour)?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493816
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -61,10 +64,12 @@ limitations under the License.
> <dependency>
> <groupId>org.apache.jclouds</groupId>
> <artifactId>jclouds-compute</artifactId>
> + <version>${jclouds.version}</version>
> might not be snapshot dependencies if the project or project parent are not specified as snapshot?
During development, `${project.version}` will always be a snapshot dependency - at least, that's what I'm assuming. The only interesting moment is at release time. Then, `${project.version}` will be a non-snapshot _but may different from the jclouds main version_, e.g. if we release a hypothetical jclouds-karaf-1.7.0.fixup.1 (or whatever), this should probably still use 1.7.0 as the "main" dependency.
@iocanel: any thoughts on how to handle that case without a `<jclouds.version>` property?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5513174
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -9,6 +9,7 @@ target/
> *.iml
> *.iws
> *.ipr
> +*.class
> you would never want .class files added to git would you (regardless of location)
Well, I've had projects in which some precompiled stuff needed to be included, but fair point. My thinking was more that `bin`, like `target`, is a derived directory, so you don't want **anything** in `bin` included - `.class` files or not. And if `bin` also excludes the `.class` files I'd say two for the price of one ;-)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5405292
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> +Licensed to the Apache Software Foundation (ASF) under one or more
> +contributor license agreements. See the NOTICE file distributed with
> +this work for additional information regarding copyright ownership.
> +The ASF licenses this file to You under the Apache License, Version 2.0
> +(the "License"); you may not use this file except in compliance with
> +the License. You may obtain a copy of the License at
> +
> + http://www.apache.org/licenses/LICENSE-2.0
> +
> +Unless required by applicable law or agreed to in writing, software
> +distributed under the License is distributed on an "AS IS" BASIS,
> +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +See the License for the specific language governing permissions and
> +limitations under the License.
> +-->
> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
As with the [main project](https://github.com/jclouds/jclouds/tree/master/project), name the directory "project"?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5467295
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -34,7 +35,7 @@ limitations under the License.
> <osgi.export.service>org.jclouds.karaf.cache.CacheProvider</osgi.export.service>
> <osgi.import>
> org.jclouds.karaf.recipe*,
> - org.jclouds*;version=${jclouds.version},
> + org.jclouds*;version=${project.parent.version},
I don't think this will work, as the parent (jclouds-karaf-project) will still have a snapshot version when the main project is released. See comment about a `<jclouds.version>` property in the project POM below.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5440902
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +See the License for the specific language governing permissions and
> +limitations under the License.
> +-->
> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
> + <modelVersion>4.0.0</modelVersion>
> + <parent>
> + <groupId>org.apache.jclouds</groupId>
> + <artifactId>jclouds-project</artifactId>
> + <version>1.7.0-SNAPSHOT</version>
> + </parent>
> +
> + <groupId>org.apache.jclouds</groupId>
> + <artifactId>jclouds-karaf-project</artifactId>
> + <packaging>pom</packaging>
> + <version>1.7.0-SNAPSHOT</version>
Actually don't need this, I think. See comment below. A "trial run" with `mvn release:prepare` helped me for this one...
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5466630
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by BuildHive <no...@github.com>.
[jclouds » jclouds-karaf #215](https://buildhive.cloudbees.com/job/jclouds/job/jclouds-karaf/215/) FAILURE
Looks like there's a problem with this pull request
[(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-karaf/pull/22#issuecomment-21393655
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by BuildHive <no...@github.com>.
[jclouds » jclouds-karaf #239](https://buildhive.cloudbees.com/job/jclouds/job/jclouds-karaf/239/) 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-karaf/pull/22#issuecomment-21812914
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
> <version>1.7.0-SNAPSHOT</version>
> </parent>
> - <modelVersion>4.0.0</modelVersion>
> -
> - <groupId>org.apache.jclouds.karaf</groupId>
> +
modelVersion was moved up and groupId inherits from parent..?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5512748
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
Reopened #22.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Everett Toews <no...@github.com>.
Thanks for the pull request but it's release week in jclouds and that means it's time to clean up the PR queue. This PR will be over 6 months old as of April 1. If you intend to continue work on it, please make a comment by April 2. Otherwise it will be closed on April 3.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#issuecomment-85718867
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -9,6 +9,7 @@ target/
> *.iml
> *.iws
> *.ipr
> +*.class
Then add `bin` instead?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5402419
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -28,6 +28,10 @@ limitations under the License.
> <artifactId>jclouds-karaf</artifactId>
> <packaging>pom</packaging>
> <name>JClouds :: Karaf :: Feature</name>
> +
> + <properties>
> + <jclouds.test.listener></jclouds.test.listener>
Wow, good hunting! @iocanel any light you can shed on this..?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5402435
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
> + </configuration>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-release-plugin</artifactId>
> + <version>${maven-release-plugin.version}</version>
> + <configuration>
> + <useReleaseProfile>false</useReleaseProfile>
> + <goals>deploy</goals>
> + <arguments>-Pdoc -Papache-release ${arguments}</arguments>
> + </configuration>
> + </plugin>
> + </plugins>
> + </build>
> +
> + <properties>
Actually part of the idea of the other refactoring done (in cli and openstack-labs) is to avoid using jclouds.version.
The reason each project has its own version defined is to ensure that the parent or grandparent (jclouds) can be a different version than the child projects (karaf). Or am I missing something?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5464989
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> </dependency>
> <dependency>
> <groupId>org.apache.jclouds.api</groupId>
> <artifactId>chef</artifactId>
> + <version>${jclouds.version}</version>
Same comment as for the other POMs - `${project.version}` or `${project.parent.version}` should work both for dependencies from the dependent project as well as those from the main project
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493805
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -39,16 +39,19 @@ limitations under the License.
> </osgi.import>
> <osgi.private>org.jclouds.karaf.utils</osgi.private>
> <osgi.activator>org.jclouds.karaf.cache.Activator</osgi.activator>
> +
> </properties>
?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493633
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
> +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +See the License for the specific language governing permissions and
> +limitations under the License.
> +-->
> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
> + <modelVersion>4.0.0</modelVersion>
> + <parent>
> + <groupId>org.apache.jclouds</groupId>
> + <artifactId>jclouds-project</artifactId>
> + <version>1.7.0-SNAPSHOT</version>
> + </parent>
> +
> + <groupId>org.apache.jclouds</groupId>
> + <artifactId>jclouds-karaf-project</artifactId>
> + <packaging>pom</packaging>
> + <!-- VERSION same as parent -->
Hmm, my thinking was that the children's versions will be the release versions. I see what you are saying though.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5401946
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> <version>1.7.0-SNAPSHOT</version>
> </parent>
> - <modelVersion>4.0.0</modelVersion>
> -
> - <groupId>org.apache.jclouds.karaf</groupId>
> +
> <artifactId>cache</artifactId>
?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493623
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-karaf-pull-requests #8](https://jclouds.ci.cloudbees.com/job/jclouds-karaf-pull-requests/8/) FAILURE
Looks like there's a problem with this pull request
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#issuecomment-21419012
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by BuildHive <no...@github.com>.
[jclouds » jclouds-karaf #218](https://buildhive.cloudbees.com/job/jclouds/job/jclouds-karaf/218/) 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-karaf/pull/22#issuecomment-21431578
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by BuildHive <no...@github.com>.
[jclouds » jclouds-karaf #236](https://buildhive.cloudbees.com/job/jclouds/job/jclouds-karaf/236/) 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-karaf/pull/22#issuecomment-21768127
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> <parent>
> - <artifactId>jclouds-karaf</artifactId>
> - <groupId>org.apache.jclouds</groupId>
> + <groupId>org.apache.jclouds.karaf</groupId>
> + <artifactId>project</artifactId>
As with the main project and jclouds-cli, keep the _artifact ID_ as `jclouds-karaf-project`?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493666
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by BuildHive <no...@github.com>.
[jclouds » jclouds-karaf #227](https://buildhive.cloudbees.com/job/jclouds/job/jclouds-karaf/227/) 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-karaf/pull/22#issuecomment-21574682
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
However I am still a bit unclear on removing (or not) the version from the child projects.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#issuecomment-21768353
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
> @@ -9,6 +9,7 @@ target/
> *.iml
> *.iws
> *.ipr
> +*.class
I am not sure about the logic of this... you would never want .class files added to git would you (regardless of location)?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5403449
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
> @@ -61,10 +64,12 @@ limitations under the License.
> <dependency>
> <groupId>org.apache.jclouds</groupId>
> <artifactId>jclouds-compute</artifactId>
> + <version>${jclouds.version}</version>
That hits the nail on the head! I have not been able to find a perfect solution. What is the best practice to address this?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5513358
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -9,6 +9,7 @@ target/
> *.iml
> *.iws
> *.ipr
> +*.class
Any reason for this? `.class` files shouldn't be appearing anywhere outside `target/`, no?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5396538
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> + <repository>
> + <id>sonatype</id>
> + <url>https://oss.sonatype.org/content/repositories/releases/</url>
> + </repository>
> + <repository>
> + <id>maven2-repository.dev.java.net</id>
> + <name>Java.net Repository for Maven</name>
> + <url>http://download.java.net/maven/2/</url>
> + <layout>default</layout>
> + </repository>
> + </repositories>
> +
> + <profiles>
> + <!-- modifies the plugin config inherited from oss-parent -->
> + <profile>
> + <id>sonatype-release-profile-extension</id>
Not sure this is needed now we're with ASF? I know it's also still there in the [jclouds project POM, though](https://github.com/jclouds/jclouds/blob/master/project/pom.xml#L944). @abayer ..?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5396898
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
> </properties>
>
> <dependencies>
> <dependency>
> <groupId>org.apache.jclouds.karaf</groupId>
> <artifactId>recipe</artifactId>
> + <version>${jclouds.version}</version>
Let me elaborate a bit just in case
project.parent.parent.version does not resolve at all during the dependency check phase
project.parent.version and project.version do, but they might not be sufficient for more complex projects (with 3+ levels).
You also cannot use project.parent.version and project.version in a variable as it does not resolve where the variable is declared - it is resolved in the project where it is used.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5513302
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
Well then my question is, if we have to support version difference for releases, are we sure you don't need that during development? Because I am fine with not having it, but want to make sure there won't be a need for it.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#issuecomment-21807239
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
See https://github.com/jclouds/jclouds-cli/pull/14
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#issuecomment-21766793
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -32,6 +32,7 @@ limitations under the License.
> <dependency>
> <groupId>org.apache.jclouds.karaf</groupId>
> <artifactId>core</artifactId>
> + <version>${jclouds.version}</version>
Same comment as for the other POMs - `${project.version}` or `${project.parent.version}` should work both for dependencies from the dependent project as well as those from the main project
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493877
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -56,44 +55,54 @@ limitations under the License.
> <dependency>
> <groupId>org.apache.jclouds.api</groupId>
> <artifactId>chef</artifactId>
> + <version>${jclouds.version}</version>
`${project.version}` or `${project.parent.version}` - it's a module of the dependent project.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493787
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-karaf-pull-requests #11](https://jclouds.ci.cloudbees.com/job/jclouds-karaf-pull-requests/11/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#issuecomment-21575108
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-karaf-pull-requests #10](https://jclouds.ci.cloudbees.com/job/jclouds-karaf-pull-requests/10/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#issuecomment-21569883
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> + </configuration>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-release-plugin</artifactId>
> + <version>${maven-release-plugin.version}</version>
> + <configuration>
> + <useReleaseProfile>false</useReleaseProfile>
> + <goals>deploy</goals>
> + <arguments>-Pdoc -Papache-release ${arguments}</arguments>
> + </configuration>
> + </plugin>
> + </plugins>
> + </build>
> +
> + <properties>
> The reason each project has its own version defined is to ensure that the parent or grandparent (jclouds) can be a different version than
> the child projects (karaf). Or am I missing something?
I don't think so. With some experiments, the following does seem to work: run `mvn release:prepare` with both the jclouds-project and the current project version set to snapshots. Maven will prompt you to resolve all the jclouds "core" dependencies before proceeding with the release, and you can choose to set them to any release version you wish.
Maven will then reset the "core" dependencies (including jclouds-project) to a new version that could even differ from the post-release version of this project.
So there should actually be no need for a separate `<version>` tag in the top level _or_ project POMs of Karaf or CLI, for that matter.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5466665
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> <modules>
> + <module>jclouds-karaf-project</module>
Call it just "project"?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5467296
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> </parent>
>
> - <groupId>org.apache.jclouds</groupId>
> - <artifactId>jclouds-karaf</artifactId>
> + <artifactId>jclouds-karaf-top</artifactId>
I don't think we use `-top`. The top-level POM is usually simply called "project_name", and the _project_ POM is "project_name-project". So this would stay jclouds-karaf.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493854
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
Updated with cleanup and tested as per https://github.com/jclouds/jclouds-cli/pull/14
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#issuecomment-21813908
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -52,30 +57,40 @@ limitations under the License.
>
> <dependencies>
> <dependency>
> + <groupId>org.apache.jclouds</groupId>
> + <artifactId>jclouds-core</artifactId>
> + <version>${project.parent.version}</version>
> + </dependency>
New dependency here? Was that missing before? If it's not added explicitly, what is the problem?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5396968
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
> </parent>
>
> - <groupId>org.apache.jclouds</groupId>
> - <artifactId>jclouds-karaf</artifactId>
> + <artifactId>jclouds-karaf-top</artifactId>
Yeah that would not work though. "features" already has that artifactId
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5512709
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by BuildHive <no...@github.com>.
[jclouds » jclouds-karaf #226](https://buildhive.cloudbees.com/job/jclouds/job/jclouds-karaf/226/) 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-karaf/pull/22#issuecomment-21569599
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
> @@ -34,7 +35,7 @@ limitations under the License.
> <osgi.export.service>org.jclouds.karaf.cache.CacheProvider</osgi.export.service>
> <osgi.import>
> org.jclouds.karaf.recipe*,
> - org.jclouds*;version=${jclouds.version},
> + org.jclouds*;version=${project.parent.version},
I think I see what you are saying. I will look into it.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5466446
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
I had a look at https://github.com/jclouds/jclouds-cli/pull/14 (thanks). It seems it will help me clean this PR a bit.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#issuecomment-21768102
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> </dependency>
> <dependency>
> <groupId>org.apache.jclouds.api</groupId>
> <artifactId>chef</artifactId>
> + <version>${jclouds.version}</version>
Same comment as for the other POMs - `${project.version}` or `${project.parent.version}` should work both for dependencies from the dependent project as well as those from the main project
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493819
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> </dependency>
> <dependency>
> <groupId>org.apache.jclouds</groupId>
> <artifactId>jclouds-scriptbuilder</artifactId>
> + <version>${jclouds.version}</version>
Same comment as for the other POMs - `${project.version}` or `${project.parent.version}` should work both for dependencies from the dependent project as well as those from the main project
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493864
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -61,10 +64,12 @@ limitations under the License.
> <dependency>
> <groupId>org.apache.jclouds</groupId>
> <artifactId>jclouds-compute</artifactId>
> + <version>${jclouds.version}</version>
_This_ one (and the following one) are "main" dependencies. If the [jclouds-cli release test](https://github.com/jclouds/jclouds-cli/pull/14) is anything to go by, we should _also_ be able to use `${project.version}` or `${project.parent.version}` here: when running `mvn release:prepare`, the Maven release plugin should detect these as **external** snapshot dependencies and will ask you to resolve them.
Otherwise, we should check whether `${project.parent.parent.version}` (urgh!), which points at the _jclouds-project version_ (i.e. the version of the **main** project works.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493723
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> </properties>
>
> <dependencies>
> <dependency>
> <groupId>org.apache.jclouds.karaf</groupId>
> <artifactId>recipe</artifactId>
> + <version>${jclouds.version}</version>
I think this can be `${project.version}` or `${project.parent.version}` (since they will be the same, at least with the POM as suggested). These are Karaf artifacts, so come from the "dependent" project rather than the "main" project.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493680
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Bayer <no...@github.com>.
+1 from me, but I'd like @iocanel to give it a look before we commit it, since karaf is black magic to me. =)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#issuecomment-21431879
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
Different version from parent (where the parent if jclouds). I think that's it.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#issuecomment-21795872
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by BuildHive <no...@github.com>.
[jclouds » jclouds-karaf #216](https://buildhive.cloudbees.com/job/jclouds/job/jclouds-karaf/216/) FAILURE
Looks like there's a problem with this pull request
[(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-karaf/pull/22#issuecomment-21418723
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
> @@ -9,6 +9,7 @@ target/
> *.iml
> *.iws
> *.ipr
> +*.class
There were some in a bin/ I think. That's why I added it. Happens when you build one of the child projects...
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5401838
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
> @@ -61,10 +64,12 @@ limitations under the License.
> <dependency>
> <groupId>org.apache.jclouds</groupId>
> <artifactId>jclouds-compute</artifactId>
> + <version>${jclouds.version}</version>
${project.parent.parent.version} seems to not resolve properly during dependency checks.
${project.version} or ${project.parent.version} might not be snapshot dependencies if the project or project parent are not specified as snapshot?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5512860
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-karaf-pull-requests #7](https://jclouds.ci.cloudbees.com/job/jclouds-karaf-pull-requests/7/) FAILURE
Looks like there's a problem with this pull request
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#issuecomment-21393703
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -57,10 +56,12 @@ limitations under the License.
> <dependency>
> <groupId>org.apache.jclouds.karaf</groupId>
> <artifactId>cache</artifactId>
> + <version>${jclouds.version}</version>
`${project.version}` or `${project.parent.version}` - it's a module of the dependent project.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493736
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
> @@ -9,6 +9,7 @@ target/
> *.iml
> *.iws
> *.ipr
> +*.class
I think I will just make it consistent with the jclouds .gitignore and just keep bin/ in there as you suggested, consistency being more important than preference.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5405725
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -34,7 +35,7 @@ limitations under the License.
> <osgi.export.service>org.jclouds.karaf.cache.CacheProvider</osgi.export.service>
> <osgi.import>
> org.jclouds.karaf.recipe*,
> - org.jclouds*;version=${jclouds.version},
> + org.jclouds*;version=${project.parent.version},
The previous comment is actually not correct. The Maven release plugin can update the versions of the "core" dependencies as part of the `release:prepare` process. So we should be good here, as long as the version of `jclouds-project` (and thus the "core" dependencies) always matches the version of `jclouds-karaf-project`.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5466663
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> <version>1.7.0-SNAPSHOT</version>
> </parent>
> - <modelVersion>4.0.0</modelVersion>
> -
> - <groupId>org.apache.jclouds.karaf</groupId>
> +
?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493627
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> + </configuration>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-release-plugin</artifactId>
> + <version>${maven-release-plugin.version}</version>
> + <configuration>
> + <useReleaseProfile>false</useReleaseProfile>
> + <goals>deploy</goals>
> + <arguments>-Pdoc -Papache-release ${arguments}</arguments>
> + </configuration>
> + </plugin>
> + </plugins>
> + </build>
> +
> + <properties>
Probably will also need a `<jclouds.version>` property here that matches the `jclouds-project` version that this project depends on. See comment about `${project.parent.version}` above.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5440899
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +See the License for the specific language governing permissions and
> +limitations under the License.
> +-->
> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
> + <modelVersion>4.0.0</modelVersion>
> + <parent>
> + <groupId>org.apache.jclouds</groupId>
> + <artifactId>jclouds-project</artifactId>
> + <version>1.7.0-SNAPSHOT</version>
> + </parent>
> +
> + <groupId>org.apache.jclouds</groupId>
> + <artifactId>jclouds-karaf-project</artifactId>
> + <packaging>pom</packaging>
> + <!-- VERSION same as parent -->
How will this be released? As with OpenStack, there's now no way for this to depend on a _release_ version of jclouds-project whilst still being a _snapshot_ version itself.
I think this needs a
```
<version>1.7.0-SNAPSHOT</version>
```
tag..?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5396864
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> </dependency>
> <dependency>
> <groupId>org.apache.jclouds.api</groupId>
> <artifactId>chef</artifactId>
> + <version>${jclouds.version}</version>
Module of the main project this time, but (see comment above) `${project.version}` or `${project.parent.version}` should still work. Need to test with `mvn release:prepare`.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493746
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -28,6 +29,10 @@ limitations under the License.
> <artifactId>services</artifactId>
> <packaging>bundle</packaging>
> <name>JClouds :: Karaf :: Services</name>
> +
> + <properties>
> + <jclouds.test.listener></jclouds.test.listener>
> + </properties>
See comment above
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5396946
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> </dependency>
> <dependency>
> <groupId>org.apache.jclouds.driver</groupId>
> <artifactId>jclouds-log4j</artifactId>
> + <version>${jclouds.version}</version>
Same comment as for the other POMs - `${project.version}` or `${project.parent.version}` should work both for dependencies from the dependent project as well as those from the main project
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493825
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> Different version from parent (where the parent if jclouds). I think that's it.
See [this comment](https://issues.apache.org/jira/browse/JCLOUDS-104?focusedCommentId=13723974&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13723974) in the JIRA issue: my assumption is that this version difference is only required _for releases_, i.e. during development, the snapshot version of jclouds and the dependent project can always be the same.
If we need to support differing snapshot versions _during development_ then, yes, we'd need an explicit `<version>` in the dependent project's "project POM", i.e. the one that directly inherits from jclouds-project.
If we only need to support different versions (of the dependent project and jclouds) for releases, it seems the Maven release plugin can handle that automatically. OSGi imports are an unresolved issue, however.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#issuecomment-21804938
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> </dependency>
> <dependency>
> <groupId>org.apache.jclouds.driver</groupId>
> <artifactId>jclouds-log4j</artifactId>
> + <version>${jclouds.version}</version>
Above three are modules of the main project - `${project.version}` or `${project.parent.version}` should still work
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493795
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-karaf-pull-requests #9](https://jclouds.ci.cloudbees.com/job/jclouds-karaf-pull-requests/9/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#issuecomment-21431632
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
> </properties>
>
> <dependencies>
> <dependency>
> <groupId>org.apache.jclouds.karaf</groupId>
> <artifactId>recipe</artifactId>
> + <version>${jclouds.version}</version>
${project.parent.version} does not resolve properly sometimes.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5512794
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Zack Shoylev <no...@github.com>.
Closed #22.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#event-265026545
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> </properties>
>
> <dependencies>
> <dependency>
> <groupId>org.apache.jclouds.karaf</groupId>
> <artifactId>recipe</artifactId>
> + <version>${jclouds.version}</version>
Ah, OK, then we should stick to `${project.version}`. I'll also clean up the CLI PR to reflect this.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5513101
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> - <target>1.6</target>
> - </configuration>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-release-plugin</artifactId>
> - <version>${maven-release-plugin.version}</version>
> - <configuration>
> - <useReleaseProfile>false</useReleaseProfile>
> - <goals>deploy</goals>
> - <arguments>-Pdoc -Papache-release ${arguments}</arguments>
> - </configuration>
> - </plugin>
> - </plugins>
> - </build>
> -
> <modules>
> <module>core</module>
Add project module? C.f. the [jclouds project POM](https://github.com/jclouds/jclouds/blob/master/pom.xml#L32)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5396937
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> @@ -37,7 +36,7 @@ limitations under the License.
> <osgi.import>
> javax.script,
> org.codehaus.groovy.jsr223,
> - org.jclouds.karaf.cache*;version=${project.version},
> + org.jclouds.karaf.cache*;version=${jclouds.version},
Needs to be `${project.version}`, because we're importing the version of the _dependent_ project.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22/files#r5493754
Re: [jclouds-karaf] Separates parent and top level pom. (#22)
Posted by Andrew Phillips <no...@github.com>.
> However I am still a bit unclear on removing (or not) the version from the child projects.
Chat on IRC tomorrow? What scenario do you have in mind that would be helped/resolved by having explicit versions in child projects?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-karaf/pull/22#issuecomment-21768383