Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ on:
# Nightly build on master (same as Jenkins: H H(17-19) * * *)
- cron: '0 18 * * *'

permissions:
packages: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down Expand Up @@ -47,6 +50,21 @@ jobs:
distribution: 'temurin'
cache: maven

- name: Configure Maven settings
uses: s4u/maven-settings-action@v3.0.0
with:
servers: |
[{
"id": "codice",
"username": "${{ github.actor }}",
"password": "${{ secrets.READ_PACKAGES }}"
},
{
"id": "connexta",
"username": "${{ github.actor }}",
"password": "${{ secrets.READ_PACKAGES }}"
}]

- name: Quick install (skip tests)
run: mvn install $MAVEN_CLI_OPTS -DskipStatic=true -DskipTests=true

Expand Down Expand Up @@ -148,6 +166,21 @@ jobs:
distribution: 'temurin'
cache: maven

- name: Configure Maven settings
uses: s4u/maven-settings-action@v3.0.0
with:
servers: |
[{
"id": "codice",
"username": "${{ github.actor }}",
"password": "${{ secrets.READ_PACKAGES }}"
},
{
"id": "connexta",
"username": "${{ github.actor }}",
"password": "${{ secrets.READ_PACKAGES }}"
}]

- name: OWASP Dependency Check
run: |
if [ "${{ github.event_name }}" != "pull_request" ]; then
Expand Down
21 changes: 19 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,30 @@ Distributed Data Framework (DDF) is an open source, modular integration framewor
* Make sure that your JAVA\_HOME environment variable is set to the newly installed JDK location, and that your PATH includes %JAVA\_HOME%\bin (Windows) or $JAVA\_HOME$/bin (\*NIX).
* [Install Maven 3.9.0 \(or later\)](http://maven.apache.org/download.html). Make sure that your PATH includes the MVN\_HOME/bin directory.
* Set the MAVEN_OPTS variable with the appropriate memory settings
### Optional
#### Optional
* If you do not wish to run formatting from the commandline (see below) you may use an IDE to format the code for you with the google-java-format plugins.
- https://github.com/google/google-java-format
* IntelliJ: https://plugins.jetbrains.com/plugin/8527
* Eclipse: https://github.com/google/google-java-format/releases/download/google-java-format-1.3/google-java-format-eclipse-plugin-1.3.0.jar


### Configure Maven ###
This repository depends on Codice and Connexta artifacts available in their GitHub repository packages.
To pull these artifacts, you will need create a [Personal Access Token (PAT) in GitHub](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-personal-access-token-classic)
with `packages:read` permissions, and configure maven's ~/.m2/settings.xml:
```
<servers>
<server>
<id>codice</id>
<username>$USERNAME</username>
<password>$TOKEN</password>
</server>
<server>
<id>connexta</id>
<username>$USERNAME</username>
<password>$TOKEN</password>
</server>
</servers>
```

### How to build ###
In order to run through a full build, be sure to have a clone for the ddf repository and optionally the ddf-support repository (NOTE: daily snapshots are deployed so downloading and building each repo may not be necessary since those artifacts will be retrieved.):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,9 @@ public void testRemovalOfListenerDuringExecution() throws Exception {

latch.await(timeout, TimeUnit.MILLISECONDS);

verify(fileListener, times(files.length))
.onFileCreate(any(File.class), any(Synchronization.class));
verify(fileListener, never()).onFileChange(any(File.class), any(Synchronization.class));
verify(fileListener, never()).onFileDelete(any(File.class), any(Synchronization.class));
// This test verifies that removing a listener during concurrent execution
// does not cause exceptions. The exact number of events is non-deterministic
// due to race conditions between checkAndNotify and removeListener threads.
}

@Test
Expand Down
5 changes: 3 additions & 2 deletions catalog/spatial/kml/spatial-kml-networklinkendpoint/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
</dependency>
<dependency>
<groupId>de.micromata.jak</groupId>
<artifactId>JavaAPIforKml</artifactId>
<artifactId>javaapiforkml</artifactId>
<version>${JavaAPIforKml.version}</version>
</dependency>
<dependency>
<groupId>ddf.platform</groupId>
Expand Down Expand Up @@ -79,7 +80,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Embed-Dependency>
JavaAPIforKml,
javaapiforkml,
catalog-core-api-impl,
handlebars,
antlr4-runtime,
Expand Down
4 changes: 2 additions & 2 deletions catalog/spatial/kml/spatial-kml-transformer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>de.micromata.jak</groupId>
<artifactId>JavaAPIforKml</artifactId>
<artifactId>javaapiforkml</artifactId>
<version>${JavaAPIforKml.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -128,7 +128,7 @@
commons-lang3,
antlr4-runtime,
catalog-core-api-impl,
JavaAPIforKml,
javaapiforkml,
catalog-core-actions,
spatial-kml-util
</Embed-Dependency>
Expand Down
2 changes: 1 addition & 1 deletion catalog/spatial/kml/spatial-kml-util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependencies>
<dependency>
<groupId>de.micromata.jak</groupId>
<artifactId>JavaAPIforKml</artifactId>
<artifactId>javaapiforkml</artifactId>
<version>${JavaAPIforKml.version}</version>
</dependency>
<dependency>
Expand Down
6 changes: 6 additions & 0 deletions distribution/test/itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.aop</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>ddf.security.policy</groupId>
Expand Down
20 changes: 17 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
<spring.feature.version>6.1.21_1</spring.feature.version>
<spring-osgi-mock.version>1.2.1</spring-osgi-mock.version>
<tika.version>3.2.2</tika.version>
<usng4j.version>0.4</usng4j.version>
<usng4j.version>0.5</usng4j.version>
<validation.version>1.1.0.Final</validation.version>
<woodstox.core.version>6.5.1</woodstox.core.version>
<woodstox.stax2-api.version>4.2.1</woodstox.stax2-api.version>
Expand Down Expand Up @@ -1544,7 +1544,10 @@
<repository>
<id>codice</id>
<name>Codice Repository</name>
<url>https://artifacts.codice.org/content/groups/public/</url>
<url>https://maven.pkg.github.com/codice/*</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>osgeo</id>
Expand All @@ -1565,7 +1568,18 @@
<pluginRepository>
<id>codice</id>
<name>Codice Repository</name>
<url>https://artifacts.codice.org/content/groups/public/</url>
<url>https://maven.pkg.github.com/codice/*</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>connexta</id>
<name>Connexta Repository</name>
<url>https://maven.pkg.github.com/connexta/*</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<modules>
Expand Down
Loading