diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a20d4f1f..1bafb06b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,14 +11,14 @@ jobs: java: [ '8' ] name: Java ${{ matrix.java }} compile steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: ${{ matrix.java }} - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/org.eclipse.january/src/org/eclipse/january/dataset/internal/template/markers.py b/org.eclipse.january/src/org/eclipse/january/dataset/internal/template/markers.py index 659a083b..194dd515 100644 --- a/org.eclipse.january/src/org/eclipse/january/dataset/internal/template/markers.py +++ b/org.eclipse.january/src/org/eclipse/january/dataset/internal/template/markers.py @@ -48,6 +48,8 @@ @SuppressWarnings("cast") ''' +from os.path import basename + class transmutate(object): def __init__(self, scriptfile, srcclass, source, dstclass, destination, disreal=True, disbool=False, disobj=False): @@ -68,7 +70,7 @@ def __init__(self, scriptfile, srcclass, source, dstclass, destination, disreal= ''' self.sdsclass = srcclass self.ddsclass = dstclass - self.commentline = "// This is generated from %s.java by %s" % (srcclass, scriptfile) + self.commentline = "// This is generated from %s.java by %s" % (srcclass, basename(scriptfile)) if len(source) != len(destination): raise ValueError("length of lists should be the same")