Lowered required bundle versions in org.apache.poi 3.15.0 take 2.

This is an attempt to get products working since nattable 1.4.0 already
provides org.apache.poi 3.9.0, commons.codec 1.6 and commons.logging 1.1
for the target platform which confuses the launched product
configurations.

refs #6813

Change-Id: I36d98c5af9ce00fe32622a5e88ec808946f5f8e4

diff --git a/README.md b/README.md
index 3bd55dfa1ad35aee3728aade625ad9e6fdf29d12..65aad840fa6309231ceea865e5146082cb266644 100644 (file)
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ If you want to manually bundle an external third-party library into the Simantic
 \r
 If your bundled library has dependencies to other bundles, you should probably create a feature project in the *features* directory that includes the plug-in(s) required by those plug-ins.\r
 \r
-After you've created the necessary plugins and features, use the Eclipse PDE IDE plug-in/feature export wizards to produce the required P2 repository content under /p2/{features,plugins}.\r
+When building, it is recommended to use a separate otherwise empty workspace and the target definition file */externals.target*. After you've created the necessary plugins and features, use the Eclipse PDE IDE plug-in/feature export wizards to produce the required P2 repository content under /p2/{features,plugins}.\r
 \r
 The *publish.sh* script at the root of the repository will be ran automatically by the Simantics platform Jenkins job [SDK/manual-third-party-components](https://www.simantics.org/jenkins/job/SDK/job/manual-third-party-components/). It will create the required P2 repository content and artifact metadata files under the *p2/* directory based on the contents of directories *p2/{features,plugins}*.\r
 \r

diff --git a/externals.target b/externals.target
new file mode 100644 (file)
index 0000000..7c648a5
--- /dev/null
+++ b/externals.target
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<?pde version="3.8"?><target name="Running environment + Simantics external maven components" sequenceNumber="30">\r
+<locations>\r
+<location path="${eclipse_home}" type="Profile"/>\r
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
+<unit id="ch.qos.logback.classic" version="1.1.7"/>\r
+<unit id="ch.qos.logback.classic.source" version="1.1.7"/>\r
+<unit id="ch.qos.logback.core" version="1.1.7"/>\r
+<unit id="ch.qos.logback.core.source" version="1.1.7"/>\r
+<unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.2"/>\r
+<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.2"/>\r
+<unit id="com.github.virtuald.curvesapi" version="1.4.0"/>\r
+<unit id="com.github.virtuald.curvesapi.source" version="1.4.0"/>\r
+<unit id="com.healthmarketscience.jackcess" version="2.1.3"/>\r
+<unit id="com.healthmarketscience.jackcess.source" version="2.1.3"/>\r
+<unit id="com.koloboke.api-jdk8" version="1.0.0"/>\r
+<unit id="com.koloboke.api-jdk8.source" version="1.0.0"/>\r
+<unit id="com.koloboke.compile" version="0.5.1"/>\r
+<unit id="com.koloboke.compile.source" version="0.5.1"/>\r
+<unit id="com.koloboke.impl-common-jdk8" version="1.0.0"/>\r
+<unit id="com.koloboke.impl-common-jdk8.source" version="1.0.0"/>\r
+<unit id="com.lowagie.text" version="2.1.7.b1"/>\r
+<unit id="com.lowagie.text.source" version="2.1.7.b1"/>\r
+<unit id="com.sun.jna" version="4.2.2"/>\r
+<unit id="com.sun.jna.source" version="4.2.2"/>\r
+<unit id="com.sun.jna.platform" version="4.2.2"/>\r
+<unit id="com.sun.jna.platform.source" version="4.2.2"/>\r
+<unit id="freemarker" version="2.3.23.stable"/>\r
+<unit id="freemarker.source" version="2.3.23.stable"/>\r
+<unit id="gnu.trove2" version="2.1.0"/>\r
+<unit id="gnu.trove2.source" version="2.1.0"/>\r
+<unit id="gnu.trove3" version="3.0.3"/>\r
+<unit id="gnu.trove3.source" version="3.0.3"/>\r
+<unit id="it.unimi.dsi.fastutil" version="7.0.13"/>\r
+<unit id="it.unimi.dsi.fastutil.source" version="7.0.13"/>\r
+<unit id="jakarta-regexp" version="1.4.0"/>\r
+<unit id="javax.vecmath" version="1.5.2"/>\r
+<unit id="net.jcip.annotations" version="1.0.0"/>\r
+<unit id="net.jcip.annotations.source" version="1.0.0"/>\r
+<unit id="net.ucanaccess" version="3.0.6"/>\r
+<unit id="net.ucanaccess.source" version="3.0.6"/>\r
+<unit id="org.antlr.runtime" version="3.5.2"/>\r
+<unit id="org.antlr.runtime.source" version="3.5.2"/>\r
+<unit id="org.apache.log4j" version="1.2.17"/>\r
+<unit id="org.apache.log4j.source" version="1.2.17"/>\r
+<unit id="org.apache.commons.codec" version="1.10.0"/>\r
+<unit id="org.apache.commons.codec.source" version="1.10.0"/>\r
+<unit id="org.apache.commons.collections" version="3.2.2"/>\r
+<unit id="org.apache.commons.collections.source" version="3.2.2"/>\r
+<unit id="org.apache.commons.collections4" version="4.1.0"/>\r
+<unit id="org.apache.commons.collections4.source" version="4.1.0"/>\r
+<unit id="org.apache.commons.compress" version="1.12.0"/>\r
+<unit id="org.apache.commons.compress.source" version="1.12.0"/>\r
+<unit id="org.apache.commons.logging" version="1.2.0"/>\r
+<unit id="org.apache.commons.logging.source" version="1.2.0"/>\r
+<unit id="org.apache.commons.io" version="1.4.0"/>\r
+<unit id="org.apache.commons.io.source" version="1.4.0"/>\r
+<unit id="org.apache.commons.lang" version="2.6.0"/>\r
+<unit id="org.apache.commons.lang.source" version="2.6.0"/>\r
+<unit id="org.apache.lucene4.analyzers-common" version="4.9.0.b0003"/>\r
+<unit id="org.apache.lucene4.analyzers-common.source" version="4.9.0.b0003"/>\r
+<unit id="org.apache.lucene4.core" version="4.9.0.b0003"/>\r
+<unit id="org.apache.lucene4.core.source" version="4.9.0.b0003"/>\r
+<unit id="org.apache.lucene4.queryparser" version="4.9.0.b0003"/>\r
+<unit id="org.apache.lucene4.queryparser.source" version="4.9.0.b0003"/>\r
+<unit id="org.apache.lucene4.sandbox" version="4.9.0.b0003"/>\r
+<unit id="org.apache.lucene4.sandbox.source" version="4.9.0.b0003"/>\r
+<unit id="org.apache.lucene4.queries" version="4.9.0.b0003"/>\r
+<unit id="org.apache.lucene4.queries.source" version="4.9.0.b0003"/>\r
+<unit id="org.apache.pdfbox" version="2.0.3"/>\r
+<unit id="org.apache.pdfbox.source" version="2.0.3"/>\r
+<unit id="org.apache.pdfbox.xmpbox" version="2.0.3"/>\r
+<unit id="org.apache.pdfbox.xmpbox.source" version="2.0.3"/>\r
+<unit id="org.apache.pdfbox.fontbox" version="2.0.3"/>\r
+<unit id="org.apache.pdfbox.fontbox.source" version="2.0.3"/>\r
+<unit id="org.apache.xmlbeans" version="2.6.0"/>\r
+<unit id="org.eclipse.collections.eclipse-collections-api" version="7.1.0"/>\r
+<unit id="org.eclipse.collections.eclipse-collections-api.source" version="7.1.0"/>\r
+<unit id="org.eclipse.collections.eclipse-collections" version="7.1.0"/>\r
+<unit id="org.eclipse.collections.eclipse-collections.source" version="7.1.0"/>\r
+<unit id="org.hsqldb.hsqldb" version="2.3.1"/>\r
+<unit id="org.hsqldb.hsqldb.source" version="2.3.1"/>\r
+<unit id="org.jdom2" version="2.0.6"/>\r
+<unit id="org.jdom2.source" version="2.0.6"/>\r
+<unit id="org.jfree.jchart" version="1.0.19"/>\r
+<unit id="org.jfree.jchart.source" version="1.0.19"/>\r
+<unit id="org.jfree.jcommon" version="1.0.23"/>\r
+<unit id="org.jfree.jcommon.source" version="1.0.23"/>\r
+<unit id="org.mozilla.rhino" version="1.7.7.1"/>\r
+<unit id="org.mozilla.rhino.source" version="1.7.7.1"/>\r
+<unit id="org.supercsv" version="2.4.0"/>\r
+<unit id="org.supercsv.source" version="2.4.0"/>\r
+<unit id="bouncycastle.bcprov-jdk14" version="138.0.0"/>\r
+<unit id="bouncycastle.bcmail-jdk14" version="138.0.0"/>\r
+<unit id="org.bouncycastle.bcprov-jdk14" version="1.38.0"/>\r
+<unit id="org.bouncycastle.bcprov-jdk14.source" version="1.38.0"/>\r
+<unit id="org.bouncycastle.bcmail-jdk14" version="1.38.0"/>\r
+<unit id="org.bouncycastle.bcmail-jdk14.source" version="1.38.0"/>\r
+<unit id="org.bouncycastle.bctsp-jdk14" version="1.38.0"/>\r
+<unit id="org.bouncycastle.bctsp-jdk14.source" version="1.38.0"/>\r
+<unit id="org.ini4j" version="0.5.4"/>\r
+<unit id="org.ini4j.source" version="0.5.4"/>\r
+<unit id="org.slf4j.api" version="1.7.20"/>\r
+<unit id="org.slf4j.api.source" version="1.7.20"/>\r
+<repository location="http://www.simantics.org/download/master/external-components/maven"/>\r
+</location>\r
+</locations>\r
+</target>\r

diff --git a/features/org.apache.poi.feature/feature.xml b/features/org.apache.poi.feature/feature.xml
index 99d450f9a701f01accfd422f14fff6636d3136cd..d73b9998dc5bdd464f3322c30e801a9ba0a74e6b 100644 (file)
--- a/features/org.apache.poi.feature/feature.xml
+++ b/features/org.apache.poi.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature\r
       id="org.apache.poi.feature"\r
       label="Apache POI"\r
-      version="3.15.0.b0001"\r
+      version="3.15.0.b0002"\r
       provider-name="Semantum Oy">\r
 \r
    <license url="https://www.apache.org/licenses/LICENSE-2.0">\r

diff --git a/p2/artifacts.jar b/p2/artifacts.jar
index c8d5d79494c5a20ef0a86c99674e40ab270aa4b4..b674d4069e5ec0553e495d36f7300729fd055ac2 100644 (file)
Binary files a/p2/artifacts.jar and b/p2/artifacts.jar differ

diff --git a/p2/content.jar b/p2/content.jar
index d3427f6517fc4cea64bb69c3eee3be1a4fc20dab..25a037f47153cc47bc83e414385f2bdecefe2e6e 100644 (file)
Binary files a/p2/content.jar and b/p2/content.jar differ

diff --git a/p2/features/org.apache.poi.feature.source_3.15.0.b0001.jar b/p2/features/org.apache.poi.feature.source_3.15.0.b0001.jar
deleted file mode 100644 (file)
index f8a7667..0000000
Binary files a/p2/features/org.apache.poi.feature.source_3.15.0.b0001.jar and /dev/null differ

diff --git a/p2/features/org.apache.poi.feature_3.15.0.b0001.jar b/p2/features/org.apache.poi.feature_3.15.0.b0001.jar
deleted file mode 100644 (file)
index 71c665f..0000000
Binary files a/p2/features/org.apache.poi.feature_3.15.0.b0001.jar and /dev/null differ

diff --git a/p2/features/org.apache.poi.feature_3.15.0.b0002.jar b/p2/features/org.apache.poi.feature_3.15.0.b0002.jar
new file mode 100644 (file)
index 0000000..083d33d
Binary files /dev/null and b/p2/features/org.apache.poi.feature_3.15.0.b0002.jar differ

diff --git a/p2/plugins/org.apache.poi.source_3.15.0.jar b/p2/plugins/org.apache.poi.source_3.15.0.jar
deleted file mode 100644 (file)
index 5321028..0000000
Binary files a/p2/plugins/org.apache.poi.source_3.15.0.jar and /dev/null differ

diff --git a/p2/plugins/org.apache.poi_3.15.0.jar b/p2/plugins/org.apache.poi_3.15.0.jar
index 2043bd91327760ee27e17ba5743bfb5eeb6a9367..859dc8babebc638907571f15e2bae9a3025aeeeb 100644 (file)
Binary files a/p2/plugins/org.apache.poi_3.15.0.jar and b/p2/plugins/org.apache.poi_3.15.0.jar differ