Permalink
Browse files

Merge branch 'master' into construct-to-mixed2018

  • Loading branch information...
LadyCailin committed Nov 17, 2018
2 parents 5433d4d + 798a863 commit 7fbc5ca758af6b565f8bb1e1854fd16d98d10664
@@ -1,7 +1,8 @@
CommandHelper
=============
[![Build Status](https://travis-ci.org/EngineHub/CommandHelper.svg?branch=master)](https://travis-ci.org/EngineHub/CommandHelper)
Travis: [![Travis Build Status](https://travis-ci.org/EngineHub/CommandHelper.svg?branch=master)](https://travis-ci.org/EngineHub/CommandHelper)
Azure: [![Azure Build Status](https://dev.azure.com/MethodScript/CommandHelper/_apis/build/status/EngineHub.CommandHelper)](https://dev.azure.com/MethodScript/CommandHelper/_build/latest?definitionId=1)
[![Known Vulnerabilities](https://snyk.io/test/github/EngineHub/CommandHelper/badge.svg)](https://snyk.io/test/github/EngineHub/CommandHelper)
CommandHelper adds simple command aliases, complex macros,
@@ -4,7 +4,7 @@
# https://docs.microsoft.com/azure/devops/pipelines/languages/java
pool:
vmImage: 'Ubuntu 16.04'
vmImage: 'vs2017-win2016'
steps:
- task: Maven@3
@@ -14,6 +14,6 @@ steps:
javaHomeOption: 'JDKVersion'
jdkVersionOption: '1.8'
jdkArchitectureOption: 'x64'
publishJUnitResults: false
publishJUnitResults: true
testResultsFiles: '**/TEST-*.xml'
goals: 'package'
@@ -25,13 +25,16 @@
public SimpleVersion(String version) {
Matcher m = p.matcher(version);
if(m.find()) {
major = Integer.parseInt(m.group(1) == null ? "0" : m.group(1));
minor = Integer.parseInt(m.group(2) == null ? "0" : m.group(2));
supplemental = Integer.parseInt(m.group(3) == null ? "0" : m.group(3));
tag = m.group(4) == null ? "" : m.group(4);
try {
major = Integer.parseInt(m.group(1) == null ? "0" : m.group(1));
minor = Integer.parseInt(m.group(2) == null ? "0" : m.group(2));
supplemental = Integer.parseInt(m.group(3) == null ? "0" : m.group(3));
tag = m.group(4) == null ? "" : m.group(4);
} catch (NumberFormatException e) {
throw new IllegalArgumentException("Version numbers must be integers", e);
}
} else {
major = minor = supplemental = 0;
tag = "";
throw new IllegalArgumentException("Invalid version string provided");
}
}
@@ -18,6 +18,7 @@
*
*
*/
@Ignore("Does not work in Travis, but works locally")
public class VirtualFSTest {
public VirtualFSTest() {

0 comments on commit 7fbc5ca

Please sign in to comment.