[Observe-commits] [Git][ultreia.io/ird-observe][master] 12 commits: [jgitflow-maven-plugin]updating poms for 3.0-RC-2-SNAPSHOT development

8 Mar 2017

Tony CHEMIT pushed to branch master at ultreia.io / ird-observe


Commits:
4443e6d5 by Tony CHEMIT at 2017-03-08T18:01:18+01:00
[jgitflow-maven-plugin]updating poms for 3.0-RC-2-SNAPSHOT development
- - - - -
09ecd5dd by Tony CHEMIT at 2017-03-08T18:09:49+01:00
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts
- - - - -
290ef09a by Tony CHEMIT at 2017-03-08T18:09:50+01:00
[jgitflow-maven-plugin]merging 'master' into 'develop'
- - - - -
c98241e0 by Tony CHEMIT at 2017-03-08T18:09:51+01:00
[jgitflow-maven-plugin]Updating develop poms back to pre merge state
- - - - -
27a26a87 by Tony CHEMIT at 2017-03-08T18:16:32+01:00
improve release scripts

- - - - -
d09ccb1e by Tony CHEMIT at 2017-03-08T18:23:16+01:00
prepare release 6.0-RC-1 + fix release

- - - - -
683c6d4a by Tony CHEMIT at 2017-03-08T18:23:50+01:00
[jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
- - - - -
0bb38127 by Tony CHEMIT at 2017-03-08T18:27:03+01:00
prepare release 6.0-RC-1 + fix release

- - - - -
963a8c2d by Tony CHEMIT at 2017-03-08T18:27:35+01:00
[jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
- - - - -
53885ecc by Tony CHEMIT at 2017-03-08T18:29:39+01:00
prepare release 6.0-RC-1 + fix release

- - - - -
d35566b2 by Tony CHEMIT at 2017-03-08T18:30:17+01:00
[jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions
- - - - -
00104105 by Tony CHEMIT at 2017-03-08T18:36:55+01:00
[jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master'
- - - - -


26 changed files:

- application-swing-configuration/pom.xml
- application-swing-decoration/pom.xml
- application-swing-validation/pom.xml
- application-swing-validators/pom.xml
- application-swing/pom.xml
- application-web-configuration/pom.xml
- application-web/pom.xml
- bin/stage_create.sh
- common/pom.xml
- observe/pom.xml
- persistence/pom.xml
- pom.xml
- services-binder/pom.xml
- services-configuration-rest/pom.xml
- services-configuration-topia/pom.xml
- services-configuration/pom.xml
- services-rest/pom.xml
- services-runner/pom.xml
- services-topia/pom.xml
- services-validation/pom.xml
- services-validators/pom.xml
- services/pom.xml
- test/pom.xml
- toolbox-maven-plugin/pom.xml
- topia-extension/pom.xml
- topia-templates-extension/pom.xml


Changes:

=====================================
application-swing-configuration/pom.xml
=====================================

--- a/application-swing-configuration/pom.xml
+++ b/application-swing-configuration/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>application-swing-configuration</artifactId>


=====================================
application-swing-decoration/pom.xml
=====================================
--- a/application-swing-decoration/pom.xml
+++ b/application-swing-decoration/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>application-swing-decoration</artifactId>


=====================================
application-swing-validation/pom.xml
=====================================
--- a/application-swing-validation/pom.xml
+++ b/application-swing-validation/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>application-swing-validation</artifactId>


=====================================
application-swing-validators/pom.xml
=====================================
--- a/application-swing-validators/pom.xml
+++ b/application-swing-validators/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>application-swing-validators</artifactId>


=====================================
application-swing/pom.xml
=====================================
--- a/application-swing/pom.xml
+++ b/application-swing/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>application-swing</artifactId>
@@ -35,7 +35,6 @@
   <description>ObServe Application Swing</description>
 
   <properties>
-    <maven.deploy.skip>true</maven.deploy.skip>
 
     <!-- jaxx configuration -->
     <jaxx.validatorFactoryFQN>


=====================================
application-web-configuration/pom.xml
=====================================
--- a/application-web-configuration/pom.xml
+++ b/application-web-configuration/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>application-web-configuration</artifactId>
@@ -179,36 +179,4 @@
 
   </build>
 
-  <profiles>
-    <profile>
-      <id>deploy-demo</id>
-      <properties>
-        <classifier>${project.version}</classifier>
-      </properties>
-      <build>
-        <defaultGoal>verify</defaultGoal>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>wagon-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>deploy-demo</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>upload-single</goal>
-                </goals>
-                <configuration>
-                  <serverId>doc.ultreia.io</serverId>
-                  <url>scpexe://ultreia.io/var/lib/tomcat8/webapps</url>
-                  <fromFile>${project.build.directory}/${project.build.finalName}.war</fromFile>
-                  <toFile>observe-${classifier}.war</toFile>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>


=====================================
application-web/pom.xml
=====================================
--- a/application-web/pom.xml
+++ b/application-web/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>application-web</artifactId>
@@ -39,18 +39,8 @@
   <properties>
 
     <applicationName>observeweb</applicationName>
-
     <i18n.bundleOutputName>${applicationName}-i18n</i18n.bundleOutputName>
 
-    <!-- deploy configuration -->
-    <deployFiles>${project.build.directory}/${project.build.finalName}.war</deployFiles>
-
-    <!-- add war to release file -->
-    <redmine.releaseFiles>${project.build.directory}/${project.build.finalName}.war</redmine.releaseFiles>
-
-    <!-- allow to deploy artifacts -->
-    <maven.deploy.skip>false</maven.deploy.skip>
-
   </properties>
 
   <dependencies>
@@ -296,5 +286,37 @@
 
   </build>
 
+  <profiles>
+    <profile>
+      <id>deploy-demo</id>
+      <properties>
+        <classifier>${project.version}</classifier>
+      </properties>
+      <build>
+        <defaultGoal>verify</defaultGoal>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>deploy-demo</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>upload-single</goal>
+                </goals>
+                <configuration>
+                  <serverId>doc.ultreia.io</serverId>
+                  <url>scpexe://ultreia.io/var/lib/tomcat8/webapps</url>
+                  <fromFile>${project.build.directory}/${project.build.finalName}.war</fromFile>
+                  <toFile>observe-${classifier}.war</toFile>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
 </project>


=====================================
bin/stage_create.sh
=====================================
--- a/bin/stage_create.sh
+++ b/bin/stage_create.sh
@@ -29,10 +29,10 @@ if [ ! "$?" == "0" ]; then
    exit 1
 fi
 echo "Get staging id..."
-STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2)
+STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2)
 
 echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)"
-mvn nexus-staging:close -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log
+mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log
 if [ ! "$?" == "0" ]; then
    echo "Error"
    exit 1


=====================================
common/pom.xml
=====================================
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>common</artifactId>


=====================================
observe/pom.xml
=====================================
--- a/observe/pom.xml
+++ b/observe/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>observe</artifactId>


=====================================
persistence/pom.xml
=====================================
--- a/persistence/pom.xml
+++ b/persistence/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>persistence</artifactId>


=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>fr.ird.observe</groupId>
   <artifactId>pom</artifactId>
-  <version>3.0-RC-1</version>
+  <version>6.0-RC-1</version>
   <packaging>pom</packaging>
 
   <name>ObServe</name>
@@ -216,6 +216,9 @@
     <!--Modèle version-->
     <observe.model.version>6.0</observe.model.version>
 
+    <!-- deploy nothing -->
+    <maven.deploy.skip>true</maven.deploy.skip>
+
   </properties>
 
   <dependencyManagement>
@@ -1007,7 +1010,7 @@
                       <fileset dir="doc/modelisation">
                         <include name="**/*.pdf" />
                       </fileset>
-                      <fileset dir="entities/src/main/xmi">
+                      <fileset dir="persistence/src/main/xmi">
                         <include name="**/*.zargo" />
                       </fileset>
                     </copy>


=====================================
services-binder/pom.xml
=====================================
--- a/services-binder/pom.xml
+++ b/services-binder/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>services-binder</artifactId>


=====================================
services-configuration-rest/pom.xml
=====================================
--- a/services-configuration-rest/pom.xml
+++ b/services-configuration-rest/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>services-configuration-rest</artifactId>


=====================================
services-configuration-topia/pom.xml
=====================================
--- a/services-configuration-topia/pom.xml
+++ b/services-configuration-topia/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>services-configuration-topia</artifactId>


=====================================
services-configuration/pom.xml
=====================================
--- a/services-configuration/pom.xml
+++ b/services-configuration/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>services-configuration</artifactId>


=====================================
services-rest/pom.xml
=====================================
--- a/services-rest/pom.xml
+++ b/services-rest/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>services-rest</artifactId>


=====================================
services-runner/pom.xml
=====================================
--- a/services-runner/pom.xml
+++ b/services-runner/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>services-runner</artifactId>


=====================================
services-topia/pom.xml
=====================================
--- a/services-topia/pom.xml
+++ b/services-topia/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>services-topia</artifactId>


=====================================
services-validation/pom.xml
=====================================
--- a/services-validation/pom.xml
+++ b/services-validation/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>services-validation</artifactId>


=====================================
services-validators/pom.xml
=====================================
--- a/services-validators/pom.xml
+++ b/services-validators/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>services-validators</artifactId>


=====================================
services/pom.xml
=====================================
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>services</artifactId>


=====================================
test/pom.xml
=====================================
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>test</artifactId>


=====================================
toolbox-maven-plugin/pom.xml
=====================================
--- a/toolbox-maven-plugin/pom.xml
+++ b/toolbox-maven-plugin/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>toolbox-maven-plugin</artifactId>
@@ -124,10 +124,6 @@
 
   </dependencies>
 
-  <properties>
-    <!-- aloow to deploy artifacts -->
-    <maven.deploy.skip>false</maven.deploy.skip>
-  </properties>
   <build>
 
     <plugins>


=====================================
topia-extension/pom.xml
=====================================
--- a/topia-extension/pom.xml
+++ b/topia-extension/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>topia-extension</artifactId>


=====================================
topia-templates-extension/pom.xml
=====================================
--- a/topia-templates-extension/pom.xml
+++ b/topia-templates-extension/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>3.0-RC-1</version>
+    <version>6.0-RC-1</version>
   </parent>
 
   <artifactId>topia-templates-extension</artifactId>



View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/2ac0abaf8113e65dcf72d3b544...

    