Merge branch 'morphemic-rc1.5' into 'master'

Morphemic rc1.5

See merge request melodic/morphemic-preprocessor!19

.gitlab-ci.yml

@@ -36,7 +36,6 @@ build:
     paths:
       - /builds/melodic/morphemic-preprocessor/maven_repo/org/activeeon/scheduling-abstraction-layer/
 
-#todo add deploy jar to nexus
 deploy:
   stage: deploy
   image: $MAVEN_IMAGE
@@ -44,4 +43,4 @@ deploy:
     - master
     - morphemic-rc1.5
   script:
-    - $SCHEDULING_ABSTRACTION_LAYER_CLI clean install
+    - $SCHEDULING_ABSTRACTION_LAYER_CLI deploy

scheduling-abstraction-layer/pom.xml

@@ -176,6 +176,23 @@
         </configuration>
       </plugin>
     </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.1</version>
+          <executions>
+            <execution>
+              <id>default-deploy</id>
+              <phase>deploy</phase>
+              <goals>
+                <goal>deploy</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 
   <repositories>
@@ -192,5 +209,24 @@
       <id>maven-central</id>
       <url>https://repo1.maven.org/maven2/</url>
     </repository>
+    <repository>
+      <id>eu.7bulls</id>
+      <name>Melodic 7bulls repository</name>
+      <url>https://nexus.7bulls.eu:8443/repository/maven-public/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
   </repositories>
+
+  <distributionManagement>
+    <snapshotRepository>
+      <id>eu.7bulls</id>
+      <name>Melodic 7bulls repository</name>
+      <url>https://nexus.7bulls.eu:8443/repository/maven-snapshots/</url>
+    </snapshotRepository>
+  </distributionManagement>
 </project>

scheduling-abstraction-layer/scheduling-abstraction-layer.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="sonarModuleSettings">
-    <option name="alternativeWorkingDirPath" value="" />
-    <option name="localAnalysisScripName" value="&lt;PROJECT&gt;" />
-    <option name="serverName" value="&lt;PROJECT&gt;" />
-    <option name="useAlternativeWorkingDir" value="false" />
-    <option name="workingDirSelection" value="&lt;MODULE&gt;" />
-  </component>
-</module>
\ No newline at end of file