Prepare for sonatype releases

It's important to use SNAPSHOT version so the project not get deployed as a release, used the HEAD-SNAPSHOT strategy which is easier and people using SNAPSHOT version do not need to update the SNAPSHOT version, the will keep in the head forever. This also go perfect with the creative versioning used here ;). Renamed parent module to gwt-ol3-parent and client from gwt-ol3-client to gwt-ol3 which is the actual lib name. Collapsed permutations, OL3 is a one script lib, and the demo size is just 90k, after collapsing all permutation it get up to 100k which is almost the same. So collapsed.
TDesjardins · Nov 30, 2016 · 9f01cf2 · 9f01cf2
1 parent 4610ca4
commit 9f01cf2
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 56 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,15 @@
 language: java
+
 jdk:
-  - oraclejdk8
+  - oraclejdk8
+
+after_success:
+  - ci/deploy-snapshot.sh
+
+notifications:
+  email: false
+
+sudo: false
+cache:
+  directories:
+    - $HOME/.m2
diff --git a/ci/deploy-snapshot.sh b/ci/deploy-snapshot.sh
@@ -0,0 +1,7 @@
+if [ "$TRAVIS_REPO_SLUG" == "TDesjardins/gwt-ol3" ] && \
+   [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && \
+   [ "$TRAVIS_PULL_REQUEST" == "false" ] && \
+   [ "$TRAVIS_BRANCH" == "master" ]; then
+
+  mvn -s ci/settings.xml clean source:jar deploy -Dmaven.test.skip=true -Dinvoker.skip=true
+fi
diff --git a/ci/settings.xml b/ci/settings.xml
@@ -0,0 +1,14 @@
+<settings>
+    <servers>
+        <server>
+            <id>github-ssh</id>
+            <username>git</username>
+        </server>
+        <server>
+            <id>sonatype-nexus-snapshots</id>
+            <username>${env.CI_DEPLOY_USERNAME}</username>
+            <password>${env.CI_DEPLOY_PASSWORD}</password>
+        </server>
+    </servers>
+</settings>
+
diff --git a/gwt-ol3-client/pom.xml b/gwt-ol3-client/pom.xml
@@ -5,10 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.github.tdesjardins</groupId>
-        <artifactId>gwt-ol3</artifactId>
-        <version>2.8.0</version>
+        <artifactId>gwt-ol3-parent</artifactId>
+        <version>HEAD-SNAPSHOT</version>
     </parent>
-    <artifactId>gwt-ol3-client</artifactId>
+    <artifactId>gwt-ol3</artifactId>
     <packaging>gwt-lib</packaging>
 
     <dependencies>
@@ -36,7 +36,6 @@
         <plugins>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19</version>
                 <configuration>
                     <skipTests>true</skipTests>
                 </configuration>
@@ -49,23 +48,6 @@
                     <moduleName>ol.GwtOL3</moduleName>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <additionalparam>-Xdoclint:none</additionalparam>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/gwt-ol3-demo/pom.xml b/gwt-ol3-demo/pom.xml
@@ -5,8 +5,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.github.tdesjardins</groupId>
-        <artifactId>gwt-ol3</artifactId>
-        <version>2.8.0</version>
+        <artifactId>gwt-ol3-parent</artifactId>
+        <version>HEAD-SNAPSHOT</version>
     </parent>
     <artifactId>gwt-ol3-demo</artifactId>
     <packaging>gwt-app</packaging>
@@ -22,22 +22,28 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>gwt-ol3-client</artifactId>
+            <artifactId>gwt-ol3</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
 
     <build>
+        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>net.ltgt.gwt.maven</groupId>
                 <artifactId>gwt-maven-plugin</artifactId>
-                <version>1.0-rc-6</version>
                 <configuration>
                     <moduleName>com.github.tdesjardins.ol3.demo.GwtOL3Playground</moduleName>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/gwt-ol3-demo/src/main/resources/com/github/tdesjardins/ol3/demo/GwtOL3Playground.gwt.xml b/gwt-ol3-demo/src/main/resources/com/github/tdesjardins/ol3/demo/GwtOL3Playground.gwt.xml
@@ -4,4 +4,6 @@
     <inherits name='ol.GwtOL3'/>
 
     <entry-point class='com.github.tdesjardins.ol3.demo.client.GwtOL3Playground'/>
+
+    <collapse-all-properties/><!-- this generates 1-100k instead of 5-90k permutations -->
 </module>
diff --git a/pom.xml b/pom.xml
@@ -3,18 +3,15 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
         <version>9</version>
     </parent>
-
     <groupId>com.github.tdesjardins</groupId>
-    <artifactId>gwt-ol3</artifactId>
-    <version>2.8.0</version>
+    <artifactId>gwt-ol3-parent</artifactId>
+    <version>HEAD-SNAPSHOT</version>
     <packaging>pom</packaging>
-
     <name>GWT OpenLayers 3</name>
     <description>GWT JsInterop API for OpenLayers 3</description>
     <url>https://github.com/TDesjardins/gwt-ol3</url>
@@ -49,13 +46,6 @@
         <url>https://github.com/TDesjardins/gwt-ol3/issues</url>
     </issueManagement>
 
-    <distributionManagement>
-        <site>
-            <id>github-ssh</id>
-            <url>gitsite:git@github.com/TDesjardins/gwt-ol3.git</url>
-        </site>
-    </distributionManagement>
-
     <prerequisites>
         <maven>3</maven>
     </prerequisites>
@@ -95,18 +85,26 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.6.0</version>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.19.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.8.2</version>
+                </plugin>
                 <plugin>
                     <groupId>net.ltgt.gwt.maven</groupId>
                     <artifactId>gwt-maven-plugin</artifactId>
                     <version>1.0-rc-6</version>
                     <extensions>true</extensions>
                     <configuration>
                         <skipModule>true</skipModule>
-                    	<compilerArgs>
+                        <failOnError>true</failOnError>
+                        <compilerArgs>
                             <!-- arg>-generateJsInteropExports</arg-->
                             <arg>-XdisableUpdateCheck</arg>
                         </compilerArgs>
@@ -122,12 +120,21 @@
                         <style>OBFUSCATED</style> <!-- OBFUSCATED, PRETTY, or DETAILED -->
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <configuration>
+                        <additionalparam>-Xdoclint:none</additionalparam>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
+
         <plugins>
             <plugin>
                 <groupId>net.ltgt.gwt.maven</groupId>
                 <artifactId>gwt-maven-plugin</artifactId>
+                <inherited>false</inherited>
                 <configuration>
                     <startupUrls>
                         <url>gwtol3playground/GwtOL3Playground.html</url>
@@ -136,22 +143,14 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.6</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.github.stephenc.wagon</groupId>
-                        <artifactId>wagon-gitsite</artifactId>
-                        <version>0.5</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.9</version>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.5.3</version>
+                <configuration>
+                    <autoVersionSubmodules>true</autoVersionSubmodules>
+                    <developmentVersion>HEAD-SNAPSHOT</developmentVersion>
+                    <tagNameFormat>v@{project.version}</tagNameFormat>
+                </configuration>
             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/release.sh b/release.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ -z "$1" ];
+then echo "usage: release.sh <releaseVersion>"
+else mvn release:prepare release:perform -DreleaseVersion=$1 -Dtag=v$1
+fi