From 768762d32ab291c8cf6c495b342df78466cde5cd Mon Sep 17 00:00:00 2001 From: hieplq Date: Sun, 21 May 2017 00:29:38 +0700 Subject: [PATCH] IDEMPIERE-3136:all stuff relate library of idempiere sync/clean/test when merger to core --- org.adempiere.base/copyjars.xml | 4 ---- org.adempiere.install/install.app.launch | 3 +++ .../note_for_update_jr_library.readme | 4 +++- org.adempiere.sdk-feature/adempiere.rmap | 2 -- org.adempiere.sdk-feature/materialize.properties | 16 +++++++--------- .../server.product.launch | 9 ++++++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/org.adempiere.base/copyjars.xml b/org.adempiere.base/copyjars.xml index 385fdb2d80..d0e26e1137 100644 --- a/org.adempiere.base/copyjars.xml +++ b/org.adempiere.base/copyjars.xml @@ -8,12 +8,8 @@ - - - - diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index 71cf48bc72..c6710e9087 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -14,6 +14,9 @@ + + + diff --git a/org.adempiere.report.jasper.library/note_for_update_jr_library.readme b/org.adempiere.report.jasper.library/note_for_update_jr_library.readme index 340b15931f..5293d7804a 100644 --- a/org.adempiere.report.jasper.library/note_for_update_jr_library.readme +++ b/org.adempiere.report.jasper.library/note_for_update_jr_library.readme @@ -48,4 +48,6 @@ so just change file name to net.sf.jasperreports.engine_6.3.1.jar and run ${ECLI note: net.sf.jasperreports.engine_6.3.1.jar use package dynamic import -6. com.jaspersoft.studio.bundles.itext_2.1.7.js5 already have bcprov-jdk14-139 on Bundle-ClassPath, but manifest still import package from bcprov-jdk14-139. so i modify its manifest before call ${ECLIPSE_FOLDER}/eclipse -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \ No newline at end of file +6. com.jaspersoft.studio.bundles.itext_2.1.7.js5 already have bcprov-jdk14-139 on Bundle-ClassPath, but manifest still import package from bcprov-jdk14-139. so i modify its manifest before call ${ECLIPSE_FOLDER}/eclipse -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher + +7. org.krysalis.barcode4j_2.1.0.jar have osgi version on maven but it dependency to org.apache.avalon, so use version from jasper report. it modify manifest.mf to don't depend to org.apache.avalon \ No newline at end of file diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap index ddd44fe17b..93d61f6c01 100644 --- a/org.adempiere.sdk-feature/adempiere.rmap +++ b/org.adempiere.sdk-feature/adempiere.rmap @@ -68,8 +68,6 @@ - - diff --git a/org.adempiere.sdk-feature/materialize.properties b/org.adempiere.sdk-feature/materialize.properties index 0ef1a6dc26..37961e37f8 100644 --- a/org.adempiere.sdk-feature/materialize.properties +++ b/org.adempiere.sdk-feature/materialize.properties @@ -6,7 +6,7 @@ target.os=* target.ws=* target.arch=* -#local.repository.root=file:///mnt/data/dev/project/me/repository/stuff/setup.idempiere/localRepository +local.repository.root=http://downloads.sourceforge.net/project/idempiere/binary.file local.repository.root.maven=http://central.maven.org/maven2 url.maven2=http://central.maven.org @@ -14,23 +14,21 @@ url.maven2.lib=http://central.maven.org url.maven.zkoss=http://mavensync.zkoss.org url.maven.zkoss.lib=http://mavensync.zkoss.org -url.zkoss.osgi=http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/zk-p2/zk-8.0.1.1/ - -url.maven.restlet=http://maven.restlet.org +url.zkoss.osgi=${local.repository.root}/jarfile/zk-p2/zk-8.0.2.2/ url.equinox=http://download.eclipse.org/eclipse/updates/4.6 url.jetty=http://download.eclipse.org/jetty/updates/jetty-bundles-9.x -url.orbit=http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository +url.orbit=http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository -url.file.srv=http://downloads.sourceforge.net/project/idempiere/binary.file +url.file.srv=${local.repository.root} url.restlet.p2=http://p2.restlet.com/2.3 -url.modify.bundle=http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/modifyBundle-1.0.0 +url.modify.bundle=${local.repository.root}/jarfile/modifyBundle-1.0.0 -url.file.jp.lib=http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/jp-6.3.1 +url.file.jp.lib=${local.repository.root}/jarfile/jp-6.3.1 -url.jp.p2=http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/jp-p2/jp-6.3.1 +url.jp.p2=${local.repository.root}/jarfile/jp-p2/jp-6.3.1 url.alpn.boot=http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index fbd978560b..1e5e3aeab5 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -16,16 +16,19 @@ + + + - + - - + +