From 700f1075e94b01fce1822eeeffb2597876eb1ddb Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Sat, 1 Jul 2017 16:28:37 +0300 Subject: [PATCH 1/4] More CQ information [ciskip] Signed-off-by: Oliver Kopp --- external-libraries.csv | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/external-libraries.csv b/external-libraries.csv index c4807da635..2e25faf8ee 100644 --- a/external-libraries.csv +++ b/external-libraries.csv @@ -1,3 +1,38 @@ -Group;Artifact;Version;Project;URL;License;Buildtime/Runtime;Mailinglist discussion;CQ;Comment -;versioneye;;;;;Buildtime;https://dev.eclipse.org/mhonarc/lists/soa-pmc/msg02057.html;; -;markdown-toc;;;https://github.com/jonschlinkert/markdown-toc;MIT;Buildtime;n/a;n/a;not required, because it is manually executed during build time +Group,Artifact,Version,Project,URL,License,Buildtime/Runtime,Mailinglist discussion,CQ,Comment, +,versioneye,,,,,Buildtime,https://dev.eclipse.org/mhonarc/lists/soa-pmc/msg02057.html,,, +,markdown-toc,,,https://github.com/jonschlinkert/markdown-toc,MIT,Buildtime,n/a,n/a,not required, because it is manually executed during build time +ch.qos.logback,logback-classic,1.1.1,,,,,,7920,, +ch.qos.logback,logback-core,1.1.1,,,,,,7926,, +com.fasterxml.jackson.core,jackson-annotations,2.8.0,,,,,,13809,, +com.fasterxml.jackson.core,jackson-core,2.8.6,,,,,,13807,, +com.fasterxml.jackson.core,jackson-databind,2.8.6,,,,,,13808,, +com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.7.7,,,,,,13811,, +com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.7.7,,,,,,13810,, +com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.7.7,,,,,,13811,, +com.fasterxml.jackson.module,jackson-module-jsonSchema,2.3.0,,,,,,13812,, +com.googlecode.javaewah,JavaEWAH,0.5.6,,,,,,8046,, +com.jcraft,jsch,0.1.46,,,,,,8045,, +com.sun.jersey.contribs,jersey-multipart,1.19.3,,,,,,,, +com.sun.jersey,jersey-client,1.19.3,,,,,,,, +com.sun.jersey,jersey-core,1.19.3,,,,,,,, +com.sun.jersey,jersey-server,1.19.3,,,,,,,, +com.sun.jersey,jersey-servlet,1.19.3,,,,,,,, +com.sun.xml.bind,jaxb-impl,2.2.5,,,,,,,, +commons-codec,commons-codec,1.3,,,,,,,, +commons-configuration,commons-configuration,1.9,,,,,,,, +commons-httpclient,commons-httpclient,3.1,,,,,,,, +commons-io,commons-io,2.4,,,,,,,, +commons-lang,commons-lang,2.6,,,,,,,, +javax.ws.rs,jsr311-api,1.1.1,,,,,,,, +jstl,jstl,1.2,,,,,,,, +org.apache.commons,commons-compress,1.6,,,,,,,, +org.apache.commons,commons-lang3,3.1,,,,,,,, +org.apache.tika,tika-core,1.3,,,,,,,, +org.jvnet.mimepull,mimepull,1.9.4,,,,,,,, +org.restdoc,restdoc-api,1.3.0,,,,,,,, +org.slf4j,jcl-over-slf4j,1.7.6,,,,,,,, +org.slf4j,slf4j-api,1.7.6,,,,,,,, +org.slf4j,slf4j-ext,1.7.2,,,,,,,, +org.tukaani,xz,1.3,,,,,,,, +xerces,xercesImpl,2.9.1,,,,,,,, +xml-apis,xml-apis,1.3.04,,,,,,,, From 5d643cc205e8a0f6d77a1f2bece34e75a30e4093 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Sat, 1 Jul 2017 16:29:06 +0300 Subject: [PATCH 2/4] Fix Jackson versions Signed-off-by: Oliver Kopp --- org.eclipse.winery.common/pom.xml | 2 +- org.eclipse.winery.model.tosca/pom.xml | 2 +- org.eclipse.winery.repository.client/pom.xml | 4 ++-- org.eclipse.winery.repository/pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/org.eclipse.winery.common/pom.xml b/org.eclipse.winery.common/pom.xml index 869292585d..c4ea6abcd5 100644 --- a/org.eclipse.winery.common/pom.xml +++ b/org.eclipse.winery.common/pom.xml @@ -41,7 +41,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.8.6 + 2.8.0 compile diff --git a/org.eclipse.winery.model.tosca/pom.xml b/org.eclipse.winery.model.tosca/pom.xml index b614dd0d46..de08078999 100644 --- a/org.eclipse.winery.model.tosca/pom.xml +++ b/org.eclipse.winery.model.tosca/pom.xml @@ -21,7 +21,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.8.6 + 2.8.0 diff --git a/org.eclipse.winery.repository.client/pom.xml b/org.eclipse.winery.repository.client/pom.xml index 52c0e2b93c..786a7264e9 100644 --- a/org.eclipse.winery.repository.client/pom.xml +++ b/org.eclipse.winery.repository.client/pom.xml @@ -53,7 +53,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.8.6 + 2.8.0 compile @@ -114,7 +114,7 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.8.6 + 2.7.7 junit diff --git a/org.eclipse.winery.repository/pom.xml b/org.eclipse.winery.repository/pom.xml index 1aa68186d4..dd413d1201 100644 --- a/org.eclipse.winery.repository/pom.xml +++ b/org.eclipse.winery.repository/pom.xml @@ -48,7 +48,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.8.6 + 2.8.0 compile @@ -176,7 +176,7 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.8.6 + 2.7.7 org.slf4j From 4048f35ca2dee7cb650f37eb754683902a6538e7 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Sat, 1 Jul 2017 16:29:26 +0300 Subject: [PATCH 3/4] Replace com.springsource.util by org.eclipse.virgo.util Signed-off-by: Oliver Kopp --- org.eclipse.winery.model.csar.toscametafile/pom.xml | 6 +++--- .../winery/model/csar/toscametafile/TOSCAMetaFile.java | 2 +- .../model/csar/toscametafile/TOSCAMetaFileParser.java | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/org.eclipse.winery.model.csar.toscametafile/pom.xml b/org.eclipse.winery.model.csar.toscametafile/pom.xml index d3f49223df..1a445d27c2 100644 --- a/org.eclipse.winery.model.csar.toscametafile/pom.xml +++ b/org.eclipse.winery.model.csar.toscametafile/pom.xml @@ -74,9 +74,9 @@ 1.1.1 - com.springsource.util - com.springsource.util.parser.manifest - 2.0.5.RELEASE + org.eclipse.virgo.util + org.eclipse.virgo.util.parser.manifest + 3.5.0.RELEASE diff --git a/org.eclipse.winery.model.csar.toscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFile.java b/org.eclipse.winery.model.csar.toscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFile.java index 91eb7f139d..c79032198b 100644 --- a/org.eclipse.winery.model.csar.toscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFile.java +++ b/org.eclipse.winery.model.csar.toscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFile.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Map; -import com.springsource.util.parser.manifest.ManifestContents; +import org.eclipse.virgo.util.parser.manifest.ManifestContents; /** * Provides structured access to the content of a TOSCA meta file.
diff --git a/org.eclipse.winery.model.csar.toscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFileParser.java b/org.eclipse.winery.model.csar.toscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFileParser.java index 4291fdf3d2..184acfa20f 100644 --- a/org.eclipse.winery.model.csar.toscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFileParser.java +++ b/org.eclipse.winery.model.csar.toscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFileParser.java @@ -18,10 +18,10 @@ import java.util.List; import java.util.Map; -import com.springsource.util.parser.manifest.ManifestContents; -import com.springsource.util.parser.manifest.ManifestParser; -import com.springsource.util.parser.manifest.ManifestProblem; -import com.springsource.util.parser.manifest.RecoveringManifestParser; +import org.eclipse.virgo.util.parser.manifest.ManifestContents; +import org.eclipse.virgo.util.parser.manifest.ManifestParser; +import org.eclipse.virgo.util.parser.manifest.ManifestProblem; +import org.eclipse.virgo.util.parser.manifest.RecoveringManifestParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; From b0f6012a9aeb8ac4597ca73703404725c125dd9a Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 3 Jul 2017 18:58:40 +0200 Subject: [PATCH 4/4] Create change log for v2.0.0-M1 Signed-off-by: Oliver Kopp --- CHANGELOG.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd2de85ff6..89442d81f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ Here, the categories "Changed" for added and changed functionality, We refer to [GitHub issues](https://github.com/eclipse/winery/issues) by using `#NUM`. -## Unreleased +## [v2.0.0-M1] - 2017-07-03 ### Changed @@ -20,9 +20,17 @@ We refer to [GitHub issues](https://github.com/eclipse/winery/issues) by using ` * Fix: If there are only XaaS packages without an infrastructure node defined the XaasPackager dialog sends an undefined QName, got fixed by adding a check ### Fixed -* Bounary definitions can be browsed for exported operations again + +* Boundary definitions can be browsed for exported operations again * Relationship Type -> Visual Appearance "Arrow" tab can opened again * Boundary definitions -> interfaces * interfaces selection is properly reloaded if new interface is added * operations selection is properly reloaded if new operation is added +## Initial Code Contribution - 2014-03-27 + +This was the initial code contribution when handing over project governance to the Eclipse Software Foundation. +See also [CQ 7916](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=7916). + +[unreleased]: https://github.com/eclipse/winery/compare/v2.0.0-M1...master +[v2.0.0-M1]: https://github.com/eclipse/winery/compare/initial-code-contribution...v2.0.0-M1