[ENGOPS-1416] updates to ivysettings.xml and subfloor build files

dikang123 · Aug 26, 2015 · 2d2f329 · 2d2f329
1 parent 855b96b
commit 2d2f329
Show file tree

Hide file tree

Showing 86 changed files with 20,700 additions and 8,948 deletions.
diff --git a/assembly/build-res/subfloor-pkg.xml b/assembly/build-res/subfloor-pkg.xml
diff --git a/assembly/build-res/subfloor.xml b/assembly/build-res/subfloor.xml
diff --git a/assembly/ivysettings.xml b/assembly/ivysettings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivysettings>
   <properties environment="env" />
+  <property name="maven.local.repo" value="${user.home}/.m2/repository" overide="false" />
   <property name="ivy.local.default.root" value="${ivy.default.ivy.user.dir}/local" override="true" />
   <property name="ivy.local.default.artifact.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact]-[revision].[ext]"
     override="false" />
@@ -22,6 +23,7 @@
         </url>
         <ibiblio name="pentaho-mvn" m2compatible="true" root="${pentaho.resolve.repo}" />
       </dual>
+      <ibiblio name="local-mvn" m2compatible="true" root=”file://${maven.local.repo}” changingPattern=".*-SNAPSHOT.*" />
       <ibiblio name="public-maven" root="${public.resolve.repo}" m2compatible="true" />
     </chain>
   </resolvers>

diff --git a/build-res/ivysettings.xml b/build-res/ivysettings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivysettings>
   <properties environment="env" />
+  <property name="maven.local.repo" value="${user.home}/.m2/repository" overide="false" />
   <property name="ivy.local.default.root" value="${ivy.default.ivy.user.dir}/local" override="true" />
   <property name="ivy.local.default.artifact.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact]-[revision].[ext]"
     override="false" />
@@ -22,6 +23,7 @@
         </url>
         <ibiblio name="pentaho-mvn" m2compatible="true" root="${pentaho.resolve.repo}" />
       </dual>
+      <ibiblio name="local-mvn" m2compatible="true" root=”file://${maven.local.repo}” changingPattern=".*-SNAPSHOT.*" />
       <ibiblio name="public-maven" root="${public.resolve.repo}" m2compatible="true" />
     </chain>
   </resolvers>