Pull request #22: [maven-release-plugin] prepare for next development iteration

Merge in EDELIVERY/smp from master to development

* commit '5347a5bb':
  fix oracle member db script
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release 5.0-RC1
  fix deployment version for smp-wls-deploy

smp-webapp/src/main/smp-setup/database-scripts/migration from 4.2 to 5.0/mysql5innoDb-4.2_to_5.0-step_02.sql

@@ -87,4 +87,4 @@ insert into SMP_RESOURCE_MEMBER ( CREATED_ON, LAST_UPDATED_ON, MEMBERSHIP_ROLE,
 
 -- the SMP Resource memberships
 insert into SMP_RESOURCE_MEMBER ( CREATED_ON, LAST_UPDATED_ON, MEMBERSHIP_ROLE, FK_RESOURCE_ID, FK_USER_ID)
-    select NOW(), NOW(), 'ADMIN', ow.FK_SG_ID, usr.ID from BCK_USER usr JOIN BCK_OWNERSHIP ow ON ow.FK_USER_ID = usr.id  where usr.ROLE='SERVICE_GROUP_ADMIN';
+    select NOW(), NOW(), 'ADMIN', sgd.ID, usr.ID from BCK_USER usr JOIN BCK_OWNERSHIP ow ON ow.FK_USER_ID = usr.id JOIN BCK_SERVICE_GROUP_DOMAIN sgd ON sgd.FK_SG_ID=ow.FK_SG_ID where usr.ROLE='SERVICE_GROUP_ADMIN';

smp-webapp/src/main/smp-setup/database-scripts/migration from 4.2 to 5.0/oracle10g-4.2_to_5.0-step_02.sql

@@ -88,4 +88,4 @@ insert into SMP_RESOURCE_MEMBER ( ID, CREATED_ON, LAST_UPDATED_ON, MEMBERSHIP_RO
 
 -- the SMP Resource memberships
 insert into SMP_RESOURCE_MEMBER (ID, CREATED_ON, LAST_UPDATED_ON, MEMBERSHIP_ROLE, FK_RESOURCE_ID, FK_USER_ID)
-    select SMP_RESOURCE_MEMBER_SEQ.nextval, sysdate, sysdate, 'ADMIN', ow.FK_SG_ID, usr.ID from BCK_USER usr JOIN BCK_OWNERSHIP ow ON  ow.FK_USER_ID = usr.id where usr.ROLE='SERVICE_GROUP_ADMIN';
+    select SMP_RESOURCE_MEMBER_SEQ.nextval, sysdate, sysdate, 'ADMIN', sgd.ID, usr.ID from BCK_USER usr JOIN BCK_OWNERSHIP ow ON ow.FK_USER_ID = usr.id  JOIN BCK_SERVICE_GROUP_DOMAIN sgd ON sgd.FK_SG_ID=ow.FK_SG_ID  where usr.ROLE='SERVICE_GROUP_ADMIN';

smp-wls-deploy/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>eu.europa.ec.edelivery</groupId>
         <artifactId>smp-modules</artifactId>
-        <version>5.0-SNAPSHOT</version>
+        <version>5.0-RC2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>smp-wls-deploy</artifactId>
@@ -74,4 +74,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>