Merge branch 'release/2.2.0'

cincheo · Mar 13, 2019 · b18fa43 · b18fa43
2 parents 2e8800d + 139233e
commit b18fa43
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# JSweet: a Java to JavaScript transpiler [![Build Status](https://travis-ci.org/cincheo/jsweet.svg?branch=master)](https://travis-ci.org/cincheo/jsweet)
+# JSweet: a Java to JavaScript transpiler [![Build Status](https://travis-ci.org/cincheo/jsweet.svg?branch=master)](https://travis-ci.org/cincheo/jsweet) [ ![Download](https://api.bintray.com/packages/jsweet/maven/jsweet-transpiler/images/download.svg?version=2.2.0) ](https://bintray.com/jsweet/maven/jsweet-transpiler/2.2.0/link)
 
 JSweet leverages TypeScript to write rich and responsive Web applications in Java through the use of JavaScript libraries and frameworks. With JSweet, Java programs are transpiled (source-to-source compiled) to TypeScript and JavaScript for being run in browsers, mobile Web views, or in Node.js. 
 
@@ -147,6 +147,12 @@ Additionally, some tools for JSweet are available in external repositories.
 
 Please check each sub-project README file.
 
+## Contributing
+
+JSweet uses [Git Flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow).
+You can fork this repository. Default branch is develop. Please use `git flow feature start myAwesomeFeature` to start working on something great :)
+When you are done, you can submit a regular [GitHub Pull Request](https://help.github.com/en/articles/about-pull-requests).
+
 ## License
 
 Please read the [LICENSE file](https://github.com/cincheo/jsweet/tree/master/LICENSE).
diff --git a/core-lib/es5/pom.xml b/core-lib/es5/pom.xml
@@ -5,7 +5,29 @@
 	<artifactId>jsweet-core</artifactId>
 	<name>JSweet Core Lib</name>
 	<description>JavaScript API for JSweet</description>
-	<version>5-SNAPSHOT</version>
+	<version>5</version>
+
+	<developers>
+		<developer>
+			<id>rpawlak</id>
+			<name>Renaud Pawlak</name>
+			<email>renaud.pawlak@gmail.com</email>
+		</developer>
+		<developer>
+			<id>lgrignon</id>
+			<name>Louis Grignon</name>
+			<email>louis.grignon@gmail.com</email>
+		</developer>
+	</developers>
+	<issueManagement>
+		<url>https://github.com/cincheo/jsweet/issues</url>
+		<system>GitHub Issues</system>
+	</issueManagement>
+	<scm>
+		<url>https://github.com/cincheo/jsweet</url>
+		<connection>scm:git:git://github.com/cincheo/jsweet.git</connection>
+		<developerConnection>scm:git:git@github.com:cincheo/jsweet.git</developerConnection>
+	</scm>
 	<build>
 		<plugins>
 			<plugin>

diff --git a/core-lib/es6/pom.xml b/core-lib/es6/pom.xml
@@ -5,11 +5,30 @@
 	<artifactId>jsweet-core</artifactId>
 	<name>JSweet Core Lib</name>
 	<description>JavaScript API for JSweet</description>
-	<version>6-SNAPSHOT</version>
-	<properties>
-		<jsweet.transpiler.version>2.0.0</jsweet.transpiler.version>
-	</properties>
-		<repositories>
+	<version>6</version>
+
+	<developers>
+		<developer>
+			<id>rpawlak</id>
+			<name>Renaud Pawlak</name>
+			<email>renaud.pawlak@gmail.com</email>
+		</developer>
+		<developer>
+			<id>lgrignon</id>
+			<name>Louis Grignon</name>
+			<email>louis.grignon@gmail.com</email>
+		</developer>
+	</developers>
+	<issueManagement>
+		<url>https://github.com/cincheo/jsweet/issues</url>
+		<system>GitHub Issues</system>
+	</issueManagement>
+	<scm>
+		<url>https://github.com/cincheo/jsweet</url>
+		<connection>scm:git:git://github.com/cincheo/jsweet.git</connection>
+		<developerConnection>scm:git:git@github.com:cincheo/jsweet.git</developerConnection>
+	</scm>
+	<repositories>
 		<repository>
 			<id>jsweet-central</id>
 			<name>libs-release</name>
@@ -55,7 +74,7 @@
 					<fork>true</fork>
 				</configuration>
 			</plugin>
-			
+
 			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
 				<version>1.8</version>
@@ -65,9 +84,9 @@
 						<configuration>
 							<target>
 								<echo message="copying generated bundles to dist..." />
-								
+
 								<mkdir dir="dist/"></mkdir>
-								
+
 								<copy
 									file="src/main/resources/src/typings/${project.artifactId}/${project.version}/bundle.d.ts"
 									tofile="dist/${project.artifactId}.d.ts" verbose="true"
@@ -99,7 +118,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
@@ -111,10 +130,11 @@
 					<encoding>UTF-8</encoding>
 					<fixTags>all</fixTags>
 					<failOnError>false</failOnError>
-                    <!-- leave these options unchanged to place the Javadoc at the right place for jsweet.org -->
-                    <reportOutputDirectory>/var/www/apidocs/org/jsweet</reportOutputDirectory>
-                    <destDir>${project.artifactId}/${project.version}</destDir>
-                    <!-- end of jsweet.org configuration -->
+					<!-- leave these options unchanged to place the Javadoc at the right 
+						place for jsweet.org -->
+					<reportOutputDirectory>/var/www/apidocs/org/jsweet</reportOutputDirectory>
+					<destDir>${project.artifactId}/${project.version}</destDir>
+					<!-- end of jsweet.org configuration -->
 					<header><![CDATA[<a href="http://www.jsweet.org" target="_blank" style="text-transform: lowercase">http://www.jsweet.org<a>]]></header>
 					<bottom><![CDATA[<center>Copyright 2015, <a href="http://www.cincheo.org" target="_blank">Cinchéo SAS<a> - Web site: <a href="http://www.jsweet.org" target="_blank">http://www.jsweet.org<a><center>]]></bottom>
 					<stylesheetfile>/var/www/apidocs/stylesheet.css</stylesheetfile>
@@ -129,7 +149,7 @@
 				</executions>
 			</plugin>
 		</plugins>
-		
+
 		<pluginManagement>
 			<plugins>
 				<!--This plugin's configuration is used to store Eclipse m2e settings 

diff --git a/transpiler/README.md b/transpiler/README.md
@@ -35,3 +35,11 @@ or
 Since version 2, the JSweet transpiler source code is licensed under GPLv3, which in short means that you can use is as is to compile any kind of programs (including closed-source commercial ones). You can also use/modify this transpiler's source code in any open source project (commercial or not), as long as you conform to the license terms (see the license file). On the other hand, your cannot embed this transpiler's source code in a closed-source commercial project. In case you would want to do so, you must contact Renaud Pawlak (renaud.pawlak@gmail.com), who can grant you a commercial license depending on your use case.
 
 NOTE: JSweet transpiler version 1.x, which is no longer maintained, is licensed under Apache v2.
+
+## Release
+```
+git flow release start X.Y.Z
+```
+
+
+
diff --git a/transpiler/pom.xml b/transpiler/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jsweet</groupId>
 	<artifactId>jsweet-transpiler</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
+	<version>2.2.0</version>
 	<name>JSweet transpiler</name>
 	<description>A Java to TypeScript/JavaScript Open Transpiler</description>
 	<developers>
@@ -12,7 +12,21 @@
 			<name>Renaud Pawlak</name>
 			<email>renaud.pawlak@gmail.com</email>
 		</developer>
+		<developer>
+			<id>lgrignon</id>
+			<name>Louis Grignon</name>
+			<email>louis.grignon@gmail.com</email>
+		</developer>
 	</developers>
+	<issueManagement>
+		<url>https://github.com/cincheo/jsweet/issues</url>
+		<system>GitHub Issues</system>
+	</issueManagement>
+	<scm>
+		<url>https://github.com/cincheo/jsweet</url>
+		<connection>scm:git:git://github.com/cincheo/jsweet.git</connection>
+		<developerConnection>scm:git:git@github.com:cincheo/jsweet.git</developerConnection>
+	</scm>
 	<licenses>
 		<license>
 			<name>The Apache Software License, Version 2.0</name>
@@ -220,7 +234,7 @@
 		<dependency>
 			<groupId>org.jsweet</groupId>
 			<artifactId>jsweet-core</artifactId>
-			<version>6-SNAPSHOT</version>
+			<version>6</version>
 			<scope>test</scope>
 			<optional>true</optional>
 		</dependency>

diff --git a/transpiler/release.properties b/transpiler/release.properties
@@ -0,0 +1,12 @@
+#release configuration
+#Sun Mar 10 16:16:08 CET 2019
+scm.tagNameFormat=@{project.artifactId}-@{project.version}
+pushChanges=true
+scm.url=scm\:git\:git@github.com\:cincheo/jsweet.git
+preparationGoals=clean verify
+remoteTagging=true
+projectVersionPolicyId=default
+scm.commentPrefix=[maven-release-plugin] 
+exec.additionalArguments=-P jsweet
+exec.snapshotReleasePluginAllowed=false
+completedPhase=check-poms