Skip to content

Commit

Permalink
UNOMI-209: set dependency on itests for package only when integration…
Browse files Browse the repository at this point in the history 
…-tests profile is used

cleanup hardcoded self dependency version on project version by using maven ${project.version}
  • Loading branch information
@jkevan
jkevan committed Nov 13, 2018
1 parent a1eeab3 commit 23b556f
Show file tree
Hide file tree
Showing 33 changed files with 93 additions and 94 deletions.
2 changes: 1 addition & 1 deletion buildAndRunNoTests.sh
View file
Expand Up @@ -23,7 +23,7 @@ PROGNAME=`basename "$0"`
if [ -f "$DIRNAME/setenv.sh" ]; then
. "$DIRNAME/setenv.sh"
fi
mvn clean install -P \!integration-tests,\!performance-tests,rat
mvn clean install -P \!integration-tests,\!performance-tests,rat -DskipTests
if [ $? -ne 0 ]
then
exit 1;
Expand Down
6 changes: 3 additions & 3 deletions extensions/geonames/rest/pom.xml
View file
Expand Up @@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
5 changes: 2 additions & 3 deletions extensions/geonames/services/pom.xml
View file
Expand Up @@ -28,20 +28,19 @@
<artifactId>cxs-geonames-services</artifactId>
<name>Apache Unomi :: Extensions :: Geonames Database :: Service</name>
<description>Service implementation for the Apache Unomi Context Server extension that integrates with the Geonames database</description>
<version>1.4.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>

<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
5 changes: 2 additions & 3 deletions extensions/lists-extension/actions/pom.xml
View file
Expand Up @@ -28,21 +28,20 @@
<name>Apache Unomi :: Extensions :: Lists :: Actions</name>
<description>List extension rule actions for the Apache Unomi Context Server</description>

<version>1.4.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>

<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion extensions/lists-extension/pom.xml
View file
Expand Up @@ -34,6 +34,5 @@
<artifactId>cxs-lists-extension</artifactId>
<name>Apache Unomi :: Extensions :: Lists</name>
<description>List extension for the Apache Unomi Context Server</description>
<version>1.4.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
6 changes: 3 additions & 3 deletions extensions/lists-extension/rest/pom.xml
View file
Expand Up @@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 2 additions & 4 deletions extensions/lists-extension/services/pom.xml
View file
Expand Up @@ -27,21 +27,19 @@
<artifactId>cxs-lists-extension-services</artifactId>
<name>Apache Unomi :: Extensions :: Lists :: Service</name>
<description>List extension service implementation for the Apache Unomi Context Server</description>

<version>1.4.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>

<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion extensions/privacy-extension/pom.xml
View file
Expand Up @@ -33,6 +33,6 @@
<artifactId>cxs-privacy-extension</artifactId>
<name>Apache Unomi :: Extensions :: Privacy</name>
<description>Privacy management extension for the Apache Unomi Context Server</description>
<version>1.4.0-incubating-SNAPSHOT</version>

<packaging>pom</packaging>
</project>
6 changes: 3 additions & 3 deletions extensions/privacy-extension/rest/pom.xml
View file
Expand Up @@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions extensions/privacy-extension/services/pom.xml
View file
Expand Up @@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions extensions/salesforce-connector/actions/pom.xml
View file
Expand Up @@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-services</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

Expand Down
8 changes: 4 additions & 4 deletions extensions/salesforce-connector/karaf-kar/pom.xml
View file
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -48,17 +48,17 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-services</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-rest</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-actions</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>

</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions extensions/salesforce-connector/rest/pom.xml
View file
Expand Up @@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-services</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions extensions/salesforce-connector/services/pom.xml
View file
Expand Up @@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion extensions/weather-update/karaf-kar/pom.xml
View file
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion extensions/web-tracker/karaf-kar/pom.xml
View file
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit 23b556f

Please sign in to comment.