prepare 0.1.1

marcc-orange · marcc-orange · commit 7342fa88419e · 2015-10-29T16:00:46.000+01:00
diff --git 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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>cepheus</artifactId>
         <groupId>com.orange.cepheus</groupId>
-        <version>0.1.1-SNAPSHOT</version>
+        <version>0.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git 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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>cepheus</artifactId>
         <groupId>com.orange.cepheus</groupId>
-        <version>0.1.1-SNAPSHOT</version>
+        <version>0.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/cepheus-ngsi/pom.xml b/cepheus-ngsi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.orange.cepheus</groupId>
         <artifactId>cepheus</artifactId>
-        <version>0.1.1-SNAPSHOT</version>
+        <version>0.1.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git 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
@@ -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
@@ -6,7 +6,7 @@
 
     <groupId>com.orange.cepheus</groupId>
     <artifactId>mock-iotagent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.orange.cepheus</groupId>
             <artifactId>cepheus-ngsi</artifactId>
-            <version>0.1.1-SNAPSHOT</version>
+            <version>0.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,4 +38,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/doc/examples/mocks/mock-orion/pom.xml b/doc/examples/mocks/mock-orion/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.orange.cepheus</groupId>
     <artifactId>mock-orion</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.orange.cepheus</groupId>
             <artifactId>cepheus-ngsi</artifactId>
-            <version>0.1.1-SNAPSHOT</version>
+            <version>0.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -40,4 +40,4 @@
     </build>
 
 
-</project>
+</project>
diff --git 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 @@
     <root level="${log-level:-INFO}">
         <appender-ref ref="STDOUT"/>
     </root>
-</configuration>
+</configuration>
diff --git 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
@@ -6,7 +6,7 @@
     <groupId>com.orange.cepheus</groupId>
     <artifactId>cepheus</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.1-SNAPSHOT</version>
+    <version>0.1.1</version>
     <modules>
         <module>cepheus-ngsi</module>
         <module>cepheus-cep</module>
diff --git 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
@@ -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
@@ -26,4 +26,4 @@
             </properties>
         </profile>
     </profiles>
-</settings>
+</settings>
