Skip to content

Commit

Permalink
Updated documentation to discuss potential Mac crashes & mitigation s…
Browse files Browse the repository at this point in the history
…teps
  • Loading branch information
alansley committed Apr 2, 2020
1 parent 49c16fb commit 863cb06
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
4 changes: 4 additions & 0 deletions Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
1.3.7 (2020/04/02)
- Updated documentation to discuss potential Mac demo crash & potential mitigation steps
- Updated documentation display of project file structure

1.3.6 (2019/06/27)
- Updated Java version from 8 to 11 (we could use 12, but 11 is LTS so let's go with that).
- Updated LWJGL3 version from 3.0.0b to 3.2.2 and made necessary changes to maven POMs & Caliko demo.
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016-2019 Alastair Lansley / Federation University Australia
Copyright (c) 2016-2020 Alastair Lansley / Federation University Australia

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
18 changes: 8 additions & 10 deletions caliko-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>au.edu.federation.caliko</groupId>
<artifactId>caliko-aggregate</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<licenses>
Expand Down Expand Up @@ -80,15 +80,13 @@
<!-- Specify that this project depends on the functionality in the 'core' and visualisation jars and on LWJGL -->
<dependencies>

<!-- https://mvnrepository.com/artifact/junit/junit -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13-beta-3</version>
<scope>test</scope>
</dependency>


<!-- https://mvnrepository.com/artifact/junit/junit -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13-beta-3</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>au.edu.federation.caliko</groupId>
Expand Down
8 changes: 3 additions & 5 deletions caliko-distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@
<parent>
<groupId>au.edu.federation.caliko</groupId>
<artifactId>caliko-aggregate</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>caliko-distribution</artifactId>
<packaging>jar</packaging>
<name>caliko-distribution</name>



<dependencies>

<!-- maven-javadoc-plugin 2.10.4 is supposed to perform transitive dependencies to generate an aggregated Javadoc
as per maven-javadoc-plugin as per https://maven.apache.org/plugins/maven-javadoc-plugin/examples/aggregate-dependency-sources.html,
as per maven-javadoc-plugin: https://maven.apache.org/plugins/maven-javadoc-plugin/examples/aggregate-dependency-sources.html,
via includeDependencySources, then limiting the Javadoc dependencies via dependencySourceIncludes.
But could not get that to work. It seems that the plugin only aggregate Javadocs on modules that are explicitly defined as a direct dependency.
Expand Down Expand Up @@ -55,7 +54,6 @@
<reportOutputDirectory>${project.build.directory}</reportOutputDirectory>
</configuration>


<executions>
<execution>
<id>aggregated-javadoc-jar</id>
Expand Down
Binary file modified caliko-distribution/src/site/docs/caliko-user-guide.docx
Binary file not shown.
Binary file modified caliko-distribution/src/site/docs/caliko-user-guide.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion caliko-visualisation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>au.edu.federation.caliko</groupId>
<artifactId>caliko-aggregate</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<licenses>
Expand Down
2 changes: 1 addition & 1 deletion caliko/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>au.edu.federation.caliko</groupId>
<artifactId>caliko-aggregate</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<licenses>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<artifactId>caliko-aggregate</artifactId>

<packaging>pom</packaging>
<version>1.3.6</version>
<version>1.3.7</version>
<name>Caliko library Aggregate POM</name>
<description>POM to build the Caliko library including the visualisation component, demo application, source and documentation archives.</description>
<url>https://github.com/FedUni/caliko</url>
Expand Down

0 comments on commit 863cb06

Please sign in to comment.