Updated pom and MPC for maven build

jredmondson · Jun 25, 2018 · eac2179 · eac2179
1 parent bd5949a
commit eac2179
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/Madara.mpc b/Madara.mpc
@@ -139,7 +139,8 @@ project (Madara_Version) : using_madara {
 project (Madara_Jar) : using_madara, port/java/using_java {
   requires += java
 
-  prebuild += mvn -f port/java -Dmadara-version=`cat VERSION.txt` -P development clean package install
+  prebuild += mvn -f port/java versions:set -DnewVersion=`cat VERSION.txt`
+  prebuild += mvn -f port/java -P development clean package install
 }
 
 

diff --git a/port/java/pom.xml b/port/java/pom.xml
@@ -21,6 +21,12 @@
       <url>https://github.com/jredmondson/madara/blob/master/LICENSE.txt</url>
     </license>
   </licenses>
+
+ <properties>
+        <madara.version>3.2.0</madara.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      </properties>
+
   <build>
     <plugins>
 
@@ -55,12 +61,7 @@
   <profiles>
     <profile>
       <id>release</id>
-      <properties>
-        <madara.version>3.2.0</madara.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      </properties>
-
-      <build>
+       <build>
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -123,10 +124,6 @@
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
-      <properties>
-        <madara.version>3.2.0-DEV</madara.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      </properties>
     </profile>
   </profiles>