diff options
| author | Andy Clement <aclement@pivotal.io> | 2020-08-13 08:32:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-13 08:32:30 -0700 |
| commit | 3e7baa39cdb7af2da7a474a70e12512aecca94be (patch) | |
| tree | 0317c15eb2580f626c24c25483b6bbbe723697fa | |
| parent | a9c5b9f80cb565cc960632b7754a9f00646972cb (diff) | |
| parent | cd2eedb6f5684e47c0cefa6c2f4bab9868b9e772 (diff) | |
| download | aspectj-3e7baa39cdb7af2da7a474a70e12512aecca94be.tar.gz aspectj-3e7baa39cdb7af2da7a474a70e12512aecca94be.zip | |
Merge pull request #3 from larsgrefer/feature/github-actions
Create a simple CI Job using GitHub Actions
| -rw-r--r-- | .github/workflows/maven.yml | 26 | ||||
| -rw-r--r-- | runtime/pom.xml | 1 | ||||
| -rw-r--r-- | weaver/src/test/java/org/aspectj/weaver/bcel/ClasspathManagerTestCase.java | 14 |
3 files changed, 35 insertions, 6 deletions
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 000000000..ebfdd0a30 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,26 @@ +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Java CI with Maven + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + strategy: + matrix: + java: [ 1.8, 11 ] + steps: + - uses: actions/checkout@v2 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + - name: Build with Maven + run: mvn -B package --file pom.xml diff --git a/runtime/pom.xml b/runtime/pom.xml index 86d6d70ed..4830f842d 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -38,6 +38,7 @@ <goal>javadoc</goal> </goals> <configuration> + <source>8</source> </configuration> </execution> </executions> diff --git a/weaver/src/test/java/org/aspectj/weaver/bcel/ClasspathManagerTestCase.java b/weaver/src/test/java/org/aspectj/weaver/bcel/ClasspathManagerTestCase.java index f4f84f168..0cf4cc8ca 100644 --- a/weaver/src/test/java/org/aspectj/weaver/bcel/ClasspathManagerTestCase.java +++ b/weaver/src/test/java/org/aspectj/weaver/bcel/ClasspathManagerTestCase.java @@ -44,12 +44,14 @@ public class ClasspathManagerTestCase extends TestCase { private static String findJvm(String pattern, String jar) { String start = System.getProperty("user.home")+"/jvms"; - for (File f: new File(start).listFiles()) { - if (f.isDirectory() && Pattern.matches(pattern, f.getName())) { - File result = walk(f, jar); - if (result !=null) { - System.out.println("For "+pattern+" found "+result.getAbsolutePath()); - return result.getAbsolutePath(); + if (new File(start).isDirectory()) { + for (File f : new File(start).listFiles()) { + if (f.isDirectory() && Pattern.matches(pattern, f.getName())) { + File result = walk(f, jar); + if (result != null) { + System.out.println("For " + pattern + " found " + result.getAbsolutePath()); + return result.getAbsolutePath(); + } } } } |