Skip to content

Commit

Permalink
Merge branch 'release/3.9.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@e-Evolution
e-Evolution committed May 4, 2019
2 parents 484dc57 + 6260456 commit 1a162b4
Show file tree
Hide file tree
Showing 2,090 changed files with 252,626 additions and 74,990 deletions.
1 change: 1 addition & 0 deletions .classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,5 +335,6 @@
<classpathentry kind="lib" path="tools/lib/pdfa-7.1.1.jar"/>
<classpathentry kind="lib" path="tools/lib/wizard.jar"/>
<classpathentry kind="lib" path="tools/lib/oracle.jar"/>
<classpathentry kind="lib" path="tools/lib/zxing-2.3.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
51 changes: 25 additions & 26 deletions JasperReports/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,17 @@
<pathelement path="../extend/Extend.jar"/>
<pathelement path="../lib/CSTools.jar"/>
<pathelement path="../lib/oracle.jar"/>
<!-- SHW: old Lib <pathelement path="../JasperReportsTools/lib/jasperreports-3.7.3.jar"/>-->
<pathelement path="../JasperReportsTools/lib/jasperreports-6.6.0.jar"/>
<!-- SHW: old Lib <pathelement path="../JasperReportsTools/lib/commons-digester-1.7.jar"/> -->
<pathelement path="../JasperReportsTools/lib/commons-digester-2.1.jar"/>
<pathelement path="../tools/lib/commons-logging-1.2.jar"/>
<!-- SHW: old Lib <pathelement path="../JasperReportsTools/lib/commons-beanutils-1.7.jar"/> -->
<pathelement path="../JasperReportsTools/lib/commons-beanutils-1.9.3.jar"/>
<!-- SHW:new library -->
<pathelement path="../JasperReportsTools/lib/jasperreports-fonts-6.6.0.jar"/>
<pathelement path="../tools/lib/batik-all-1.9.jar"/>
<pathelement path="../tools/lib/org.krysalis.barcode4j_2.1.0.jar"/>
<pathelement path="../tools/lib/xml-apis-1.3.04.jar"/>
<pathelement path="../tools/lib/xml-apis-ext-1.3.04.jar"/>
<pathelement path="../tools/lib/xmlgraphics-commons-2.2.jar"/>
<pathelement path="../tools/lib/zxing-2.3.0.jar"/>
<pathelement path="../tools/lib/xercesImpl.jar"/>
<pathelement path="../tools/lib/postgresql.jar"/>
<pathelement path="../tools/lib/iText-2.1.7.jar"/>
Expand Down Expand Up @@ -137,28 +139,25 @@
index="yes"
duplicate="preserve">
<fileset dir="${needed.dir}"/>
<!-- SHW: old Lib <zipfileset src="../JasperReportsTools/lib/jasperreports-3.7.3.jar" > -->
<zipfileset src="../JasperReportsTools/lib/jasperreports-6.6.0.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- SHW: old Lib <zipfileset src="../JasperReportsTools/lib/commons-digester-1.7.jar" > -->
<zipfileset src="../JasperReportsTools/lib/commons-digester-2.1.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="../tools/lib/commons-logging-1.2.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- SHW: old Lib <zipfileset src="../JasperReportsTools/lib/commons-beanutils-1.7.jar" > -->
<zipfileset src="../JasperReportsTools/lib/commons-beanutils-1.9.3.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- SHW: new lib-->
<zipfileset src="../JasperReportsTools/lib/jasperreports-fonts-6.6.0.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="../tools/lib/xercesImpl.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="../JasperReportsTools/lib/jasperreports-6.6.0.jar">
<patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="../JasperReportsTools/lib/commons-digester-2.1.jar">
<patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="../tools/lib/commons-logging-1.2.jar">
<patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="../JasperReportsTools/lib/commons-beanutils-1.9.3.jar">
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- SHW: new lib-->
<zipfileset src="../JasperReportsTools/lib/jasperreports-fonts-6.6.0.jar">
<patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="../tools/lib/xercesImpl.jar">
<patternset refid="manifest.exclude"/>
</zipfileset>
<manifest>
<attribute name="Specification-Title" value="Needed libraries for Jasper Reports integration on org.compiere.report.ReportStarter"/>
<attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}${version}"/>
Expand Down
63 changes: 63 additions & 0 deletions adempiere.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1413,6 +1413,69 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/tools/lib/commons-validator-1.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/tools/lib/zxing-2.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/tools/lib/xmlgraphics-commons-2.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/tools/lib/xml-apis-ext-1.3.04.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/tools/lib/xml-apis-1.3.04.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/tools/lib/org.krysalis.barcode4j_2.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/tools/lib/batik-all-1.9.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="org.scalatest:scalatest_2.12:3.0.5" level="project" />
<orderEntry type="library" name="scala-sdk-2.12.8" level="project" />
</component>
Expand Down

0 comments on commit 1a162b4

Please sign in to comment.