LPS-47133 Build problem caused by bnd in China

liferay · May 28, 2014 · f2e31d8 · f2e31d8
1 parent 38741b6
commit f2e31d8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/build.properties b/build.properties
@@ -152,6 +152,23 @@
 
     baseline.jar.reports.dir.name=baseline-reports
 
+    -baseline:
+    -baselinerepo: localrepo
+    -plugin:\
+        aQute.bnd.deployer.repository.LocalIndexedRepo;\
+            local=${sdk.dir}/.bnd/localrepo;\
+            name=localrepo;\
+            phase=build;\
+            type=R5,\
+        aQute.bnd.deployer.repository.FixedIndexedRepo;\
+            cache=${sdk.dir}/.bnd/remoterepo;\
+            locations='http://obr.liferay.com/r5/liferay-portal/index.xml.gz';\
+            name=remoterepo;\
+            phase=any;\
+            type=R5
+    -pluginpath: ${sdk.dir}/osgi/lib/plugin/bnd-repository.jar
+    -releaserepo: localrepo
+
 ##
 ## Clean
 ##

diff --git a/common.bnd b/common.bnd
@@ -8,22 +8,6 @@ Javac-Debug: ${javac.debug}
 Javac-Deprecation: ${javac.deprecation}
 Javac-Encoding: ${javac.encoding}
 
--baseline: *
--baselinerepo: localrepo
 -donotcopy: (\.touch)
 -dsannotations: *
--plugin:\
-	aQute.bnd.deployer.repository.LocalIndexedRepo;\
-		local=${workspace}/.bnd/localrepo;\
-		name=localrepo;\
-		phase=build;\
-		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}/osgi/lib/plugin/bnd-repository.jar
--releaserepo: localrepo
 -sources: false