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

Commit

Permalink
build: switch to 0.1.0-SNAPSHOT version
Browse files Browse the repository at this point in the history
- fiware-4.3.3 will be used only as git tag
- remove Dockerfile-sources
- always point to current version in Dockerfiles
  • Loading branch information
PascaleBorscia committed Sep 24, 2015
1 parent a7733fc commit e56a5fb
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 42 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# 4.4.3
# 0.1.0

## Major features

Expand Down
5 changes: 3 additions & 2 deletions cepheus-broker/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
FROM java:8-jre
MAINTAINER FIWARE Cepheus Team

ENV CEPHEUS_VERSION LATEST
ENV CEPHEUS_VERSION 0.1.0-SNAPSHOT
ENV CEPHEUS_REPO snapshots

WORKDIR /opt/cepheus

# Download Broker
RUN wget -q -O cepheus-broker.jar "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=com.orange.cepheus&a=cepheus-broker&v=$CEPHEUS_VERSION"
RUN wget -q -O cepheus-broker.jar "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=$CEPHEUS_REPO&g=com.orange.cepheus&a=cepheus-broker&v=$CEPHEUS_VERSION"

EXPOSE 8081

Expand Down
2 changes: 1 addition & 1 deletion cepheus-broker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>cepheus</artifactId>
<groupId>com.orange.cepheus</groupId>
<version>4.4.3-SNAPSHOT</version>
<version>0.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
5 changes: 3 additions & 2 deletions cepheus-cep/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
FROM java:8-jre
MAINTAINER FIWARE Cepheus Team

ENV CEPHEUS_VERSION LATEST
ENV CEPHEUS_VERSION 0.1.0-SNAPSHOT
ENV CEPHEUS_REPO snapshots

WORKDIR /opt/cepheus

# Download CEP
RUN wget -q -O cepheus-cep.jar "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=com.orange.cepheus&a=cepheus-cep&v=$CEPHEUS_VERSION"
RUN wget -q -O cepheus-cep.jar "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=$CEPHEUS_REPO&g=com.orange.cepheus&a=cepheus-cep&v=$CEPHEUS_VERSION"

EXPOSE 8080

Expand Down
2 changes: 1 addition & 1 deletion cepheus-cep/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>cepheus</artifactId>
<groupId>com.orange.cepheus</groupId>
<version>4.4.3-SNAPSHOT</version>
<version>0.1.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion cepheus-ngsi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.orange.cepheus</groupId>
<artifactId>cepheus</artifactId>
<version>4.4.3-SNAPSHOT</version>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion doc/admin/broker.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ If you have `maven`, you can run the following command:

mvn dependency:get -DgroupId=com.orange.cepheus -DartifactId=cepheus-broker -Dversion=XXXX -Dtransitive=false

where `XXXX` is the version you want, like `4.4.3-SNAPSHOT` or `LATEST`.
where `XXXX` is the version you want, like `0.1.0-SNAPSHOT` or `LATEST`.

### Download from [Sonatype Central repository](http://central.sonatype.org/) using wget

Expand Down
2 changes: 1 addition & 1 deletion doc/admin/cep.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ If you have `maven`, you can run the following command:

mvn dependency:get -DgroupId=com.orange.cepheus -DartifactId=cepheus-cep -Dversion=XXXX -Dtransitive=false

where `XXXX` is the version you want, like `4.4.3-SNAPSHOT` or `LATEST`.
where `XXXX` is the version you want, like `0.1.0-SNAPSHOT` or `LATEST`.

### Download from [Sonatype Central repository](http://central.sonatype.org/) using wget

Expand Down
2 changes: 1 addition & 1 deletion doc/examples/mocks/mock-iotagent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependency>
<groupId>com.orange.cepheus</groupId>
<artifactId>cepheus-ngsi</artifactId>
<version>4.4.3-SNAPSHOT</version>
<version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
2 changes: 1 addition & 1 deletion doc/examples/mocks/mock-orion/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependency>
<groupId>com.orange.cepheus</groupId>
<artifactId>cepheus-ngsi</artifactId>
<version>4.4.3-SNAPSHOT</version>
<version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
7 changes: 4 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
FROM java:8-jre
MAINTAINER FIWARE Cepheus Team

ENV CEPHEUS_VERSION LATEST
ENV CEPHEUS_VERSION 0.1.0-SNAPSHOT
ENV CEPHEUS_REPO snapshots

# Install Supervisor
RUN apt-get update && apt-get install -y supervisor wget
Expand All @@ -13,8 +14,8 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
WORKDIR /opt/cepheus

# Download CEP and Light Broker
RUN wget -q -O cepheus-cep.jar "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=com.orange.cepheus&a=cepheus-cep&v=$CEPHEUS_VERSION"
RUN wget -q -O cepheus-broker.jar "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=com.orange.cepheus&a=cepheus-broker&v=$CEPHEUS_VERSION"
RUN wget -q -O cepheus-cep.jar "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=$CEPHEUS_REPO&g=com.orange.cepheus&a=cepheus-cep&v=$CEPHEUS_VERSION"
RUN wget -q -O cepheus-broker.jar "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=$CEPHEUS_REPO&g=com.orange.cepheus&a=cepheus-broker&v=$CEPHEUS_VERSION"

# Expose 8080 for CEP, 8081 for broker
EXPOSE 8080 8081
Expand Down
25 changes: 0 additions & 25 deletions docker/Dockerfile-sources

This file was deleted.

2 changes: 1 addition & 1 deletion fiware-lab/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# Cepheus version
REPO="snapshots" # "releases"
VERSION="LATEST" # "4.4.3"
VERSION="0.1.0-SNAPSHOT" # "0.1.0"

# Check and echo all commands
set -e
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>com.orange.cepheus</groupId>
<artifactId>cepheus</artifactId>
<packaging>pom</packaging>
<version>4.4.3-SNAPSHOT</version>
<version>0.1.0-SNAPSHOT</version>
<modules>
<module>cepheus-ngsi</module>
<module>cepheus-cep</module>
Expand Down

0 comments on commit e56a5fb

Please sign in to comment.