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

IDEMPIERE-4933 Platform update for 9.x (#910) 

Fix jasper report compilation error cause by manifest issue of common
digester bundle.
This commit is contained in:
hengsin 2021-10-06 21:37:28 +08:00 committed by GitHub
parent 488715260e
commit 398333e645
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 124 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.report.jasper-feature/feature.xml
View File

@ -352,7 +352,7 @@
unpack="false"/>
<plugin
id="com.jaspersoft.studio.bundles.commons-digester"
id="org.apache.commons.digester"
download-size="0"
install-size="0"
version="0.0.0"

2
org.adempiere.report.jasper/META-INF/MANIFEST.MF
View File

@ -19,7 +19,7 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
net.sf.jasperreports.engine;bundle-version="6.3.1",
com.github.librepdf.openpdf;bundle-version="1.3.26",
com.github.librepdf.openpdf-fonts-extra;bundle-version="1.3.26",
com.jaspersoft.studio.bundles.commons-digester;bundle-version="2.1.0"
org.apache.commons.digester;bundle-version="2.1.0"
Service-Component: OSGI-INF/*.xml
Export-Package: org.adempiere.report.jasper
Bundle-ActivationPolicy: lazy

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

@ -105,7 +105,7 @@
<setEntry value="com.google.zxing.core@default:default"/>
<setEntry value="com.ibm.icu@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.commons-digester@default:default"/>
<setEntry value="org.apache.commons.digester@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.itext@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.istack.commons-runtime@default:default"/>

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

@ -105,7 +105,7 @@
<setEntry value="com.google.zxing.core@default:default"/>
<setEntry value="com.ibm.icu@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.commons-digester@default:default"/>
<setEntry value="org.apache.commons.digester@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.itext@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.istack.commons-runtime@default:default"/>

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

@ -437,6 +437,12 @@ Export-Package: *;-noimport:=true
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>6.17.0</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>2.1</version>
<type>jar</type>
</location>
<!-- net.sf.supercsv -->
@ -1002,7 +1008,7 @@ Import-Package: *;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>5.2.15.RELEASE</version>
@ -1013,6 +1019,58 @@ Bundle-SymbolicName: wrapped.${mvnGroupId}.${mvnArtifactId}
Bundle-Version: ${version}
Import-Package: *;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>5.2.15.RELEASE</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>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>5.2.15.RELEASE</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>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>5.2.15.RELEASE</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>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>5.2.15.RELEASE</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>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="idempiere-210901" sequenceNumber="1631278143">
<target name="idempiere-210901" sequenceNumber="1633490563">
<locations>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="zcommon" version="9.6.0.1"/>
@ -129,7 +129,6 @@
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jaspersoft.studio.bundles.barbecue" version="1.5.0.beta1_b02"/>
<unit id="com.jaspersoft.studio.bundles.itext" version="2.1.7.js8_b01"/>
<unit id="com.jaspersoft.studio.bundles.commons-digester" version="2.1.0.201709071631"/>
<unit id="org.w3c.dom.svg.patch" version="1.1.0.b02"/>
<unit id="org.krysalis.barcode4j" version="2.1.0"/>
<repository location="https://sourceforge.net/projects/jasperstudio/files/updatesite/6.17.0"/>
@ -570,6 +569,12 @@ Export-Package: *;-noimport:=true
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>6.17.0</version>
<type>jar</type>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>2.1</version>
<type>jar</type>
</location>
<!-- net.sf.supercsv -->
@ -1135,7 +1140,7 @@ Import-Package: *;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>5.2.15.RELEASE</version>
@ -1146,6 +1151,58 @@ Bundle-SymbolicName: wrapped.${mvnGroupId}.${mvnArtifactId}
Bundle-Version: ${version}
Import-Package: *;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>5.2.15.RELEASE</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>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>5.2.15.RELEASE</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>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>5.2.15.RELEASE</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>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>5.2.15.RELEASE</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>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">

1
org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
View File

@ -138,7 +138,6 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202106020316
location "https://sourceforge.net/projects/jasperstudio/files/updatesite/6.17.0" {
com.jaspersoft.studio.bundles.barbecue
com.jaspersoft.studio.bundles.itext
com.jaspersoft.studio.bundles.commons-digester
org.w3c.dom.svg.patch
org.krysalis.barcode4j
}

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

@ -68,7 +68,7 @@
<setEntry value="com.google.zxing.core@default:default"/>
<setEntry value="com.ibm.icu@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.commons-digester@default:default"/>
<setEntry value="org.apache.commons.digester@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.itext@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.gimap@default:default"/>