midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3531:adapt with buckminster method 

maven have beta version of groovy-all, so fix version of groovy-all to help buckminster materialize
new version of org.apache.commons.configuration request org.apache.commons.lang3
correct source bundle of zk and https://github.com/jetty-project/jasper-jsp/issues/5
update launch
This commit is contained in:
hieplq 2018-02-26 03:11:03 +07:00
parent 689276e473
commit 9b33710a19
6 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.adempiere.base-feature/feature.xml
View File

@ -340,7 +340,7 @@
id="groovy-all" id="groovy-all"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="2.4.13"
unpack="false"/> unpack="false"/>
<plugin <plugin
@ -414,4 +414,11 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.commons.lang3"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature> </feature>

4
org.adempiere.base/META-INF/MANIFEST.MF
View File

@ -121,5 +121,5 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
com.itextpdf;bundle-version="0.0.0", com.itextpdf;bundle-version="0.0.0",
net.sf.supercsv.super-csv;bundle-version="0.0.0", net.sf.supercsv.super-csv;bundle-version="0.0.0",
bcprov;bundle-version="1.54.0", bcprov;bundle-version="1.54.0",
groovy-all;bundle-version="[2.4.7,2.5.0)", groovy-all;bundle-version="0.0.0",
org.krysalis.barcode4j;bundle-version="2.1.0" org.krysalis.barcode4j;bundle-version="0.0.0"

2
org.adempiere.install/install.app.launch
View File

@ -24,7 +24,7 @@
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/> <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
<stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.adempiere.server.server_product"/> <stringAttribute key="product" value="org.adempiere.server.server_product"/>
<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:false,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/> <stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.10.1.v20170504-0840@default:default,org.apache.ant*1.9.6.v201510161327@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:false,org.apache.commons.codec*1.9.0.v20170208-1614@default:false,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.scr*2.0.10.v20170501-2007@default:default,org.apache.felix.scr*2.0.8.v20170501-2007@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet*2.0.5.v201605172130@default:default,org.restlet*2.3.2.v20150501-1520@default:default,org.slf4j.api*1.7.10.v20170428-1633@default:default,org.slf4j.api*1.7.2.v20121108-1250@default:default,org.slf4j.jcl@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false"/> <stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false"/>
<booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>

4
org.adempiere.server-feature/server.product.launch
View File

File diff suppressed because one or more lines are too long

3
org.idempiere.maven.to.p2/.classpath
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="output" path="target"/>
<classpathentry kind="output" path="bin"/>
</classpath> </classpath>

26
org.idempiere.maven.to.p2/pom.xml
View File

@ -15,7 +15,6 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.reficio</groupId> <groupId>org.reficio</groupId>
<artifactId>p2-maven-plugin</artifactId> <artifactId>p2-maven-plugin</artifactId>
@ -48,7 +47,8 @@
</artifact> </artifact>
<artifact> <artifact>
<id>org.mortbay.jasper:apache-jsp:jar:8.5.23</id> <id>org.mortbay.jasper:apache-jsp:jar:8.5.23</id>
<source>true</source> <!-- https://github.com/jetty-project/jasper-jsp/issues/5 -->
<source>false</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact> <artifact>
@ -86,6 +86,7 @@
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<!--
<artifact> <artifact>
<id>org.ow2.asm:asm-commons:jar:6.0</id> <id>org.ow2.asm:asm-commons:jar:6.0</id>
<source>true</source> <source>true</source>
@ -100,7 +101,7 @@
<id>org.ow2.asm:asm:jar:6.0</id> <id>org.ow2.asm:asm:jar:6.0</id>
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>-->
<artifact> <artifact>
<id>org.apache.taglibs:taglibs-standard-impl:jar:1.2.5</id> <id>org.apache.taglibs:taglibs-standard-impl:jar:1.2.5</id>
<source>true</source> <source>true</source>
@ -276,7 +277,7 @@
<source>false</source> <source>false</source>
<transitive>false</transitive> <transitive>false</transitive>
<instructions> <instructions>
<Eclipse-SourceBundle>zkplus;version="${project.version}";roots:="."</Eclipse-SourceBundle> <Eclipse-SourceBundle>zkplus;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
<Bundle-SymbolicName>zkplus</Bundle-SymbolicName> <Bundle-SymbolicName>zkplus</Bundle-SymbolicName>
<Bundle-Name>zkplus.source</Bundle-Name> <Bundle-Name>zkplus.source</Bundle-Name>
</instructions> </instructions>
@ -286,7 +287,7 @@
<source>false</source> <source>false</source>
<transitive>false</transitive> <transitive>false</transitive>
<instructions> <instructions>
<Eclipse-SourceBundle>zweb;version="${project.version}";roots:="."</Eclipse-SourceBundle> <Eclipse-SourceBundle>zweb;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
<Bundle-SymbolicName>zweb</Bundle-SymbolicName> <Bundle-SymbolicName>zweb</Bundle-SymbolicName>
<Bundle-Name>zweb.source</Bundle-Name> <Bundle-Name>zweb.source</Bundle-Name>
</instructions> </instructions>
@ -296,7 +297,7 @@
<source>false</source> <source>false</source>
<transitive>false</transitive> <transitive>false</transitive>
<instructions> <instructions>
<Eclipse-SourceBundle>zul;version="${project.version}";roots:="."</Eclipse-SourceBundle> <Eclipse-SourceBundle>zul;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
<Bundle-SymbolicName>zul</Bundle-SymbolicName> <Bundle-SymbolicName>zul</Bundle-SymbolicName>
<Bundle-Name>zul.source</Bundle-Name> <Bundle-Name>zul.source</Bundle-Name>
</instructions> </instructions>
@ -306,7 +307,7 @@
<source>false</source> <source>false</source>
<transitive>false</transitive> <transitive>false</transitive>
<instructions> <instructions>
<Eclipse-SourceBundle>zk;version="${project.version}";roots:="."</Eclipse-SourceBundle> <Eclipse-SourceBundle>zk;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
<Bundle-SymbolicName>zk</Bundle-SymbolicName> <Bundle-SymbolicName>zk</Bundle-SymbolicName>
<Bundle-Name>zk.source</Bundle-Name> <Bundle-Name>zk.source</Bundle-Name>
</instructions> </instructions>
@ -316,7 +317,7 @@
<source>false</source> <source>false</source>
<transitive>false</transitive> <transitive>false</transitive>
<instructions> <instructions>
<Eclipse-SourceBundle>zhtml;version="${project.version}";roots:="."</Eclipse-SourceBundle> <Eclipse-SourceBundle>zhtml;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
<Bundle-SymbolicName>zhtml</Bundle-SymbolicName> <Bundle-SymbolicName>zhtml</Bundle-SymbolicName>
<Bundle-Name>zhtml.source</Bundle-Name> <Bundle-Name>zhtml.source</Bundle-Name>
</instructions> </instructions>
@ -326,7 +327,7 @@
<source>false</source> <source>false</source>
<transitive>false</transitive> <transitive>false</transitive>
<instructions> <instructions>
<Eclipse-SourceBundle>zkbind;version="${project.version}";roots:="."</Eclipse-SourceBundle> <Eclipse-SourceBundle>zkbind;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
<Bundle-SymbolicName>zkbind</Bundle-SymbolicName> <Bundle-SymbolicName>zkbind</Bundle-SymbolicName>
<Bundle-Name>zkbind.source</Bundle-Name> <Bundle-Name>zkbind.source</Bundle-Name>
</instructions> </instructions>
@ -336,7 +337,7 @@
<source>false</source> <source>false</source>
<transitive>false</transitive> <transitive>false</transitive>
<instructions> <instructions>
<Eclipse-SourceBundle>zel;version="${project.version}";roots:="."</Eclipse-SourceBundle> <Eclipse-SourceBundle>zel;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
<Bundle-SymbolicName>zel</Bundle-SymbolicName> <Bundle-SymbolicName>zel</Bundle-SymbolicName>
<Bundle-Name>zel.source</Bundle-Name> <Bundle-Name>zel.source</Bundle-Name>
</instructions> </instructions>
@ -346,7 +347,7 @@
<source>false</source> <source>false</source>
<transitive>false</transitive> <transitive>false</transitive>
<instructions> <instructions>
<Eclipse-SourceBundle>zcommon;version="${project.version}";roots:="."</Eclipse-SourceBundle> <Eclipse-SourceBundle>zcommon;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
<Bundle-SymbolicName>zcommon</Bundle-SymbolicName> <Bundle-SymbolicName>zcommon</Bundle-SymbolicName>
<Bundle-Name>zcommon.source</Bundle-Name> <Bundle-Name>zcommon.source</Bundle-Name>
</instructions> </instructions>
@ -356,7 +357,7 @@
<source>false</source> <source>false</source>
<transitive>false</transitive> <transitive>false</transitive>
<instructions> <instructions>
<Eclipse-SourceBundle>zjavassist;version="${project.version}";roots:="."</Eclipse-SourceBundle> <Eclipse-SourceBundle>zjavassist;version="${zk-version}";roots:="."</Eclipse-SourceBundle>
<Bundle-SymbolicName>zjavassist</Bundle-SymbolicName> <Bundle-SymbolicName>zjavassist</Bundle-SymbolicName>
<Bundle-Version>${zk-version}</Bundle-Version> <Bundle-Version>${zk-version}</Bundle-Version>
<Bundle-Name>zjavassist.source</Bundle-Name> <Bundle-Name>zjavassist.source</Bundle-Name>
@ -579,6 +580,7 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- update P2 after add zk lib --> <!-- update P2 after add zk lib -->
<plugin> <plugin>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>