Permalink
Browse files

upgraded JRuby, libraries, Maven plugins and RubyGems; fixed upstream…

… test script

- upgraded JRuby to 1.7.16.1
- upgraded Maven plugins
- upgraded libraries (slf4j, jcommander, guava, jsoup)
- upgraded dependent gems (haml, tilt, slim)
- fixed upstream test script
  • Loading branch information...
1 parent 51d062a commit 35ace3c47e74d15e7bed6bd202d02846aa9f5d87 @mojavelinux mojavelinux committed Nov 27, 2014
View
@@ -1,13 +1,20 @@
language: java
+before_script:
+ - unset GEM_PATH GEM_HOME JRUBY_OPTS
jdk:
- oraclejdk7
- openjdk7
- openjdk6
+#env:
+# global:
+# - JAVA_OPTS="-Xms512m -Xmx1g --XX:MaxPermSize=512m -XX:-UseGCOverheadLimit"
notifications:
- irc: "irc.freenode.org#asciidoctor"
+ irc:
+ channels:
+ - "irc.freenode.org#asciidoctor"
script:
- - bash test-asciidoctor-master.sh
- - mvn test
-matrix:
- allow_failures:
- - script: mvn test #current release could fail because of backward incompatibility
+ - mvn clean test -DforkMode=always
+ - bash test-asciidoctor-upstream.sh
+#matrix:
+# allow_failures:
+# - script: mvn test #current release could fail because of backward incompatibility
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>rubygems</groupId>
+ <artifactId>asciidoctor</artifactId>
+ <version></version>
+ <packaging>gem</packaging>
+ <name>Asciidoctor RubyGem Installer</name>
+ <description>Installs the upstream Asciidoctor RubyGem to the local repository.</description>
+ <url>http://asciidoctor.org</url>
+ <repositories>
+ <repository>
+ <id>rubygems-releases</id>
+ <url>http://rubygems-proxy.torquebox.org/releases</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>rubygems-releases</id>
+ <url>http://rubygems-proxy.torquebox.org/releases</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>de.saumya.mojo</groupId>
+ <artifactId>gem-maven-plugin</artifactId>
+ <version>1.0.6</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
@@ -1,79 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>rubygems</groupId>
- <artifactId>asciidoctor</artifactId>
- <version></version>
- <name><![CDATA[A native Ruby AsciiDoc syntax processor and publishing toolchain]]></name>
- <packaging>gem</packaging>
- <description><![CDATA[An open source text processor and publishing toolchain written in Ruby for converting AsciiDoc markup into HTML 5, DocBook 4.5 and custom formats.
-]]></description>
- <url>http://asciidoctor.org</url>
- <developers>
- <developer>
- <id>Jason_Porter</id>
- <name>Jason Porter</name>
- </developer>
- <developer>
- <id>Jeremy_McAnally</id>
- <name>Jeremy McAnally</name>
- </developer>
- <developer>
- <id>Nick_Hengeveld</id>
- <name>Nick Hengeveld</name>
- </developer>
- <developer>
- <id>dan_dot_j_dot_allen_at_gmail_dot_com</id>
- <name>Dan Allen</name>
- <email>dan.j.allen@gmail.com</email>
- </developer>
- <developer>
- <id>rew_at_erebor_dot_com</id>
- <name>Ryan Waldron</name>
- <email>rew@erebor.com</email>
- </developer>
- </developers>
- <licenses>
- <license>
- <name>LICENSE</name>
- <url>./LICENSE</url>
- <distribution>repo</distribution>
- </license>
- <license>
- <name>MIT</name>
- <url>./MIT</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <repositories>
- <repository>
- <id>rubygems-releases</id>
- <url>http://rubygems-proxy.torquebox.org/releases</url>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>rubygems-releases</id>
- <url>http://rubygems-proxy.torquebox.org/releases</url>
- </pluginRepository>
- </pluginRepositories>
- <properties>
- <jruby.plugins.version>1.0.0-rc4</jruby.plugins.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
- </plugin>
- <plugin>
- <groupId>de.saumya.mojo</groupId>
- <artifactId>gem-maven-plugin</artifactId>
- <version>${jruby.plugins.version}</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
-</project>
View
@@ -4,7 +4,7 @@
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
- <version>7</version>
+ <version>9</version>
</parent>
<groupId>org.asciidoctor</groupId>
@@ -55,24 +55,24 @@
<properties>
<project.build.scriptSourceDirectory>src/main/scripts/</project.build.scriptSourceDirectory>
<project.buildDirectory>src/main/build</project.buildDirectory>
- <jruby.version>1.7.9</jruby.version>
+ <jruby.version>1.7.16.1</jruby.version>
<junit.version>4.11</junit.version>
- <jsoup.version>1.7.3</jsoup.version>
+ <jsoup.version>1.8.1</jsoup.version>
<xmlmatchers.version>1.0-RC1</xmlmatchers.version>
<hamcrest.version>1.3</hamcrest.version>
- <guava.version>15.0</guava.version>
- <haml.version>4.0.4</haml.version>
- <tilt.version>2.0.0</tilt.version>
+ <guava.version>18.0</guava.version>
+ <haml.version>4.0.5</haml.version>
+ <tilt.version>2.0.1</tilt.version>
<coderay.version>1.1.0</coderay.version>
<cacheUri.version>0.0.5</cacheUri.version>
<threadsafe.version>0.3.4</threadsafe.version>
<asciidoctor.epub3.version>1.0.0.alpha.3</asciidoctor.epub3.version>
<asciidoctor.version>1.5.1</asciidoctor.version>
<erubis.version>2.7.0</erubis.version>
- <slim.version>2.0.2</slim.version>
- <jcommander.version>1.32</jcommander.version>
+ <slim.version>2.0.3</slim.version>
+ <jcommander.version>1.35</jcommander.version>
<gem.home.directory>classes</gem.home.directory>
- <slf4.version>1.7.5</slf4.version>
+ <slf4.version>1.7.7</slf4.version>
</properties>
<dependencies>
@@ -215,7 +215,7 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -225,7 +225,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<configuration>
<archive>
<manifest>
@@ -243,9 +243,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
+ <version>2.18</version>
<configuration>
<skip>false</skip>
+ <!--
+ <forkMode>always</forkMode>
+ -->
+ <configuration>
+ <argLine>${argLine} -Xms512m -Xmx1g -XX:MaxPermSize=512m -XX:-UseGCOverheadLimit</argLine>
+ </configuration>
</configuration>
<executions>
<execution>
@@ -272,7 +278,7 @@
<plugin>
<groupId>de.saumya.mojo</groupId>
<artifactId>gem-maven-plugin</artifactId>
- <version>1.0.0-rc4</version>
+ <version>1.0.6</version>
<configuration>
<jrubyVersion>${jruby.version}</jrubyVersion>
<gemHome>${project.build.directory}/${gem.home.directory}</gemHome>
@@ -298,7 +304,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -315,7 +321,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.1</version>
+ <version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -344,7 +350,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5.2</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/default.xml</descriptor>
@@ -15,6 +15,7 @@
import org.asciidoctor.ast.DocumentHeader;
import org.asciidoctor.ast.StructuredDocument;
import org.asciidoctor.internal.JRubyAsciidoctor;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -167,7 +168,7 @@ public void one_part_should_be_retrieved_from_simple_string() {
}
- @Test
+ @Test //@Ignore("failing on Travis for unknown reason")
public void no_parts_should_be_retrieved_from_empty_string() {
StructuredDocument document = asciidoctor.readDocumentStructure("",
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# Test against released version
-#mvn test
-
-# Test against unreleased version
-wget -O asciidoctor-master.zip https://github.com/asciidoctor/asciidoctor/archive/master.zip
-unzip asciidoctor-master.zip
-cp install-asciidoctor-gem.pom asciidoctor-master/pom.xml
-cd asciidoctor-master
-ASCIIDOCTOR_VERSION=`grep 'VERSION' ./lib/asciidoctor/version.rb | sed "s/.*'\(.*\)'.*/\1/"`
-echo $ASCIIDOCTOR_VERSION
-sed -i "s;<version></version>;<version>$ASCIIDOCTOR_VERSION</version>;" pom.xml
-mvn install
-cd ..
-rm -rf asciidoctor-master*
-mvn test -Dasciidoctor.version=$ASCIIDOCTOR_VERSION
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Test against released version
+#mvn test
+
+# Test against upstream version
+TAG=master
+#TAG=v1.5.2
+if [ "$TAG" == "master" ]; then
+ SRC_DIR=asciidoctor-master
+else
+ SRC_DIR=asciidoctor-${TAG#v}
+fi
+mvn clean
+mkdir -p target && cd target
+rm -rf $SRC_DIR*
+wget --quiet -O $SRC_DIR.zip https://github.com/asciidoctor/asciidoctor/archive/$TAG.zip
+unzip -q $SRC_DIR.zip
+cp ../asciidoctor-gem-installer.pom $SRC_DIR/pom.xml
+cd $SRC_DIR
+ASCIIDOCTOR_VERSION=`grep 'VERSION' ./lib/asciidoctor/version.rb | sed "s/.*'\(.*\)'.*/\1/"`
+sed -i "s;<version></version>;<version>$ASCIIDOCTOR_VERSION</version>;" pom.xml
+sed -i "s;^ *s\.files \+.*$;s.files = Dir['*.gemspec', '*.adoc', '{bin,data,lib}/*', '{bin,data,lib}/**/*'];" asciidoctor.gemspec
+mvn install -Dgemspec=asciidoctor.gemspec
+cd ../..
+mvn test -Dasciidoctor.version=$ASCIIDOCTOR_VERSION -DforkMode=always
+exit $?

0 comments on commit 35ace3c

Please sign in to comment.