LPS-47133 Build problem caused by bnd in China

brianchandotcom · May 28, 2014 · 6518a82 · 6518a82
1 parent 8c1e64f
commit 6518a82
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 32 deletions.
diff --git a/build.properties b/build.properties
@@ -20,6 +20,38 @@
 
     baseline.jar.reports.dir.name=baseline-reports
 
+    -baseline=
+    -baselinerepo= remoterepo
+    -plugin=\
+        aQute.bnd.deployer.repository.LocalIndexedRepo;\
+            local=${project.dir}/.bnd/localrepo;\
+            name=localrepo;\
+            phase=any;\
+            type=R5,\
+        aQute.bnd.deployer.repository.FixedIndexedRepo;\
+            cache=${project.dir}/.bnd/bndtoolsrepo;\
+            locations='https://github.com/bndtools/bundle-hub/raw/master/index.xml.gz';\
+            name=bndtoolsrepo;\
+            phase=any;\
+            type=R5,\
+        aQute.bnd.deployer.repository.FixedIndexedRepo;\
+            cache=${project.dir}/.bnd/remoterepo;\
+            locations='http://obr.liferay.com/r5/liferay-portal/index.xml.gz';\
+            name=remoterepo;\
+            phase=any;\
+            type=R5
+    -pluginpath= ${project.dir}/tools/sdk/osgi/lib/plugin/bnd-repository.jar
+    -releaserepo= localrepo
+
+##
+## BND Test Properties
+##
+
+    -resolve.effective= active
+    -runee= JavaSE-1.6
+    -runfw= org.apache.felix.framework
+    -runvm= -ea
+
 ##
 ## Compiler
 ##

diff --git a/common.bnd b/common.bnd
@@ -16,37 +16,6 @@ Liferay-Portal-Release-Info: ${release.info.release.info}
 Liferay-Portal-Server-Info: ${release.info.server.info}
 Liferay-Portal-Version: ${release.info.version}
 
--baseline:
--baselinerepo: remoterepo
 -donotcopy: (\.touch)
 -dsannotations: *
--plugin:\
-	aQute.bnd.deployer.repository.LocalIndexedRepo;\
-		local=${workspace}/.bnd/localrepo;\
-		name=localrepo;\
-		phase=any;\
-		type=R5,\
-	aQute.bnd.deployer.repository.FixedIndexedRepo;\
-		cache=${workspace}/.bnd/bndtoolsrepo;\
-		locations='https://github.com/bndtools/bundle-hub/raw/master/index.xml.gz';\
-		name=bndtoolsrepo;\
-		phase=any;\
-		type=R5,\
-	aQute.bnd.deployer.repository.FixedIndexedRepo;\
-		cache=${workspace}/.bnd/remoterepo;\
-		locations='http://obr.liferay.com/r5/liferay-portal/index.xml.gz';\
-		name=remoterepo;\
-		phase=any;\
-		type=R5
--pluginpath: ${workspace}/tools/sdk/osgi/lib/plugin/bnd-repository.jar
--releaserepo: localrepo
--sources: false
-
-##
-## Test Properties
-##
-
--resolve.effective: active
--runee: JavaSE-1.6
--runfw: org.apache.felix.framework
--runvm: -ea
+-sources: false