Skip to content

Commit

Permalink
v3.1.1 - Dependency updates, and update version numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
jbaker-dstl committed Jun 28, 2021
1 parent 2f534f8 commit f444253
Show file tree
Hide file tree
Showing 4 changed files with 256 additions and 247 deletions.
8 changes: 4 additions & 4 deletions GETTING-STARTED.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ Baleen 3 is built on top of the [Annot8](https://github.com/annot8) data process
First, we need to download a copy of Baleen 3.

The easiest way to do this is to download a pre-built version from the [Releases](https://github.com/dstl/baleen3/releases) page.
You should download the file called `baleen-3.0.2.jar`, as this is the main JAR file (i.e. application) for Baleen 3.
You should download the file called `baleen-3.1.1.jar`, as this is the main JAR file (i.e. application) for Baleen 3.

1. Navigate to the [GitHub Releases page for Baleen 3](https://github.com/dstl/baleen3/releases)
2. Download `baleen-3.0.2.jar` from the Assets section
2. Download `baleen-3.1.1.jar` from the Assets section
3. Create a new folder, which we will refer to as `$BALEEN_HOME` and save the downloaded JAR file to it

Alternatively, you could build Baleen 3 yourself from source.
Expand All @@ -40,15 +40,15 @@ Each provider may make their components available for download through different
For this example, we will download the *Annot8 Cyber Components* and *Annot8 Print Components* JARs from Maven Central, which is where the official Annot8 components are released.

1. Navigate to the [GitHub Releases page for Annot8 Components](https://github.com/annot8/annot8-components/releases)
2. Download the JAR files for Annot8 Cyber Components (`annot8-components-cyber-1.1.0-plugin.jar`) and Annot8 Print Components (`annot8-components-print-1.1.0-plugin.jar`)
2. Download the JAR files for Annot8 Cyber Components (`annot8-components-cyber-1.2.0-plugin.jar`) and Annot8 Print Components (`annot8-components-print-1.2.0-plugin.jar`)
3. Place the JAR files you just downloaded in `$BALEEN_HOME/components/` (you will need to create this directory)

## Running Baleen 3

Baleen 3 runs as a background server. We start it via the Terminal or Command Prompt, but then interact with it via a web browser.
Baleen 3 has been developed with modern web browsers in mind, so we recommend using a recent version of Chrome.

1. Open a terminal and run the following command from the `$BALEEN_HOME` directory: `java -jar baleen-3.0.2.jar`
1. Open a terminal and run the following command from the `$BALEEN_HOME` directory: `java -jar baleen-3.1.1.jar`
2. Open a web browser, and navigate to [http://localhost:6413](http://localhost:6413)

## Building a Pipeline
Expand Down
32 changes: 16 additions & 16 deletions THIRD-PARTY.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Lists of 117 third-party dependencies.
(Apache Software License 2.0) Annot8 Reference Implementations (io.annot8:annot8-reference-implementation:1.1.0 - http://annot8.io/annot8-implementations/annot8-reference-implementation)
(Apache Software License 2.0) Annot8 Text Utilities (io.annot8:annot8-utils-text:1.2.0 - http://annot8.io/annot8-utils-text)
(The MIT License (MIT)) ClassGraph (io.github.classgraph:classgraph:4.8.108 - https://github.com/classgraph/classgraph)
(The Apache Software License, Version 2.0) micrometer-core (io.micrometer:micrometer-core:1.7.0 - https://github.com/micrometer-metrics/micrometer)
(The Apache Software License, Version 2.0) micrometer-core (io.micrometer:micrometer-core:1.7.1 - https://github.com/micrometer-metrics/micrometer)
(Apache License 2.0) swagger-annotations (io.swagger.core.v3:swagger-annotations:2.1.9 - https://github.com/swagger-api/swagger-core/modules/swagger-annotations)
(Apache License 2.0) swagger-core (io.swagger.core.v3:swagger-core:2.1.9 - https://github.com/swagger-api/swagger-core/modules/swagger-core)
(Apache License 2.0) swagger-integration (io.swagger.core.v3:swagger-integration:2.1.9 - https://github.com/swagger-api/swagger-core/modules/swagger-integration)
Expand All @@ -63,9 +63,9 @@ Lists of 117 third-party dependencies.
(Apache License, Version 2.0) Apache Commons Text (org.apache.commons:commons-text:1.9 - https://commons.apache.org/proper/commons-text)
(Apache License, Version 2.0) Apache Log4j API (org.apache.logging.log4j:log4j-api:2.14.1 - https://logging.apache.org/log4j/2.x/log4j-api/)
(Apache License, Version 2.0) Apache Log4j to SLF4J Adapter (org.apache.logging.log4j:log4j-to-slf4j:2.14.1 - https://logging.apache.org/log4j/2.x/log4j-to-slf4j/)
(Apache License, Version 2.0) tomcat-embed-core (org.apache.tomcat.embed:tomcat-embed-core:9.0.46 - https://tomcat.apache.org/)
(Apache License, Version 2.0) tomcat-embed-el (org.apache.tomcat.embed:tomcat-embed-el:9.0.46 - https://tomcat.apache.org/)
(Apache License, Version 2.0) tomcat-embed-websocket (org.apache.tomcat.embed:tomcat-embed-websocket:9.0.46 - https://tomcat.apache.org/)
(Apache License, Version 2.0) tomcat-embed-core (org.apache.tomcat.embed:tomcat-embed-core:9.0.48 - https://tomcat.apache.org/)
(Apache License, Version 2.0) tomcat-embed-el (org.apache.tomcat.embed:tomcat-embed-el:9.0.48 - https://tomcat.apache.org/)
(Apache License, Version 2.0) tomcat-embed-websocket (org.apache.tomcat.embed:tomcat-embed-websocket:9.0.48 - https://tomcat.apache.org/)
(The Apache License, Version 2.0) org.apiguardian:apiguardian-api (org.apiguardian:apiguardian-api:1.1.0 - https://github.com/apiguardian-team/apiguardian)
(Apache License, Version 2.0) AssertJ fluent assertions (org.assertj:assertj-core:3.19.0 - https://assertj.github.io/doc/assertj-core/)
(Apache License, Version 2.0) Evo Inflector (org.atteo:evo-inflector:1.2.2 - http://atteo.org/static/evo-inflector)
Expand All @@ -88,8 +88,8 @@ Lists of 117 third-party dependencies.
(The Apache License, Version 2.0) org.opentest4j:opentest4j (org.opentest4j:opentest4j:1.2.0 - https://github.com/ota4j-team/opentest4j)
(BSD-3-Clause) asm (org.ow2.asm:asm:9.1 - http://asm.ow2.io/)
(The Apache Software License, Version 2.0) JSONassert (org.skyscreamer:jsonassert:1.5.0 - https://github.com/skyscreamer/JSONassert)
(MIT License) JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.30 - http://www.slf4j.org)
(MIT License) SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - http://www.slf4j.org)
(MIT License) JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.31 - http://www.slf4j.org)
(MIT License) SLF4J API Module (org.slf4j:slf4j-api:1.7.31 - http://www.slf4j.org)
(The Apache License, Version 2.0) springdoc-openapi-common (org.springdoc:springdoc-openapi-common:1.5.9 - https://springdoc.org/springdoc-openapi-common/)
(The Apache License, Version 2.0) springdoc-openapi-ui (org.springdoc:springdoc-openapi-ui:1.5.9 - https://springdoc.org/springdoc-openapi-ui/)
(The Apache License, Version 2.0) springdoc-openapi-webmvc-core (org.springdoc:springdoc-openapi-webmvc-core:1.5.9 - https://springdoc.org/springdoc-openapi-webmvc-core/)
Expand All @@ -102,16 +102,16 @@ Lists of 117 third-party dependencies.
(Apache License, Version 2.0) Spring TestContext Framework (org.springframework:spring-test:5.3.8 - https://github.com/spring-projects/spring-framework)
(Apache License, Version 2.0) Spring Web (org.springframework:spring-web:5.3.8 - https://github.com/spring-projects/spring-framework)
(Apache License, Version 2.0) Spring Web MVC (org.springframework:spring-webmvc:5.3.8 - https://github.com/spring-projects/spring-framework)
(Apache License, Version 2.0) spring-boot (org.springframework.boot:spring-boot:2.5.1 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-autoconfigure (org.springframework.boot:spring-boot-autoconfigure:2.5.1 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter (org.springframework.boot:spring-boot-starter:2.5.1 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter-json (org.springframework.boot:spring-boot-starter-json:2.5.1 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter-logging (org.springframework.boot:spring-boot-starter-logging:2.5.1 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter-test (org.springframework.boot:spring-boot-starter-test:2.5.1 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter-tomcat (org.springframework.boot:spring-boot-starter-tomcat:2.5.1 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter-web (org.springframework.boot:spring-boot-starter-web:2.5.1 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-test (org.springframework.boot:spring-boot-test:2.5.1 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-test-autoconfigure (org.springframework.boot:spring-boot-test-autoconfigure:2.5.1 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot (org.springframework.boot:spring-boot:2.5.2 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-autoconfigure (org.springframework.boot:spring-boot-autoconfigure:2.5.2 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter (org.springframework.boot:spring-boot-starter:2.5.2 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter-json (org.springframework.boot:spring-boot-starter-json:2.5.2 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter-logging (org.springframework.boot:spring-boot-starter-logging:2.5.2 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter-test (org.springframework.boot:spring-boot-starter-test:2.5.2 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter-tomcat (org.springframework.boot:spring-boot-starter-tomcat:2.5.2 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-starter-web (org.springframework.boot:spring-boot-starter-web:2.5.2 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-test (org.springframework.boot:spring-boot-test:2.5.2 - https://spring.io/projects/spring-boot)
(Apache License, Version 2.0) spring-boot-test-autoconfigure (org.springframework.boot:spring-boot-test-autoconfigure:2.5.2 - https://spring.io/projects/spring-boot)
(Apache 2.0) Swagger UI (org.webjars:swagger-ui:3.49.0 - http://webjars.org)
(MIT) webjars-locator-core (org.webjars:webjars-locator-core:0.46 - http://webjars.org)
(The Apache Software License, Version 2.0) org.xmlunit:xmlunit-core (org.xmlunit:xmlunit-core:2.8.2 - https://www.xmlunit.org/)
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.1</version>
<version>2.5.2</version>
</parent>

<groupId>uk.gov.dstl</groupId>
<artifactId>baleen</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>

<name>Baleen 3</name>
<description>Baleen 3 is a tool for building and running pipelines using the Annot8 data processing framework</description>
Expand Down
Loading

0 comments on commit f444253

Please sign in to comment.