DME 830: Export and import of mappings / Upgrade of metamodel

Task-Url: https://minfba.de.dariah.eu/mantisbt/view.php?id=830

dariahsp-core/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.dariah.de</groupId>
     <artifactId>dariahsp</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>dariahsp-core</artifactId>
   <name>dariahsp - core library</name>
@@ -18,14 +18,14 @@
     </dependency>
   	
   	<dependency>
-		<groupId>de.unibamberg.minf.dme.core</groupId>
+		<groupId>de.unibamberg.minf.core</groupId>
 		<artifactId>core-metamodel</artifactId>
-		<version>${de.unibamberg.minf.dme.core-metamodel.version}</version>
+		<version>${de.unibamberg.minf.core.core-metamodel.version}</version>
 	</dependency>
 	<dependency>
-		<groupId>eu.dariah.de.minfba.core</groupId>
+		<groupId>de.unibamberg.minf.core</groupId>
 		<artifactId>core-util</artifactId>
-		<version>${eu.dariah.de.minfba.core-util.version}</version>
+		<version>${de.unibamberg.minf.core.core-util.version}</version>
 	</dependency>
   	<dependency>
   		<groupId>eu.dariah.eu</groupId>

dariahsp-core/src/main/java/eu/dariah/de/dariahsp/local/LocalUserConf.java

 package eu.dariah.de.dariahsp.local;
 
-import eu.dariah.de.minfba.core.util.conversion.BaseConfigurationConvertible;
+import de.unibamberg.minf.core.util.conversion.BaseConfigurationConvertible;
 
 public class LocalUserConf extends BaseConfigurationConvertible {
 	private static final long serialVersionUID = 5019731121422808251L;

dariahsp-core/src/main/java/eu/dariah/de/dariahsp/saml/attributequery/options/SAMLAttributeGroup.java

@@ -2,9 +2,9 @@ package eu.dariah.de.dariahsp.saml.attributequery.options;
 
 import java.util.List;
 
+import de.unibamberg.minf.core.util.conversion.BaseConfigurationConvertible;
 import eu.dariah.de.dariahsp.Constants.REQUIRED_ATTRIBUTE_CHECKLOGIC;
 import eu.dariah.de.dariahsp.saml.model.SAMLAttribute;
-import eu.dariah.de.minfba.core.util.conversion.BaseConfigurationConvertible;
 
 public class SAMLAttributeGroup extends BaseConfigurationConvertible {
 	private static final long serialVersionUID = -7188665456657464324L;

dariahsp-core/src/main/java/eu/dariah/de/dariahsp/saml/attributequery/options/SAMLRequiredAttributes.java

 package eu.dariah.de.dariahsp.saml.attributequery.options;
 
 import java.util.List;
+
+import de.unibamberg.minf.core.util.conversion.BaseConfigurationConvertible;
 import eu.dariah.de.dariahsp.Constants.AUTHENTICATION_STAGE;
-import eu.dariah.de.minfba.core.util.conversion.BaseConfigurationConvertible;
 
 public class SAMLRequiredAttributes extends BaseConfigurationConvertible {
 	private static final long serialVersionUID = 2303075498393395435L;

dariahsp-core/src/main/java/eu/dariah/de/dariahsp/saml/model/SAMLAttribute.java

 package eu.dariah.de.dariahsp.saml.model;
 
-import eu.dariah.de.minfba.core.util.conversion.BaseConfigurationConvertible;
+import de.unibamberg.minf.core.util.conversion.BaseConfigurationConvertible;
 
 public class SAMLAttribute extends BaseConfigurationConvertible {
 	private static final long serialVersionUID = -926489867985009574L;

dariahsp-sample/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>eu.dariah.de</groupId>
 		<artifactId>dariahsp</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dariahsp-sample</artifactId>
 	<packaging>war</packaging>
@@ -12,7 +12,7 @@
 
 	<properties>
 		<org.apache.tiles-version>3.0.7</org.apache.tiles-version>
-		<eu.dariah.de.minfba.core-web.version>1.5.0-SNAPSHOT</eu.dariah.de.minfba.core-web.version>
+		<de.unibamberg.minf.core.core-web.version>2.0.0-SNAPSHOT</de.unibamberg.minf.core.core-web.version>
 	</properties>
 	
 	<dependencies>
@@ -23,9 +23,9 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>eu.dariah.de.minfba.core</groupId>
+			<groupId>de.unibamberg.minf.core</groupId>
 			<artifactId>core-web</artifactId>
-			<version>${eu.dariah.de.minfba.core-web.version}</version>
+			<version>${de.unibamberg.minf.core.core-web.version}</version>
 		</dependency>
 		
 		<!-- Spring -->

dariahsp-sample/src/main/resources/spring/config-context.xml

@@ -14,7 +14,7 @@
 	    <property name="resources" ref="configLocation"/>
 	</bean>
 
-	<bean class="eu.dariah.de.minfba.core.util.init.ListAwarePropertySourcesPlaceholderConfigurer">
+	<bean class="de.unibamberg.minf.core.util.init.ListAwarePropertySourcesPlaceholderConfigurer">
 	    <property name="properties" ref="properties" />
 	    <property name="objectMapper" ref="objectMapper" />
 	    <property name="conversionService" ref="conversionService" />
@@ -23,7 +23,7 @@
 	<bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
         <property name="converters">
             <list>
-                <bean class="eu.dariah.de.minfba.core.util.conversion.JsonToStringConverter" />
+                <bean class="de.unibamberg.minf.core.util.conversion.JsonToStringConverter" />
             </list>
         </property>
     </bean>

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.dariah.de</groupId>
   <artifactId>dariahsp</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <name>dariahsp - parent pom</name>
   <description>Metapackage for the DARIAH Service Provider (dariahsp) library</description>
   <packaging>pom</packaging>
@@ -20,8 +20,8 @@
 	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-	<de.unibamberg.minf.dme.core-metamodel.version>4.1.0-SNAPSHOT</de.unibamberg.minf.dme.core-metamodel.version>
-	<eu.dariah.de.minfba.core-util.version>1.1.0-SNAPSHOT</eu.dariah.de.minfba.core-util.version>
+	<de.unibamberg.minf.core.core-metamodel.version>4.2.0-SNAPSHOT</de.unibamberg.minf.core.core-metamodel.version>
+	<de.unibamberg.minf.core.core-util.version>2.0.0-SNAPSHOT</de.unibamberg.minf.core.core-util.version>
 	
 	<org.springframework-version>4.3.6.RELEASE</org.springframework-version>
 	<org.springsecurity-version>4.2.1.RELEASE</org.springsecurity-version>