Skip to content
This repository has been archived by the owner on Oct 5, 2022. It is now read-only.

Commit

Permalink
avoid use of ${fabric.version} to avoid the mvn release plugin barfing
Browse files Browse the repository at this point in the history
  • Loading branch information
@jstrachan
jstrachan authored and Jenkins CI committed Apr 8, 2014
1 parent 8247a7b commit b6e576d
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion fabric/fabric-itests/basic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
<systemPropertyVariables>
<feature>${feature}</feature>
<perfectus-build>${perfectus-build}</perfectus-build>
<fabric.version>${fabric.version}</fabric.version>
<fabric.version>${project.version}</fabric.version>
<project-version>${project.version}</project-version>
<fabricitest.rackspace.identity>${fabricitest.rackspace.identity}
</fabricitest.rackspace.identity>
Expand Down
2 changes: 1 addition & 1 deletion insight/insight-itests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<failIfNoTests>false</failIfNoTests>
<systemPropertyVariables>
<perfectus-build>${perfectus-build}</perfectus-build>
<fabric.version>${fabric.version}</fabric.version>
<fabric.version>${project.version}</fabric.version>
<project-version>${project.version}</project-version>
</systemPropertyVariables>
<classpathDependencyExcludes>
Expand Down
4 changes: 2 additions & 2 deletions mq/mq-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>fabric-groups</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>fabric-zookeeper</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions mq/mq-fabric-camel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>fabric-api</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>common-util</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
8 changes: 4 additions & 4 deletions mq/mq-fabric/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,24 +78,24 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>fabric-zookeeper</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>fabric-api</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>io.fabric8</groupId>
<artifactId>fabric-groups</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>io.fabric8</groupId>
<artifactId>common-util</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions patch/patch-features/src/main/resources/patch-features.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
-->
<features name="patch-${project.version}">

<feature name="patch" version="${fabric.version}" resolver="(obr)">
<bundle>mvn:io.fabric8.patch/patch-core/${fabric.version}</bundle>
<bundle>mvn:io.fabric8.patch/patch-commands/${fabric.version}</bundle>
<feature name="patch" version="${project.version}" resolver="(obr)">
<bundle>mvn:io.fabric8.patch/patch-core/${project.version}</bundle>
<bundle>mvn:io.fabric8.patch/patch-commands/${project.version}</bundle>
</feature>

</features>
10 changes: 5 additions & 5 deletions process/process-fabric/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,27 +45,27 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>fabric-api</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>fabric-core</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>fabric-commands</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>process-manager</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>fabric-agent</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.mvel</groupId>
Expand Down
8 changes: 4 additions & 4 deletions process/process-manager/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<dependency>
<groupId>io.fabric8.fab</groupId>
<artifactId>fab-osgi</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand Down Expand Up @@ -103,13 +103,13 @@
<dependency>
<groupId>io.fabric8.samples</groupId>
<artifactId>process-sample-camel-spring</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>process-launcher</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
<classifier>bin</classifier>
<type>tar.gz</type>
<scope>test</scope>
Expand Down Expand Up @@ -171,7 +171,7 @@
</systemProperty>
<systemProperty>
<key>version</key>
<value>${fabric.version}</value>
<value>${project.version}</value>
</systemProperty>
</systemProperties>
</configuration>
Expand Down
6 changes: 3 additions & 3 deletions process/samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>process-launcher</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
<classifier>bin</classifier>
<type>tar.gz</type>
</dependency>
Expand All @@ -56,7 +56,7 @@
<useUniqueVersions>false</useUniqueVersions>
</manifest>
<manifestEntries>
<Implementation-Version>${fabric.version}</Implementation-Version>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
</archive>
</configuration>
Expand All @@ -76,7 +76,7 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>process-packaging</artifactId>
<version>${fabric.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
<executions>
Expand Down
2 changes: 1 addition & 1 deletion process/samples/process-sample-camel-spring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<artifacts>
<artifact>
<file>
${project.build.directory}/${project.artifactId}-${fabric.version}-distribution.tar.gz
${project.build.directory}/${project.artifactId}-${project.version}-distribution.tar.gz
</file>
<type>tar.gz</type>
</artifact>
Expand Down
2 changes: 1 addition & 1 deletion quickstarts/jms/src/main/resources/features.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<features name="quickstart-jms-${project.version}"
xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">

<repository>mvn:io.fabric8/fabric8-karaf/${fabric.version}/xml/features</repository>
<repository>mvn:io.fabric8/fabric8-karaf/${project.version}/xml/features</repository>

<feature name="quickstart-jms" version="${project.version}" resolver="(obr)">
<feature version="${project.version}">mq-fabric-camel</feature>
Expand Down
2 changes: 1 addition & 1 deletion quickstarts/rest/src/main/resources/features.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">

<repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features</repository>
<repository>mvn:io.fabric8/fabric8-karaf/${fabric.version}/xml/features</repository>
<repository>mvn:io.fabric8/fabric8-karaf/${project.version}/xml/features</repository>

<feature name="quickstart-rest" version="${project.version}" resolver="(obr)">
<feature version="${fabric.version}">swagger</feature>
Expand Down

0 comments on commit b6e576d

Please sign in to comment.