Merge tag 'v2.0.0-M1' into master-origin

OpenTOSCA · Jul 3, 2017 · 6808fe2 · 6808fe2
2 parents e6a73dc + b0f6012
commit 6808fe2
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 19 deletions.
diff --git 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
diff --git 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,,,,,,,,
diff --git a/org.eclipse.winery.common/pom.xml b/org.eclipse.winery.common/pom.xml
@@ -41,7 +41,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>2.8.6</version>
+			<version>2.8.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>

diff --git a/org.eclipse.winery.model.csar.toscametafile/pom.xml b/org.eclipse.winery.model.csar.toscametafile/pom.xml
@@ -74,9 +74,9 @@
 			<version>1.1.1</version>
 		</dependency>
 		<dependency>
-			<groupId>com.springsource.util</groupId>
-			<artifactId>com.springsource.util.parser.manifest</artifactId>
-			<version>2.0.5.RELEASE</version>
+			<groupId>org.eclipse.virgo.util</groupId>
+			<artifactId>org.eclipse.virgo.util.parser.manifest</artifactId>
+			<version>3.5.0.RELEASE</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/...oscametafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFile.java b/...oscametafile/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.<br />

diff --git a/...tafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFileParser.java b/...tafile/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;
 

diff --git a/org.eclipse.winery.model.tosca/pom.xml b/org.eclipse.winery.model.tosca/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>2.8.6</version>
+			<version>2.8.0</version>
 		</dependency>
 	</dependencies>
 	<properties>

diff --git a/org.eclipse.winery.repository.client/pom.xml b/org.eclipse.winery.repository.client/pom.xml
@@ -53,7 +53,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>2.8.6</version>
+			<version>2.8.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -114,7 +114,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
 			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>2.8.6</version>
+			<version>2.7.7</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

diff --git a/org.eclipse.winery.repository/pom.xml b/org.eclipse.winery.repository/pom.xml
@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>2.8.6</version>
+			<version>2.8.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -176,7 +176,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
 			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>2.8.6</version>
+			<version>2.7.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>