Merge branch 'master' into specific-lang-tag-support

protegeproject · Jun 14, 2024 · ade42cf · ade42cf
2 parents b34bb22 + 2dfe49b
commit ade42cf
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 45 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,17 +1,22 @@
-name: Java CI
+name: Verify
 
-on: [push]
+on:
+  push:
+    branches-ignore:
+      - main
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: '17'
-          distribution: 'temurin'
+          distribution: 'adopt'
       - name: Build with Maven
-        run: mvn --batch-mode --update-snapshots package
+        run: mvn --batch-mode package
diff --git a/.github/workflows/pub-docker-hub.yaml b/.github/workflows/pub-docker-hub.yaml
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -0,0 +1,53 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - master
+      - main*
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor != 'protegeproject-bot[bot]' }}
+    steps:
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{secrets.DOCKER_USERNAME}}
+          password: ${{secrets.DOCKER_PASSWORD}}
+      - uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ vars.PROTEGEPROJECT_BOT_APP_ID }}
+          private-key: ${{ secrets.PROTEGEPROJECT_BOT_APP_PRIVATE_KEY }}
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+          ref: ${{ github.head_ref }}
+      - name: Set up Maven Central Repository
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+          server-id: docker.io
+          server-username: DOCKER_USERNAME
+          server-password: DOCKER_PASSWORD
+      - name: Bump version
+        id: bump
+        uses: mickem/gh-action-bump-maven-version@v1
+      - name: Build package
+        run: mvn --batch-mode clean package
+      - name: Build and push image
+        run: mvn --batch-mode -pl webprotege-gwt-ui-server dockerfile:build dockerfile:push
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.bump.outputs.tag }}
+          generate_release_notes: true
+
+env:
+  DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
+  DOCKER_TOKEN: ${{secrets.DOCKER_PASSWORD}}
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>edu.stanford.protege</groupId>
     <artifactId>webprotege-gwt-ui</artifactId>
-    <version>5.0.6-SNAPSHOT</version>
+    <version>5.0.8</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/webprotege-gwt-ui-client/pom.xml b/webprotege-gwt-ui-client/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>edu.stanford.protege</groupId>
         <artifactId>webprotege-gwt-ui</artifactId>
-        <version>5.0.6-SNAPSHOT</version>
+        <version>5.0.8</version>
     </parent>
 
     <artifactId>webprotege-gwt-ui-client</artifactId>

diff --git a/...gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/upload/FileUploader.java b/...gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/upload/FileUploader.java
@@ -49,8 +49,6 @@ private native void uploadFileNative(String fileInputId, String endPoint, String
                 }
             }
         };
-
-        console.log("About to send form data");
         // Initiate a multipart/form-data upload
         xhr.send(formData);
 

diff --git a/webprotege-gwt-ui-server-core/pom.xml b/webprotege-gwt-ui-server-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>webprotege-gwt-ui</artifactId>
         <groupId>edu.stanford.protege</groupId>
-        <version>5.0.6-SNAPSHOT</version>
+        <version>5.0.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/webprotege-gwt-ui-server/pom.xml b/webprotege-gwt-ui-server/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>edu.stanford.protege</groupId>
         <artifactId>webprotege-gwt-ui</artifactId>
-        <version>5.0.6-SNAPSHOT</version>
+        <version>5.0.8</version>
     </parent>
 
     <artifactId>webprotege-gwt-ui-server</artifactId>

diff --git a/webprotege-gwt-ui-shared-core/pom.xml b/webprotege-gwt-ui-shared-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>webprotege-gwt-ui</artifactId>
         <groupId>edu.stanford.protege</groupId>
-        <version>5.0.6-SNAPSHOT</version>
+        <version>5.0.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/webprotege-gwt-ui-shared/pom.xml b/webprotege-gwt-ui-shared/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>edu.stanford.protege</groupId>
         <artifactId>webprotege-gwt-ui</artifactId>
-        <version>5.0.6-SNAPSHOT</version>
+        <version>5.0.8</version>
     </parent>
 
     <artifactId>webprotege-gwt-ui-shared</artifactId>
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
             };
-            console.log("About to send form data");
             // Initiate a multipart/form-data upload
             xhr.send(formData);
@@ Expand Down @@