Merge "(refs #7242) Refresh button to SCL Module browser"

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 50989e45f24989b9b3655b770e4007a5f152a6fd..295988bb71681ee01e51d4f9671196851e11572d 100644 (file)
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -323,19 +323,27 @@
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.core:jackson-core:2.8.5</id>
+                                    <id>com.fasterxml.jackson.core:jackson-core:2.8.8</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.8.5</id>
+                                    <id>com.fasterxml.jackson.core:jackson-databind:2.8.8</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.8.5</id>
+                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.8.8</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>org.slf4j:slf4j-api:1.7.20</id>
+                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.8.8</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.8</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>org.slf4j:slf4j-api:1.7.25</id>
                                     <source>true</source>
                                     <override>true</override>
                                     <instructions>
@@ -344,7 +352,7 @@
                                     </instructions>
                                 </artifact>
                                 <artifact>
-                                    <id>ch.qos.logback:logback-classic:1.1.7</id>
+                                    <id>ch.qos.logback:logback-classic:1.2.3</id>
                                     <source>true</source>
                                     <override>true</override>
                                 </artifact>
@@ -360,6 +368,18 @@
                                     <id>com.esotericsoftware:kryo:4.0.0</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <id>org.glassfish.jersey.core:jersey-client:2.25.1</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>org.glassfish.jersey.media:jersey-media-multipart:2.25.1</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>org.glassfish.jersey.media:jersey-media-json-jackson:2.25.1</id>
+                                    <source>true</source>
+                                </artifact>
                             </artifacts>
                         </configuration>
                     </execution>

diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
index db7cb6e76df752e941c8f3852ce7df71a1a92401..091548c489339c1f559f7a4cc27d3f17c33e0deb 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="228">
+<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="230">
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.objectweb.asm.xml.source" version="5.0.1.v201404251740"/>
@@ -97,10 +97,10 @@
 <repository location="http://www.simantics.org/update/nebula/nattable/releases/1.4.0/repository/"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="ch.qos.logback.classic" version="1.1.7"/>
-<unit id="ch.qos.logback.classic.source" version="1.1.7"/>
-<unit id="ch.qos.logback.core" version="1.1.7"/>
-<unit id="ch.qos.logback.core.source" version="1.1.7"/>
+<unit id="ch.qos.logback.classic" version="1.2.3"/>
+<unit id="ch.qos.logback.classic.source" version="1.2.3"/>
+<unit id="ch.qos.logback.core" version="1.2.3"/>
+<unit id="ch.qos.logback.core.source" version="1.2.3"/>
 <unit id="com.esotericsoftware.kryo" version="4.0.0"/>
 <unit id="com.esotericsoftware.kryo.source" version="4.0.0"/>
 <unit id="com.esotericsoftware.minlog" version="1.3.0"/>
@@ -109,16 +109,22 @@
 <unit id="com.esotericsoftware.reflectasm.source" version="1.11.3"/>
 <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.8.0"/>
 <unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.8.0"/>
-<unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.8.4"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.8.4"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.8.4"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.8.4"/>
+<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.8.8"/>
 <unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/>
 <unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/>
 <unit id="com.github.virtuald.curvesapi" version="1.4.0"/>
@@ -145,6 +151,8 @@
 <unit id="gnu.trove3.source" version="3.0.3"/>
 <unit id="it.unimi.dsi.fastutil" version="7.0.13"/>
 <unit id="it.unimi.dsi.fastutil.source" version="7.0.13"/>
+<unit id="javax.ws.rs-api" version="2.0.1"/>
+<unit id="javax.ws.rs-api.source" version="2.0.1"/>
 <unit id="jakarta-regexp" version="1.4.0"/>
 <unit id="net.jcip.annotations" version="1.0.0"/>
 <unit id="net.jcip.annotations.source" version="1.0.0"/>
@@ -191,14 +199,40 @@
 <unit id="org.eclipse.collections.eclipse-collections-api.source" version="7.1.0"/>
 <unit id="org.eclipse.collections.eclipse-collections" version="7.1.0"/>
 <unit id="org.eclipse.collections.eclipse-collections.source" version="7.1.0"/>
+<unit id="org.glassfish.hk2.api" version="2.5.0.b32"/>
+<unit id="org.glassfish.hk2.api.source" version="2.5.0.b32"/>
+<unit id="org.glassfish.hk2.locator" version="2.5.0.b32"/>
+<unit id="org.glassfish.hk2.locator.source" version="2.5.0.b32"/>
+<unit id="org.glassfish.hk2.utils" version="2.5.0.b32"/>
+<unit id="org.glassfish.hk2.utils.source" version="2.5.0.b32"/>
+<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.1"/>
+<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.1"/>
+<unit id="org.glassfish.hk2.external.aopalliance-repackaged" version="2.5.0.b32"/>
+<unit id="org.glassfish.hk2.external.aopalliance-repackaged.source" version="2.5.0.b32"/>
+<unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava" version="2.25.1"/>
+<unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava.source" version="2.25.1"/>
+<unit id="org.glassfish.jersey.core.jersey-client" version="2.25.1"/>
+<unit id="org.glassfish.jersey.core.jersey-client.source" version="2.25.1"/>
+<unit id="org.glassfish.jersey.core.jersey-common" version="2.25.1"/>
+<unit id="org.glassfish.jersey.core.jersey-common.source" version="2.25.1"/>
+<unit id="org.glassfish.jersey.ext.jersey-entity-filtering" version="2.25.1"/>
+<unit id="org.glassfish.jersey.ext.jersey-entity-filtering.source" version="2.25.1"/>
+<unit id="org.glassfish.jersey.media.jersey-media-multipart" version="2.25.1"/>
+<unit id="org.glassfish.jersey.media.jersey-media-multipart.source" version="2.25.1"/>
+<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.25.1"/>
+<unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.25.1"/>
 <unit id="org.hsqldb.hsqldb" version="2.3.1"/>
 <unit id="org.hsqldb.hsqldb.source" version="2.3.1"/>
+<unit id="javassist" version="3.20.0.GA"/>
+<unit id="javassist.source" version="3.20.0.GA"/>
 <unit id="org.jdom2" version="2.0.6.b0001"/>
 <unit id="org.jdom2.source" version="2.0.6.b0001"/>
 <unit id="org.jfree.jchart" version="1.0.19"/>
 <unit id="org.jfree.jchart.source" version="1.0.19"/>
 <unit id="org.jfree.jcommon" version="1.0.23"/>
 <unit id="org.jfree.jcommon.source" version="1.0.23"/>
+<unit id="org.jvnet.mimepull" version="1.9.6"/>
+<unit id="org.jvnet.mimepull.source" version="1.9.6"/>
 <unit id="org.mozilla.rhino" version="1.7.7.1"/>
 <unit id="org.mozilla.rhino.source" version="1.7.7.1"/>
 <unit id="org.objenesis" version="2.2.0"/>
@@ -215,8 +249,8 @@
 <unit id="org.bouncycastle.bctsp-jdk14.source" version="1.38.0"/>
 <unit id="org.ini4j" version="0.5.4"/>
 <unit id="org.ini4j.source" version="0.5.4"/>
-<unit id="org.slf4j.api" version="1.7.20"/>
-<unit id="org.slf4j.api.source" version="1.7.20"/>
+<unit id="org.slf4j.api" version="1.7.25"/>
+<unit id="org.slf4j.api.source" version="1.7.25"/>
 <unit id="stax2-api" version="3.1.4"/>
 <unit id="stax2-api.source" version="3.1.4"/>
 <repository location="http://www.simantics.org/download/master/external-components/maven"/>

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index 455222dea48b81d38a3ad71e2cc55f4826421765..58aa8d1ff4edf297a8eac81f4d1b0a769d51a59a 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Simantics 1.29.0" sequenceNumber="18">
+<target name="Simantics 1.29.0" sequenceNumber="20">
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.simantics.sdk.feature.group" version="1.29.0"/>
@@ -103,10 +103,10 @@
 <repository location="http://www.simantics.org/update/nebula/nattable/releases/1.4.0/repository/"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="ch.qos.logback.classic" version="1.1.7"/>
-<unit id="ch.qos.logback.classic.source" version="1.1.7"/>
-<unit id="ch.qos.logback.core" version="1.1.7"/>
-<unit id="ch.qos.logback.core.source" version="1.1.7"/>
+<unit id="ch.qos.logback.classic" version="1.2.3"/>
+<unit id="ch.qos.logback.classic.source" version="1.2.3"/>
+<unit id="ch.qos.logback.core" version="1.2.3"/>
+<unit id="ch.qos.logback.core.source" version="1.2.3"/>
 <unit id="com.esotericsoftware.kryo" version="4.0.0"/>
 <unit id="com.esotericsoftware.kryo.source" version="4.0.0"/>
 <unit id="com.esotericsoftware.minlog" version="1.3.0"/>
@@ -115,16 +115,22 @@
 <unit id="com.esotericsoftware.reflectasm.source" version="1.11.3"/>
 <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.8.0"/>
 <unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.8.0"/>
-<unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.8.4"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.8.4"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.8.4"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.8.4"/>
+<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.8.8"/>
 <unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/>
 <unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/>
 <unit id="com.github.virtuald.curvesapi" version="1.4.0"/>
@@ -151,6 +157,8 @@
 <unit id="gnu.trove3.source" version="3.0.3"/>
 <unit id="it.unimi.dsi.fastutil" version="7.0.13"/>
 <unit id="it.unimi.dsi.fastutil.source" version="7.0.13"/>
+<unit id="javax.ws.rs-api" version="2.0.1"/>
+<unit id="javax.ws.rs-api.source" version="2.0.1"/>
 <unit id="jakarta-regexp" version="1.4.0"/>
 <unit id="net.jcip.annotations" version="1.0.0"/>
 <unit id="net.jcip.annotations.source" version="1.0.0"/>
@@ -197,14 +205,40 @@
 <unit id="org.eclipse.collections.eclipse-collections-api.source" version="7.1.0"/>
 <unit id="org.eclipse.collections.eclipse-collections" version="7.1.0"/>
 <unit id="org.eclipse.collections.eclipse-collections.source" version="7.1.0"/>
+<unit id="org.glassfish.hk2.api" version="2.5.0.b32"/>
+<unit id="org.glassfish.hk2.api.source" version="2.5.0.b32"/>
+<unit id="org.glassfish.hk2.locator" version="2.5.0.b32"/>
+<unit id="org.glassfish.hk2.locator.source" version="2.5.0.b32"/>
+<unit id="org.glassfish.hk2.utils" version="2.5.0.b32"/>
+<unit id="org.glassfish.hk2.utils.source" version="2.5.0.b32"/>
+<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.1"/>
+<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.1"/>
+<unit id="org.glassfish.hk2.external.aopalliance-repackaged" version="2.5.0.b32"/>
+<unit id="org.glassfish.hk2.external.aopalliance-repackaged.source" version="2.5.0.b32"/>
+<unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava" version="2.25.1"/>
+<unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava.source" version="2.25.1"/>
+<unit id="org.glassfish.jersey.core.jersey-client" version="2.25.1"/>
+<unit id="org.glassfish.jersey.core.jersey-client.source" version="2.25.1"/>
+<unit id="org.glassfish.jersey.core.jersey-common" version="2.25.1"/>
+<unit id="org.glassfish.jersey.core.jersey-common.source" version="2.25.1"/>
+<unit id="org.glassfish.jersey.ext.jersey-entity-filtering" version="2.25.1"/>
+<unit id="org.glassfish.jersey.ext.jersey-entity-filtering.source" version="2.25.1"/>
+<unit id="org.glassfish.jersey.media.jersey-media-multipart" version="2.25.1"/>
+<unit id="org.glassfish.jersey.media.jersey-media-multipart.source" version="2.25.1"/>
+<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.25.1"/>
+<unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.25.1"/>
 <unit id="org.hsqldb.hsqldb" version="2.3.1"/>
 <unit id="org.hsqldb.hsqldb.source" version="2.3.1"/>
+<unit id="javassist" version="3.20.0.GA"/>
+<unit id="javassist.source" version="3.20.0.GA"/>
 <unit id="org.jdom2" version="2.0.6.b0001"/>
 <unit id="org.jdom2.source" version="2.0.6.b0001"/>
 <unit id="org.jfree.jchart" version="1.0.19"/>
 <unit id="org.jfree.jchart.source" version="1.0.19"/>
 <unit id="org.jfree.jcommon" version="1.0.23"/>
 <unit id="org.jfree.jcommon.source" version="1.0.23"/>
+<unit id="org.jvnet.mimepull" version="1.9.6"/>
+<unit id="org.jvnet.mimepull.source" version="1.9.6"/>
 <unit id="org.mozilla.rhino" version="1.7.7.1"/>
 <unit id="org.mozilla.rhino.source" version="1.7.7.1"/>
 <unit id="org.objenesis" version="2.2.0"/>
@@ -221,8 +255,8 @@
 <unit id="org.bouncycastle.bctsp-jdk14.source" version="1.38.0"/>
 <unit id="org.ini4j" version="0.5.4"/>
 <unit id="org.ini4j.source" version="0.5.4"/>
-<unit id="org.slf4j.api" version="1.7.20"/>
-<unit id="org.slf4j.api.source" version="1.7.20"/>
+<unit id="org.slf4j.api" version="1.7.25"/>
+<unit id="org.slf4j.api.source" version="1.7.25"/>
 <unit id="stax2-api" version="3.1.4"/>
 <unit id="stax2-api.source" version="3.1.4"/>
 <repository location="http://www.simantics.org/download/master/external-components/maven"/>