From: Tuukka Lehtonen Date: Tue, 22 Nov 2016 05:54:46 +0000 (+0200) Subject: Lowered required bundle versions in org.apache.poi 3.15.0 take 2. X-Git-Tag: v1.25.0~3 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=aa834e2e72826d0c9d4fe7a5541f085b31fedb05;p=simantics%2Fthird-party.git 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 3bd55df..65aad84 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you want to manually bundle an external third-party library into the Simantic 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. -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}. +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}. 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}*. diff --git a/externals.target b/externals.target new file mode 100644 index 0000000..7c648a5 --- /dev/null +++ b/externals.target @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/features/org.apache.poi.feature/feature.xml b/features/org.apache.poi.feature/feature.xml index 99d450f..d73b999 100644 --- a/features/org.apache.poi.feature/feature.xml +++ b/features/org.apache.poi.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/p2/artifacts.jar b/p2/artifacts.jar index c8d5d79..b674d40 100644 Binary files a/p2/artifacts.jar and b/p2/artifacts.jar differ diff --git a/p2/content.jar b/p2/content.jar index d3427f6..25a037f 100644 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 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 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 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 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 2043bd9..859dc8b 100644 Binary files a/p2/plugins/org.apache.poi_3.15.0.jar and b/p2/plugins/org.apache.poi_3.15.0.jar differ