diff --git a/cepheus-broker/docker/Dockerfile b/cepheus-broker/docker/Dockerfile index a2567c2e..00b238d0 100644 --- a/cepheus-broker/docker/Dockerfile +++ b/cepheus-broker/docker/Dockerfile @@ -3,8 +3,8 @@ FROM java:8-jre MAINTAINER FIWARE Cepheus Team -ENV CEPHEUS_VERSION 0.1.1-SNAPSHOT -ENV CEPHEUS_REPO snapshots +ENV CEPHEUS_VERSION 0.1.1 +ENV CEPHEUS_REPO releases WORKDIR /opt/cepheus diff --git a/cepheus-broker/pom.xml b/cepheus-broker/pom.xml index d80880d8..254c0cdf 100644 --- a/cepheus-broker/pom.xml +++ b/cepheus-broker/pom.xml @@ -5,7 +5,7 @@ cepheus com.orange.cepheus - 0.1.1-SNAPSHOT + 0.1.1 4.0.0 diff --git a/cepheus-cep/docker/Dockerfile b/cepheus-cep/docker/Dockerfile index 687ed8d7..05f58951 100644 --- a/cepheus-cep/docker/Dockerfile +++ b/cepheus-cep/docker/Dockerfile @@ -3,8 +3,8 @@ FROM java:8-jre MAINTAINER FIWARE Cepheus Team -ENV CEPHEUS_VERSION 0.1.1-SNAPSHOT -ENV CEPHEUS_REPO snapshots +ENV CEPHEUS_VERSION 0.1.1 +ENV CEPHEUS_REPO releases WORKDIR /opt/cepheus diff --git a/cepheus-cep/pom.xml b/cepheus-cep/pom.xml index 17296531..99d0ee81 100644 --- a/cepheus-cep/pom.xml +++ b/cepheus-cep/pom.xml @@ -5,7 +5,7 @@ cepheus com.orange.cepheus - 0.1.1-SNAPSHOT + 0.1.1 4.0.0 diff --git a/cepheus-ngsi/pom.xml b/cepheus-ngsi/pom.xml index 639ebd54..378a28d2 100644 --- a/cepheus-ngsi/pom.xml +++ b/cepheus-ngsi/pom.xml @@ -5,7 +5,7 @@ com.orange.cepheus cepheus - 0.1.1-SNAPSHOT + 0.1.1 ../pom.xml 4.0.0 diff --git a/doc/admin/broker.md b/doc/admin/broker.md index 9eed592e..86ba86fd 100644 --- a/doc/admin/broker.md +++ b/doc/admin/broker.md @@ -27,13 +27,13 @@ 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 `0.1.1-SNAPSHOT` or `LATEST`. +where `XXXX` is the version you want, like `0.1.1` or `LATEST`. ### Download from [Sonatype Central repository](http://central.sonatype.org/) using wget If you don't have `maven` installed on your machine, you can still download the standalone JAR using `wget` or any browser: - wget "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=com.orange.cepheus&a=cepheus-broker&v=LATEST" + wget "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=com.orange.cepheus&a=cepheus-broker&v=LATEST" ## Running @@ -53,7 +53,7 @@ The Cepheus-Broker is also provided in a preconfigured Debian package to ease de Download the Debian package from [Sonatype Central repository](http://central.sonatype.org/) using `wget`: - wget "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=com.orange.cepheus&a=cepheus-broker&v=LATEST&p=deb" + wget "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=com.orange.cepheus&a=cepheus-broker&v=LATEST&p=deb" ### Installing diff --git a/doc/admin/cep.md b/doc/admin/cep.md index c459a011..cd6fdee6 100644 --- a/doc/admin/cep.md +++ b/doc/admin/cep.md @@ -26,13 +26,13 @@ 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 `0.1.1-SNAPSHOT` or `LATEST`. +where `XXXX` is the version you want, like `0.1.1` or `LATEST`. ### Download from [Sonatype Central repository](http://central.sonatype.org/) using wget If you don't have `maven` installed on your machine, you can still download the standalone JAR using `wget` or any browser: - wget "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=com.orange.cepheus&a=cepheus-cep&v=LATEST" + wget "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=com.orange.cepheus&a=cepheus-cep&v=LATEST" ## Running @@ -52,7 +52,7 @@ The Cepheus-CEP is also provided in a preconfigured Debian package to ease deplo Download the Debian package from [Sonatype Central repository](http://central.sonatype.org/) using `wget`: - wget "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=com.orange.cepheus&a=cepheus-cep&v=LATEST&p=deb" + wget "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=com.orange.cepheus&a=cepheus-cep&v=LATEST&p=deb" ### Installing diff --git a/doc/examples/mocks/mock-iotagent/pom.xml b/doc/examples/mocks/mock-iotagent/pom.xml index b5bc0be9..703c22c5 100644 --- a/doc/examples/mocks/mock-iotagent/pom.xml +++ b/doc/examples/mocks/mock-iotagent/pom.xml @@ -6,7 +6,7 @@ com.orange.cepheus mock-iotagent - 1.0-SNAPSHOT + 1.0 org.springframework.boot @@ -22,7 +22,7 @@ com.orange.cepheus cepheus-ngsi - 0.1.1-SNAPSHOT + 0.1.1 org.springframework.boot @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/doc/examples/mocks/mock-orion/pom.xml b/doc/examples/mocks/mock-orion/pom.xml index e23e7c7a..5f29613e 100644 --- a/doc/examples/mocks/mock-orion/pom.xml +++ b/doc/examples/mocks/mock-orion/pom.xml @@ -6,7 +6,7 @@ com.orange.cepheus mock-orion - 1.0-SNAPSHOT + 1.0 org.springframework.boot @@ -22,7 +22,7 @@ com.orange.cepheus cepheus-ngsi - 0.1.1-SNAPSHOT + 0.1.1 org.springframework.boot @@ -40,4 +40,4 @@ - \ No newline at end of file + diff --git a/doc/examples/mocks/mock-orion/src/main/resources/logback.xml b/doc/examples/mocks/mock-orion/src/main/resources/logback.xml index dde80b31..5ce825df 100644 --- a/doc/examples/mocks/mock-orion/src/main/resources/logback.xml +++ b/doc/examples/mocks/mock-orion/src/main/resources/logback.xml @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/docker/Dockerfile b/docker/Dockerfile index 1473048f..939928cb 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,8 +3,8 @@ FROM java:8-jre MAINTAINER FIWARE Cepheus Team -ENV CEPHEUS_VERSION 0.1.1-SNAPSHOT -ENV CEPHEUS_REPO snapshots +ENV CEPHEUS_VERSION 0.1.1 +ENV CEPHEUS_REPO releases # Install Supervisor RUN apt-get update && apt-get install -y supervisor wget diff --git a/pom.xml b/pom.xml index 36db610e..9234452c 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.orange.cepheus cepheus pom - 0.1.1-SNAPSHOT + 0.1.1 cepheus-ngsi cepheus-cep diff --git a/scripts/post-release.sh b/scripts/post-release.sh index 3e09a76f..f8a790b1 100755 --- a/scripts/post-release.sh +++ b/scripts/post-release.sh @@ -18,11 +18,11 @@ NEWVERSION="$2" git checkout master git branch -D release -# Replace {version}-SNAPSHOT by {NEWVERSION} except ci-release.sh -find . -name "*.xml" -type f -exec sed -i '' "s/$OLDVERSION-SNAPSHOT/$NEWVERSION-SNAPSHOT/g" {} \; -find . -name "*.md" -type f -exec sed -i '' "s/$OLDVERSION-SNAPSHOT/$NEWVERSION-SNAPSHOT/g" {} \; -find . -name "Dockerfile" -type f -exec sed -i '' "s/$OLDVERSION-SNAPSHOT/$NEWVERSION-SNAPSHOT/g" {} \; -find . -name "*.sh" ! -name 'ci-release.sh' -type f -exec sed -i '' "s/$OLDVERSION-SNAPSHOT/$NEWVERSION-SNAPSHOT/g" {} \; +# Replace {version} by {NEWVERSION} except ci-release.sh +find . -name "*.xml" -type f -exec sed -i '' "s/$OLDVERSION/$NEWVERSION/g" {} \; +find . -name "*.md" -type f -exec sed -i '' "s/$OLDVERSION/$NEWVERSION/g" {} \; +find . -name "Dockerfile" -type f -exec sed -i '' "s/$OLDVERSION/$NEWVERSION/g" {} \; +find . -name "*.sh" ! -name 'ci-release.sh' -type f -exec sed -i '' "s/$OLDVERSION/$NEWVERSION/g" {} \; # Push modifications git commit -m "prepare $NEWVERSION" diff --git a/scripts/pre-release.sh b/scripts/pre-release.sh index a23ea0fc..52631c9c 100755 --- a/scripts/pre-release.sh +++ b/scripts/pre-release.sh @@ -12,16 +12,16 @@ git pull origin master git branch -f release master git checkout release -# Replace {version}-SNAPSHOT by {version} except ci-release.sh -find . -name "*.xml" -type f -exec sed -i '' "s/-SNAPSHOT//g" {} \; -find . -name "*.md" -type f -exec sed -i '' "s/-SNAPSHOT//g" {} \; -find . -name "Dockerfile" -type f -exec sed -i '' "s/-SNAPSHOT//g" {} \; -find . -name "*.sh" ! -name 'ci-release.sh' -type f -exec sed -i '' "s/-SNAPSHOT//g" {} \; +# Replace {version} by {version} except ci-release.sh +find . -name "*.xml" -type f -exec sed -i '' "s///g" {} \; +find . -name "*.md" -type f -exec sed -i '' "s///g" {} \; +find . -name "Dockerfile" -type f -exec sed -i '' "s///g" {} \; +find . -name "*.sh" ! -name 'ci-release.sh' -type f -exec sed -i '' "s///g" {} \; -# Replace snapshots by releases except in .xml files -find . -name "*.md" -type f -exec sed -i '' "s/snapshots/releases/g" {} \; -find . -name "Dockerfile" -type f -exec sed -i '' "s/snapshots/releases/g" {} \; -find . -name "*.sh" ! -name 'ci-release.sh' -type f -exec sed -i '' "s/snapshots/releases/g" {} \; +# Replace releases by releases except in .xml files +find . -name "*.md" -type f -exec sed -i '' "s/releases/releases/g" {} \; +find . -name "Dockerfile" -type f -exec sed -i '' "s/releases/releases/g" {} \; +find . -name "*.sh" ! -name 'ci-release.sh' -type f -exec sed -i '' "s/releases/releases/g" {} \; # Push modifications git commit -a -m "prepare $VERSION" diff --git a/settings.xml b/settings.xml index 2b731254..00e8a961 100644 --- a/settings.xml +++ b/settings.xml @@ -26,4 +26,4 @@ - \ No newline at end of file +