Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replaced static dependencies to Apache POI with plugin dependency #551

Merged
merged 1 commit into from
Aug 7, 2019
Merged

Replaced static dependencies to Apache POI with plugin dependency #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion build/org.eclipse.birt.build/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ Bundle-Name: BIRT Build Internal Tools
Bundle-SymbolicName: org.eclipse.birt.build
Bundle-Version: 4.11.0.qualifier
Bundle-Vendor: Eclipse BIRT Project
Bundle-ClassPath: lib/dom4j-1.6.1.jar,.
Bundle-ClassPath: lib/dom4j-1.6.1.jar,
.
Require-Bundle: org.apache.ant
Automatic-Module-Name: org.eclipse.birt.build
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Expand Down
4 changes: 0 additions & 4 deletions data/org.eclipse.birt.report.data.oda.excel/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry exported="true" kind="lib" path="lib/poi-3.9/poi-ooxml-3.9-20121203.jar"/>
<classpathentry exported="true" kind="lib" path="lib/poi-3.9/poi-ooxml-schemas-3.9-20121203.jar"/>
<classpathentry exported="true" kind="lib" path="lib/poi-3.9/ooxml-lib/dom4j-1.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/poi-3.9/ooxml-lib/xmlbeans-2.3.0.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
10 changes: 4 additions & 6 deletions data/org.eclipse.birt.report.data.oda.excel/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.birt.report.data.oda.excel; singleton:=true
Bundle-Version: 4.11.0.qualifier
Bundle-ClassPath: .,
lib/poi-3.9/poi-ooxml-3.9-20121203.jar,
lib/poi-3.9/poi-ooxml-schemas-3.9-20121203.jar,
lib/poi-3.9/ooxml-lib/dom4j-1.6.1.jar,
lib/poi-3.9/ooxml-lib/xmlbeans-2.3.0.jar
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.birt.report.data.oda.excel.Activator
Bundle-Vendor: Eclipse BIRT Project
Bundle-Localization: plugin
Expand All @@ -21,7 +17,9 @@ Require-Bundle: org.eclipse.core.runtime,
org.apache.xml.serializer;bundle-version="[2.7.1,3.0.0)",
org.apache.commons.logging;bundle-version="[1.0.4,2.0.0)";resolution:=optional,
javax.xml.stream;bundle-version="[1.0.1,2.0.0)";resolution:=optional,
org.apache.poi;bundle-version="[3.8.0,4.0.0)",
org.apache.poi;bundle-version="[3.9.0,4.0.0)",
org.apache.poi.ooxml;bundle-version="[3.9.0,4.0.0)",
org.apache.poi.ooxml.schemas;bundle-version="[3.9.0,4.0.0)",
org.apache.xerces;bundle-version="2.9.0",
org.eclipse.birt.core;bundle-version="4.9.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Expand Down
1 change: 0 additions & 1 deletion data/org.eclipse.birt.report.data.oda.excel/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ bin.includes = META-INF/,\
about_files/,\
.,\
plugin.properties,\
lib/,\
plugin.xml,\
about.html
src.includes = about.html,\
Expand Down
Binary file removed data/org.eclipse.birt.report.data.oda.excel/lib/poi-3.9/ooxml-lib/dom4j-1.6.1.jar
View file
Open in desktop
Binary file not shown.
Binary file removed data/org.eclipse.birt.report.data.oda.excel/lib/poi-3.9/ooxml-lib/xmlbeans-2.3.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed data/org.eclipse.birt.report.data.oda.excel/lib/poi-3.9/poi-ooxml-3.9-20121203.jar
View file
Open in desktop
Binary file not shown.
Binary file removed data/org.eclipse.birt.report.data.oda.excel/lib/poi-3.9/poi-ooxml-schemas-3.9-20121203.jar
View file
Open in desktop
Binary file not shown.
6 changes: 0 additions & 6 deletions engine/org.eclipse.birt.report.engine.emitter.pptx.tests/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="libs/dom4j-1.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="libs/poi-ooxml-3.10-FINAL.jar"/>
<classpathentry exported="true" kind="lib" path="libs/stax-api-1.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="libs/xmlbeans-2.3.0.jar"/>
<classpathentry exported="true" kind="lib" path="libs/poi-3.10-FINAL.jar"/>
<classpathentry exported="true" kind="lib" path="libs/poi-ooxml-schemas-3.10-FINAL.jar"/>
<classpathentry kind="src" path="src/">
<attributes>
<attribute name="test" value="true"/>
Expand Down
12 changes: 4 additions & 8 deletions engine/org.eclipse.birt.report.engine.emitter.pptx.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,8 @@ Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.pptx.tests
Bundle-Version: 4.11.0.qualifier
Require-Bundle: org.eclipse.birt.report.engine;bundle-version="4.2.3",
org.eclipse.birt.report.engine.emitter.pptx;bundle-version="4.5.0",
org.junit
Bundle-ClassPath: libs/dom4j-1.6.1.jar,
libs/poi-ooxml-3.10-FINAL.jar,
libs/stax-api-1.0.1.jar,
libs/xmlbeans-2.3.0.jar,
libs/poi-3.10-FINAL.jar,
libs/poi-ooxml-schemas-3.10-FINAL.jar,
.
org.junit,
org.apache.poi;bundle-version="[3.9.0,4.0.0)",
org.apache.poi.ooxml;bundle-version="[3.9.0,4.0.0)"
Bundle-ClassPath: .
Automatic-Module-Name: org.eclipse.birt.report.engine.emitter.pptx.tests
8 changes: 1 addition & 7 deletions engine/org.eclipse.birt.report.engine.emitter.pptx.tests/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
source.. = src/
bin.includes = META-INF/,\
.,\
libs/dom4j-1.6.1.jar,\
libs/poi-ooxml-3.10-FINAL.jar,\
libs/stax-api-1.0.1.jar,\
libs/xmlbeans-2.3.0.jar,\
src/org/eclipse/birt/report/engine/emitter/pptx/tests/designs/,\
libs/poi-3.10-FINAL.jar,\
libs/poi-ooxml-schemas-3.10-FINAL.jar
src/org/eclipse/birt/report/engine/emitter/pptx/tests/designs/
49 changes: 0 additions & 49 deletions engine/org.eclipse.birt.report.engine.emitter.pptx.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,55 +11,6 @@
<packaging>eclipse-test-plugin</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>download-jdbc</id>
<phase>process-sources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/libs</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.10-FINAL</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
<version>3.10-FINAL</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.10-FINAL</version>
</artifactItem>
<artifactItem>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>2.3.0</version>
</artifactItem>
<artifactItem>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions engine/uk.co.spudsoft.birt.emitters.excel.tests/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,5 @@
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.9-20121203.jar"/>
<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.9-20121203.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
9 changes: 3 additions & 6 deletions engine/uk.co.spudsoft.birt.emitters.excel.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.birt.report.engine,
com.ibm.icu;bundle-version="4.4.2",
org.apache.poi;bundle-version="[3.9.0,4.0.0)",
javax.xml.stream;bundle-version="[1.0.1,2.0.0)"
org.apache.poi.ooxml;bundle-version="[3.9.0,4.0.0)",
org.apache.poi.ooxml.schemas;bundle-version="[3.9.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
lib/commons-codec-1.5.jar,
lib/dom4j-1.6.1.jar,
lib/xmlbeans-2.3.0.jar,
lib/poi-ooxml-3.9-20121203.jar,
lib/poi-ooxml-schemas-3.9-20121203.jar
lib/commons-codec-1.5.jar
Import-Package: uk.co.spudsoft.birt.emitters.excel
Eclipse-BundleShape: dir
Automatic-Module-Name: uk.co.spudsoft.birt.emitters.excel.tests
Binary file removed engine/uk.co.spudsoft.birt.emitters.excel.tests/lib/dom4j-1.6.1.jar
View file
Open in desktop
Binary file not shown.
Binary file removed engine/uk.co.spudsoft.birt.emitters.excel.tests/lib/poi-ooxml-3.9-20121203.jar
View file
Open in desktop
Binary file not shown.
Binary file removed engine/uk.co.spudsoft.birt.emitters.excel.tests/lib/poi-ooxml-schemas-3.9-20121203.jar
View file
Open in desktop
Binary file not shown.
26 changes: 1 addition & 25 deletions engine/uk.co.spudsoft.birt.emitters.excel/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.5.jar">
<attributes>
<attribute name="javadoc_location" value="file:/C:/Users/alehm/git/birt/engine/uk.co.spudsoft.birt.emitters.excel/doc/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar">
<attributes>
<attribute name="javadoc_location" value="file:/C:/Users/alehm/git/birt/engine/uk.co.spudsoft.birt.emitters.excel/doc/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar">
<attributes>
<attribute name="javadoc_location" value="file:/C:/Users/alehm/git/birt/engine/uk.co.spudsoft.birt.emitters.excel/doc/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.9-20121203.jar">
<attributes>
<attribute name="javadoc_location" value="file:/C:/Users/alehm/git/birt/engine/uk.co.spudsoft.birt.emitters.excel/doc/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.9-20121203.jar">
<attributes>
<attribute name="javadoc_location" value="file:/C:/Users/alehm/git/birt/engine/uk.co.spudsoft.birt.emitters.excel/doc/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.5.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
11 changes: 3 additions & 8 deletions engine/uk.co.spudsoft.birt.emitters.excel/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,11 @@ Bundle-Activator: uk.co.spudsoft.birt.emitters.excel.framework.ExcelEmitterPlugi
Bundle-Vendor: SpudSoft
Require-Bundle: org.eclipse.birt.report.engine,
org.apache.poi;bundle-version="[3.9.0,4.0.0)",
javax.xml.stream;bundle-version="[1.0.1,2.0.0)"
org.apache.poi.ooxml;bundle-version="[3.9.0,4.0.0)",
org.apache.poi.ooxml.schemas;bundle-version="[3.9.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .,
lib/commons-codec-1.5.jar,
lib/dom4j-1.6.1.jar,
lib/stax-api-1.0.1.jar,
lib/xmlbeans-2.3.0.jar,
lib/poi-3.9-20121203.jar,
lib/poi-ooxml-3.9-20121203.jar,
lib/poi-ooxml-schemas-3.9-20121203.jar
lib/commons-codec-1.5.jar
Bundle-ActivationPolicy: lazy
Export-Package: uk.co.spudsoft.birt.emitters.excel,
uk.co.spudsoft.birt.emitters.excel.framework
Expand Down
Binary file removed engine/uk.co.spudsoft.birt.emitters.excel/lib/dom4j-1.6.1.jar
View file
Open in desktop
Binary file not shown.
Binary file removed engine/uk.co.spudsoft.birt.emitters.excel/lib/poi-ooxml-3.9-20121203.jar
View file
Open in desktop
Binary file not shown.
Binary file removed engine/uk.co.spudsoft.birt.emitters.excel/lib/poi-ooxml-schemas-3.9-20121203.jar
View file
Open in desktop
Binary file not shown.
Binary file removed engine/uk.co.spudsoft.birt.emitters.excel/lib/xmlbeans-2.3.0.jar
View file
Open in desktop
Binary file not shown.