Merge pull request #74 from at88mph/private-harbor-fix

Private harbor fix

.github/workflows/dependency-submission.yaml

@@ -0,0 +1,22 @@
+name: Dependency Submission
+
+on:
+  push:
+    branches: ['main']
+
+permissions:
+  contents: write
+
+jobs:
+  dependency-submission:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 11
+      - name: Generate and submit dependency graph
+        uses: gradle/actions/dependency-submission@v4

.github/workflows/gradle-node.yaml

@@ -37,37 +37,3 @@ jobs:
 
       - name: Build with Gradle Wrapper
         run: ./gradlew clean build test
-
-    # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html).
-    # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version.
-    #
-    # - name: Setup Gradle
-    #   uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3.0.0
-    #   with:
-    #     gradle-version: '8.5'
-    #
-    # - name: Build with Gradle 8.5
-    #   run: gradle build
-
-  dependency-submission:
-
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: '18.x'
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-
-      # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies.
-      # See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md
-      - name: Generate and submit dependency graph
-        uses: gradle/actions/dependency-submission@v3

VERSION

@@ -5,6 +5,6 @@
 # tags with and without build number so operators use the versioned
 # tag but we always keep a timestamped tag in case a semantic tag gets
 # replaced accidentally
-VER=0.2.8
+VER=0.3.0
 TAGS="${VER} ${VER}-$(date -u +"%Y%m%dT%H%M%S")"
 unset VER

build.gradle

@@ -22,18 +22,22 @@ repositories {
 dependencies {
     implementation 'com.opencsv:opencsv:[5.1,6.0)'
     implementation 'commons-net:commons-net:3.9.0'
-    implementation 'org.apache.commons:commons-configuration2:2.10.1'
+    implementation 'org.apache.commons:commons-configuration2:[2.11.0,3.0.0)'
     implementation 'org.opencadc:cadc-access-control-identity:[1.1.0,)'
     implementation 'org.opencadc:cadc-gms:[1.0.12,2.0)'
     implementation 'org.opencadc:cadc-log:[1.1.5,)'
     implementation 'org.opencadc:cadc-rest:[1.3.9,)'
     implementation 'org.opencadc:cadc-util:[1.6,)'
     implementation 'org.opencadc:cadc-web-token:[1.1.1,2.0.0)'
 
+    runtimeOnly 'commons-io:commons-io:[2.17.0,3.0.0)'
     runtimeOnly 'javax.servlet.jsp.jstl:jstl-api:1.2'
     runtimeOnly 'javax.servlet:jstl:1.2'
     runtimeOnly 'jstl:jstl:[1.0,)'
     runtimeOnly 'org.apache.taglibs:taglibs-standard-impl:1.2.5'
+
+    testImplementation 'junit:junit:[4.12,5.0)'
+    testImplementation 'org.mockito:mockito-core:[5.14.0,6.0.0)'
 }
 
 sourceCompatibility = '1.8'

org.opencadc.science-portal.properties

@@ -4,19 +4,15 @@ org.opencadc.science-portal.sessions.resourceID = ivo://cadc.nrc.ca/skaha
 org.opencadc.science-portal.sessions.standard = vos://cadc.nrc.ca~vospace/CADC/std/Proc#sessions-1.0
 org.opencadc.science-portal.themeName = canfar
 
-# OIDC Client information
-# org.opencadc.science-portal.oidc.clientID = science-portal-oidc-client
-# org.opencadc.science-portal.oidc.clientSecret = science-portal-oidc-client-secretpwd
+# Comma-delimited array of tab labels to display in the science portal.
+# Defaults are "Public" and "Advanced"
+org.opencadc.science-portal.tabLabels = Public, Advanced
 
-# The token scopes to ask for.
-# org.opencadc.science-portal.oidc.scope = openid profile offline_access
+# OIDC properties (if using)
+org.opencadc.science-portal.oidc.clientID = my-openid-client
+org.opencadc.science-portal.oidc.clientSecret = my-openid-client-secret
+org.opencadc.science-portal.oidc.callbackURI = https://example.com/callback
+org.opencadc.science-portal.oidc.redirectURI = https://example.com/redirect
+org.opencadc.science-portal.oidc.scope = openid profile email
 
-# Where to redirect the user to after successful authentication.  Also known as the redirect_uri in OpenID Connect.
-# org.opencadc.science-portal.oidc.redirectURI = https://example.com/science-platform/oidc-callback
-
-# Where to send the user after acquiring a token.
-# org.opencadc.science-portal.oidc.callbackURI = https://example.com/science-platform
-
-# Uncomment this line and change the text if a message needs to be displayed
-# in the banner
-# org.opencadc.science-portal.sessions.bannerText = Banner text from properties file
+org.opencadc.science-portal.tokenCache.url = redis://redis.example.com:6379