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

IDEMPIERE-5980:spring-jcl make conflict between an export and import (slow down start idempiere on some condition) (#2175) 

* IDEMPIERE-5980:spring-jcl make conflict between an export and import (slow down start idempiere on some condition)
This commit is contained in:
hieplq 2024-01-05 19:29:49 +07:00 committed by Carlos Ruiz
parent 3d6ac16d00
commit 0ea6a0352b
9 changed files with 3 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.adempiere.server-feature/server.product.functionaltest.launch
View File

@ -402,7 +402,6 @@
<setEntry value="wrapped.org.springframework.spring-context@default:default"/> <setEntry value="wrapped.org.springframework.spring-context@default:default"/>
<setEntry value="wrapped.org.springframework.spring-core@default:default"/> <setEntry value="wrapped.org.springframework.spring-core@default:default"/>
<setEntry value="wrapped.org.springframework.spring-expression@default:default"/> <setEntry value="wrapped.org.springframework.spring-expression@default:default"/>
<setEntry value="wrapped.org.springframework.spring-jcl@default:default"/>
<setEntry value="wrapped.org.springframework.spring-web@default:default"/> <setEntry value="wrapped.org.springframework.spring-web@default:default"/>
<setEntry value="wrapped.wsdl4j.wsdl4j@default:default"/> <setEntry value="wrapped.wsdl4j.wsdl4j@default:default"/>
<setEntry value="xstream@default:default"/> <setEntry value="xstream@default:default"/>

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

@ -402,7 +402,6 @@
<setEntry value="wrapped.org.springframework.spring-context@default:default"/> <setEntry value="wrapped.org.springframework.spring-context@default:default"/>
<setEntry value="wrapped.org.springframework.spring-core@default:default"/> <setEntry value="wrapped.org.springframework.spring-core@default:default"/>
<setEntry value="wrapped.org.springframework.spring-expression@default:default"/> <setEntry value="wrapped.org.springframework.spring-expression@default:default"/>
<setEntry value="wrapped.org.springframework.spring-jcl@default:default"/>
<setEntry value="wrapped.org.springframework.spring-web@default:default"/> <setEntry value="wrapped.org.springframework.spring-web@default:default"/>
<setEntry value="wrapped.wsdl4j.wsdl4j@default:default"/> <setEntry value="wrapped.wsdl4j.wsdl4j@default:default"/>
<setEntry value="xstream@default:default"/> <setEntry value="xstream@default:default"/>

7
org.idempiere.p2.targetplatform.mirror.feature/feature.xml
View File

@ -1067,13 +1067,6 @@
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="wrapped.org.springframework.spring-jcl"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.osgi.util.pushstream.source" id="org.osgi.util.pushstream.source"

15
org.idempiere.p2.targetplatform/maven.locations.xml
View File

@ -1068,7 +1068,7 @@ Export-Package: *;version="${version}";-noimport:=true
version: ${version_cleanup;${mvnVersion}} version: ${version_cleanup;${mvnVersion}}
Bundle-SymbolicName: wrapped.${mvnGroupId}.${mvnArtifactId} Bundle-SymbolicName: wrapped.${mvnGroupId}.${mvnArtifactId}
Bundle-Version: ${version} Bundle-Version: ${version}
Import-Package: *;resolution:=optional Import-Package: org.apache.commons.logging;version="[1.2,2)";resolution:=optional,org.apache.commons.logging.impl;version="[1.1.1,2)";resolution:=optional,*;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true Export-Package: *;version="${version}";-noimport:=true
]]></instructions> ]]></instructions>
</location> </location>
@ -1096,19 +1096,6 @@ Bundle-SymbolicName: wrapped.${mvnGroupId}.${mvnArtifactId}
Bundle-Version: ${version} Bundle-Version: ${version}
Import-Package: *;resolution:=optional Import-Package: *;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
<version>5.3.27</version>
<type>jar</type>
<instructions><![CDATA[Bundle-Name: Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
version: ${version_cleanup;${mvnVersion}}
Bundle-SymbolicName: wrapped.${mvnGroupId}.${mvnArtifactId}
Bundle-Version: ${version}
Import-Package: *;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true
]]></instructions> ]]></instructions>
</location> </location>
<!-- org.glassfish.jersey --> <!-- org.glassfish.jersey -->

1
org.idempiere.p2.targetplatform/org.idempiere.p2.repository.target
View File

@ -321,7 +321,6 @@
<plugin id="wrapped.org.springframework.spring-core"/> <plugin id="wrapped.org.springframework.spring-core"/>
<plugin id="wrapped.org.springframework.spring-expression"/> <plugin id="wrapped.org.springframework.spring-expression"/>
<plugin id="wrapped.org.springframework.spring-web"/> <plugin id="wrapped.org.springframework.spring-web"/>
<plugin id="wrapped.org.springframework.spring-jcl"/>
<plugin id="wrapped.wsdl4j.wsdl4j"/> <plugin id="wrapped.wsdl4j.wsdl4j"/>
<plugin id="xstream"/> <plugin id="xstream"/>
<plugin id="zcommon"/> <plugin id="zcommon"/>

17
org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
View File

@ -2,7 +2,7 @@
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<!-- when changing target name please change accordingly in the file utils_dev/oomph/idempiere.setup --> <!-- when changing target name please change accordingly in the file utils_dev/oomph/idempiere.setup -->
<target name="idempiere-231227" sequenceNumber="1688978990"> <target name="idempiere-240104" sequenceNumber="1688978991">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="zcommon" version="9.6.4"/> <unit id="zcommon" version="9.6.4"/>
@ -1215,7 +1215,7 @@ Export-Package: *;version="${version}";-noimport:=true
version: ${version_cleanup;${mvnVersion}} version: ${version_cleanup;${mvnVersion}}
Bundle-SymbolicName: wrapped.${mvnGroupId}.${mvnArtifactId} Bundle-SymbolicName: wrapped.${mvnGroupId}.${mvnArtifactId}
Bundle-Version: ${version} Bundle-Version: ${version}
Import-Package: *;resolution:=optional Import-Package: org.apache.commons.logging;version="[1.2,2)";resolution:=optional,org.apache.commons.logging.impl;version="[1.1.1,2)";resolution:=optional,*;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true Export-Package: *;version="${version}";-noimport:=true
]]></instructions> ]]></instructions>
</location> </location>
@ -1243,19 +1243,6 @@ Bundle-SymbolicName: wrapped.${mvnGroupId}.${mvnArtifactId}
Bundle-Version: ${version} Bundle-Version: ${version}
Import-Package: *;resolution:=optional Import-Package: *;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
<version>5.3.27</version>
<type>jar</type>
<instructions><![CDATA[Bundle-Name: Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
version: ${version_cleanup;${mvnVersion}}
Bundle-SymbolicName: wrapped.${mvnGroupId}.${mvnArtifactId}
Bundle-Version: ${version}
Import-Package: *;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true
]]></instructions> ]]></instructions>
</location> </location>
<!-- org.glassfish.jersey --> <!-- org.glassfish.jersey -->

1
org.idempiere.test/idempiere.unit.test.launch
View File

@ -384,7 +384,6 @@
<setEntry value="wrapped.org.springframework.spring-context@default:default"/> <setEntry value="wrapped.org.springframework.spring-context@default:default"/>
<setEntry value="wrapped.org.springframework.spring-core@default:default"/> <setEntry value="wrapped.org.springframework.spring-core@default:default"/>
<setEntry value="wrapped.org.springframework.spring-expression@default:default"/> <setEntry value="wrapped.org.springframework.spring-expression@default:default"/>
<setEntry value="wrapped.org.springframework.spring-jcl@default:default"/>
<setEntry value="wrapped.org.springframework.spring-web@default:default"/> <setEntry value="wrapped.org.springframework.spring-web@default:default"/>
<setEntry value="wrapped.wsdl4j.wsdl4j@default:default"/> <setEntry value="wrapped.wsdl4j.wsdl4j@default:default"/>
<setEntry value="xstream@default:default"/> <setEntry value="xstream@default:default"/>

1
org.idempiere.test/idempiere.unit.test.parallel.launch
View File

@ -384,7 +384,6 @@
<setEntry value="wrapped.org.springframework.spring-context@default:default"/> <setEntry value="wrapped.org.springframework.spring-context@default:default"/>
<setEntry value="wrapped.org.springframework.spring-core@default:default"/> <setEntry value="wrapped.org.springframework.spring-core@default:default"/>
<setEntry value="wrapped.org.springframework.spring-expression@default:default"/> <setEntry value="wrapped.org.springframework.spring-expression@default:default"/>
<setEntry value="wrapped.org.springframework.spring-jcl@default:default"/>
<setEntry value="wrapped.org.springframework.spring-web@default:default"/> <setEntry value="wrapped.org.springframework.spring-web@default:default"/>
<setEntry value="wrapped.wsdl4j.wsdl4j@default:default"/> <setEntry value="wrapped.wsdl4j.wsdl4j@default:default"/>
<setEntry value="xstream@default:default"/> <setEntry value="xstream@default:default"/>

7
org.idempiere.webservices-feature/feature.xml
View File

@ -339,13 +339,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="wrapped.org.springframework.spring-jcl"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.idempiere.webservices.resources" id="org.idempiere.webservices.resources"
download-size="0" download-size="0"