Skip to content

Commit

Permalink
Merge tag 'v5.5' into metno
Browse files Browse the repository at this point in the history
  • Loading branch information
cskarby committed Jan 1, 2025
2 parents e6ca3ee + bd96de7 commit 777a1a7
Show file tree
Hide file tree
Showing 1,111 changed files with 5,118 additions and 21,929 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
name: Check fresh compile and assemble of TDS project
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: TDS Documentation Build Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup Java 11
uses: actions/setup-java@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
name: Code Style Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/tds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
# test against latest 11, 14 of zulu and 11 of temurin java
java-version: [ 11 ]
java-vendor: [ 'zulu', 'temurin' ]
# test against tomcat 8.5.x and tomcat 9.x
servletcontainer: [ 'tomcat85', 'tomcat9' ]
include:
- java-version: 14
java-vendor: 'zulu'
servletcontainer: 'tomcat85'
- java-version: 14
java-vendor: 'zulu'
servletcontainer: 'tomcat9'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Build and test with Gradle (${{ matrix.java-vendor }} ${{ matrix.java-version }})
uses: Unidata/thredds-test-action@v2
with:
Expand All @@ -32,6 +24,6 @@ jobs:
- uses: actions/upload-artifact@v2
if: failure()
with:
name: tds_JUnit_Results_${{ github.sha }}_AdoptOpenJDK-HS-${{ matrix.java }}-matrix.servletcontainer }}
name: tds_JUnit_Results_${{ github.sha }}_AdoptOpenJDK-HS-${{ matrix.java }}-${{ matrix.servletcontainer }}
path: build/reports/allTests

2 changes: 1 addition & 1 deletion .github/workflows/update-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout default branch
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Verify variables
run: |
Expand Down
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ buildscript {
}
// only look for unidata plugin related artifacts from the unidata-all repo
filter {
includeModule 'com.burgstaller', 'okhttp-digest'
includeModule 'org.ysb33r.gradle', 'grolifant'
includeModule 'edu.ucar.unidata.site', 'jekyll-plugin'
includeModule 'edu.ucar.unidata.site', 'jekyll-gems'
includeModule 'edu.ucar.unidata', 'unidata-nexus-gradle'
Expand All @@ -49,9 +51,9 @@ allprojects {
// Matches Maven's "project.version". Used in MANIFEST.MF for "Implementation-Version".
// We try to follow semantic versioning, and thus we use <major>.<minor>.<patch>-<prerelease version>
// <prerelease version> may be SNAPSHOT, alphax, betax, etc.
version = '5.5-SNAPSHOT'
version = '5.5'
// Eventually, we'll stop appending "SNAPSHOT" to our versions and just use this.
status = 'development'
status = 'release'
}

// Matches Maven's "project.description".
Expand Down
14 changes: 0 additions & 14 deletions dap4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,6 @@ ext.title = 'Data Access Protocol (DAP) version 4.0' // Will be inherited by su

// dap4 has no source code nor any artifacts to publish

// NON-TRANSITIVE Dependency graph:
// module depends on
// ----------------------------------------
// common:
// d4core nothing
// d4lib d4core httpservices
// d4cdm d4lib cdm
// server:
// d4servletshared d4cdmshared netcdf4
// d4ts d4servletshared
// d4tswar d4ts
// tests:
// d4tests d4servletshared d4ts

subprojects {
// TODO: Give the subprojects real titles.
ext.title = "DAP4: $name"
Expand Down
11 changes: 6 additions & 5 deletions dap4/d4servlet/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ apply from: "$rootDir/gradle/any/dependencies.gradle"
apply from: "$rootDir/gradle/any/java-published.gradle"

dependencies {
implementation enforcedPlatform(project(':tds-platform'))
implementation enforcedPlatform(project(':tds-platform'))

compile 'edu.ucar:dap4'
compile 'edu.ucar:httpservices'
implementation 'edu.ucar:dap4'
implementation 'edu.ucar:httpservices'
implementation 'edu.ucar:cdm-core'

compileOnly 'jakarta.servlet:jakarta.servlet-api'
compile 'org.slf4j:slf4j-api'
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-api'
}
84 changes: 84 additions & 0 deletions dap4/d4servlet/src/main/java/dap4/servlet/CDMDMR.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
/*
* Copyright 2012, UCAR/Unidata.
* See the LICENSE file for more information.
*/

package dap4.servlet;

import dap4.core.dmr.*;

public class CDMDMR {
//////////////////////////////////////////////////

public static class CDMAttribute extends DapAttribute {
public CDMAttribute(String name, DapType basetype) {
super(name, basetype);
}
}

public static class CDMAttributeSet extends DapAttributeSet {
public CDMAttributeSet(String name) {
super(name);
}
}

public static class CDMDimension extends DapDimension {
public CDMDimension(String name, long size) {
super(name, size);
}
}

public static class CDMMap extends DapMap {
public CDMMap(String target) {
super(target);
}
}

public abstract static class CDMVariable extends DapVariable {
public CDMVariable(String name, DapType t) {
super(name, t);
}
}

public static class CDMGroup extends DapGroup {
public CDMGroup(String name) {
super(name);
}
}

public static class CDMDataset extends DapDataset {
public CDMDataset(String name) {
super(name);
}
}

public static class CDMEnumeration extends DapEnumeration {
public CDMEnumeration(String name, DapType basetype) {
super(name, basetype);
}
}

public static class CDMEnumConst extends DapEnumConst {
public CDMEnumConst(String name, long value) {
super(name, value);
}
}

public static class CDMStructure extends DapStructure {
public CDMStructure(String name) {
super(name);
}
}

public static class CDMSequence extends DapSequence {
public CDMSequence(String name) {
super(name);
}
}

public static class CDMOtherXML extends DapOtherXML {
public CDMOtherXML(String name) {
super(name);
}
}
}
Loading

0 comments on commit 777a1a7

Please sign in to comment.