GitLab

at 2017-03-08T18:01:18+01:00

[jgitflow-maven-plugin]updating poms for 3.0-RC-2-SNAPSHOT development
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts
[jgitflow-maven-plugin]merging 'master' into 'develop'
[jgitflow-maven-plugin]Updating develop poms back to pre merge state
improve release scripts

prepare release 6.0-RC-1 + fix release

[jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
prepare release 6.0-RC-1 + fix release

[jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
prepare release 6.0-RC-1 + fix release

[jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions
[jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master'
   <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>

   <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>

   <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>

   <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>

   <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>

   <description>ObServe Application Swing</description>

 

   <properties>

-    <maven.deploy.skip>true</maven.deploy.skip>

 

     <!-- jaxx configuration -->

     <jaxx.validatorFactoryFQN>

   <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>

 

   </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>
   <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>

   <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>

 

   </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>
    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

   <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>

   <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>

   <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>

 

   <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>

     <!--Modèle version-->

     <observe.model.version>6.0</observe.model.version>

 

+    <!-- deploy nothing -->

+    <maven.deploy.skip>true</maven.deploy.skip>

+

   </properties>

 

   <dependencyManagement>

                       <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>

   <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>

   <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>

   <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>

   <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>

   <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>

   <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>

   <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>

   <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>

   <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>

   <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>

   <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>

   <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>

 

   </dependencies>

 

-  <properties>

-    <!-- aloow to deploy artifacts -->

-    <maven.deploy.skip>false</maven.deploy.skip>

-  </properties>

   <build>

 

     <plugins>

   <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>

   <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>

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

Commits:

26 changed files:

Changes: