improvements to CI

fommil · Jan 23, 2015 · 4c7d559 · 4c7d559
1 parent df1f9a0
commit 4c7d559
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 31 deletions.
diff --git a/.settings.xml b/.settings.xml
@@ -0,0 +1,12 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                              http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <servers>
+    <server>
+      <id>sonatype-nexus-snapshots</id>
+      <username>${env.SONATYPE_USERNAME}</username>
+      <password>${env.SONATYPE_PASSWORD}</password>
+    </server>
+  </servers>
+</settings>
diff --git a/.travis.yml b/.travis.yml
@@ -1 +1,20 @@
-language: java
+language: java
+
+jdk:
+  - openjdk6
+
+env:
+  global:
+    # travis encrypt -r fommil/matrix-toolkits-java SONATYPE_USERNAME=<USERNAME>
+    # travis encrypt -r fommil/matrix-toolkits-java SONATYPE_PASSWORD=<PASSWORD>
+    # travis encrypt -r fommil/matrix-toolkits-java COVERALLS_TOKEN=<TOKEN>
+    - secure: "dYVZgCtGmkKbSofzQFeldSj7iOCZdmubinl6QViOfjIfdYpXjh/cAj98pK4OXgmRi/pu4cdik2K//RR47spDUefZ11jlXvKQIl//nyB/RmfZDdDarDKJhn1pO/rKraGpF6ZNw+Puwqcg/4hPRV17RgfvdI4JN3vzbWYVXojspTA="
+    - secure: "GCoO7HOFJ8kxy7Gbh0vvqC9Ksv8ucBPyIspHcIfbC6Qn/R5GQqtVE799WkLQ57QoxVkTv62wEYfLsILFIK4Rt1fXktqPSUTiLETMjrdA19A6e51dA+4mpi6ny2xGQozZKh0WZMwIhnuAeemT9iQ8jsjYiXAUDchwnf2EYBaVDS0="
+    - secure: "gjvopTtBIu/VF+tm/+q35ta5BLUCmhvZLO97YJcAk1HE0KEb9RzpVIGXEDwCxwY2LVPnRCA8CS/FsGIuePtkAka8pmSftAXTOBxCPr5+9GOlWvsFzA35qATmQaEosIKhP2ZKJN7Ra/7b3VFK8v2VwBxck3V/TMfWQ6+Fy54Fn4M="
+
+script:
+  - mvn test
+
+after_success:
+  - mvn clean cobertura:cobertura coveralls:report -DrepoToken=$COVERALLS_TOKEN
+  - mvn clean --settings .settings.xml -Dmaven.test.skip=true $(if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then echo "publish"; fi)
diff --git a/README.md b/README.md
@@ -1,4 +1,7 @@
-matrix-toolkits-java [![Build Status](https://travis-ci.org/fommil/matrix-toolkits-java.svg?branch=master)](https://travis-ci.org/fommil/matrix-toolkits-java)
+[![Build Status](https://travis-ci.org/fommil/matrix-toolkits-java.svg?branch=master)](https://travis-ci.org/fommil/matrix-toolkits-java)
+[![Coverage Status](https://coveralls.io/repos/fommil/matrix-toolkits-java/badge.png)](https://coveralls.io/r/fommil/matrix-toolkits-java)
+
+matrix-toolkits-java 
 ====================
 
 **MTJ** is a high-performance library for developing linear algebra applications.
@@ -8,6 +11,9 @@ MTJ is based on [BLAS](http://www.netlib.org/blas) and [LAPACK](http://www.netli
 MTJ uses the [`netlib-java`](https://github.com/fommil/netlib-java/) project as a backend,
 which will automatically use machine-optimised natives, if they are available. Please read the [`netlib-java` documentation](https://github.com/fommil/netlib-java/) for the extra steps needed to ensure that you are getting the best performance for your system.
 
+For more details on high performance linear algebra on the JVM, please watch [my talk at Scala eXchange 2014](https://skillsmatter.com/skillscasts/5849-high-performance-linear-algebra-in-scala) ([follow along with high-res slides](http://fommil.github.io/scalax14/#/)).
+
+
 Performance to Other Libraries
 ==============================
 
@@ -82,42 +88,22 @@ Releases are distributed on Maven central:
 <dependency>
     <groupId>com.googlecode.matrix-toolkits-java</groupId>
     <artifactId>mtj</artifactId>
-    <version>1.0.1</version>
-</dependency>
-```
-
-**NOTE:** There is a bug in the `netlib-java` that is required by MTJ 1.0.1. To workaround it, also depend on
-
-```xml
-<dependency>
-  <groupId>com.github.fommil.netlib</groupId>
-  <artifactId>all</artifactId>
-  <version>1.1.2</version>
-  <type>pom</type>
+    <version>1.0.2</version>
 </dependency>
 ```
 
 Unofficial single-jar builds may be available from [`java-matrix-benchmark`](https://code.google.com/p/java-matrix-benchmark/source/browse/#svn%2Ftrunk%2Flib%2Fmtj) for laggards who don't have [5 minutes to learn Maven](http://maven.apache.org/guides/getting-started/maven-in-five-minutes.html).
 
-
-Snapshots are distributed on Sonatype's Snapshot Repository:
+Snapshots may be distributed on Sonatype's Snapshot Repository (if you submit a pull request, a build will appear here when it is merged):
 
 ```xml
 <dependency>
   <groupId>com.googlecode.matrix-toolkits-java</groupId>
   <artifactId>mtj</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.3-SNAPSHOT</version>
 </dependency>
 ```
 
-Donations
-=========
-
-Please consider supporting the maintenance of this open source project by starring it, above, and with a donation:
-
-[![Donate via Paypal](https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=B2HW5ATB8C3QW&lc=GB&item_name=mtj&currency_code=GBP&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted)
-
-
 Contributing
 ============
 

diff --git a/pom.xml b/pom.xml
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.12.6</version>
+            <version>1.14.8</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -91,13 +91,13 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>16.0.1</version>
+            <version>18.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -114,7 +114,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.5</version>
+                    <version>1.6</version>
                     <executions>
                         <execution>
                             <id>sign-artifacts</id>
@@ -128,7 +128,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.1</version>
+                    <version>3.2</version>
                     <configuration>
                         <source>1.6</source>
                         <target>1.6</target>
@@ -138,13 +138,27 @@
                     <!-- For the benefit of java-matrix-benchmark -->
                     <!-- mvn compile assembly:single -->
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>2.5.3</version>
                     <configuration>
                         <descriptorRefs>
                             <descriptorRef>jar-with-dependencies</descriptorRef>
                         </descriptorRefs>
                     </configuration>
                 </plugin>
+                <plugin>
+                  <groupId>org.eluder.coveralls</groupId>
+                  <artifactId>coveralls-maven-plugin</artifactId>
+                  <version>3.0.1</version>
+                </plugin>
+                <plugin>
+                  <groupId>org.codehaus.mojo</groupId>
+                  <artifactId>cobertura-maven-plugin</artifactId>
+                  <version>2.6</version>
+                  <configuration>
+                    <format>xml</format>
+                    <maxmem>256m</maxmem>
+                  </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>