Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cksystemsgroup/cpcc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0d062b84b8a1bdd8822b5da444f778784bf59ca9
Choose a base ref
..
head repository: cksystemsgroup/cpcc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3d1d1b702ef31ab216a5092240202c1829222309
Choose a head ref
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ paradigm of cloud computing to virtualized versions of unmanned vehicles. Our im
of multi-customer information acquisition missions as well as their execution on real hardware running the robot
operating system (ROS).

Homepage: http://cpcc.cs.uni-salzburg.at
Homepage: http://cpcc.cs.sbg.ac.at


## Demo distribution
@@ -21,7 +21,7 @@ Homepage: http://cpcc.cs.uni-salzburg.at
- 2 GB RAM for the Ground Station and 1 GB for each Real Vehicle.

### Setup and start
Download the demo distribution from [here](http://cpcc.cs.uni-salzburg.at/cpcc-demo-0.0.5-SNAPSHOT-demo.tar.gz) and unpack it, and start the setup script as follows:
Download the demo distribution from [here](http://cpcc.cs.sbg.ac.at/cpcc-demo-0.0.5-SNAPSHOT-demo.tar.gz) and unpack it, and start the setup script as follows:

$ tar -xzf cpcc-demo-<version>-demo.tar.gz
$ cd cpcc-demo-<version>
2 changes: 1 addition & 1 deletion cpcc-commons-ui/src/main/resources/cpcc/commons/pages/Contact.tml
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

<p>
Please visit us at
<a href="http://cpcc.cs.uni-salzburg.at/">cpcc.cs.uni-salzburg.at</a>
<a href="http://cpcc.cs.sbg.ac.at/">cpcc.cs.sbg.ac.at</a>
for more information about this project.
</p>

2 changes: 1 addition & 1 deletion cpcc-commons-ui/src/main/resources/cpcc/commons/pages/Contact_de.tml
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

<p>
Details zu diesem Projekt stehen unter
<a href="http://cpcc.cs.uni-salzburg.at/">cpcc.cs.uni-salzburg.at</a>
<a href="http://cpcc.cs.sbg.ac.at/">cpcc.cs.sbg.ac.at</a>
zur Verf&uuml;gung.
</p>

16 changes: 16 additions & 0 deletions cpcc-core/src/main/resources/dbchange/1.0.0/ChangeLog-initial.xml
View file
Original file line number Diff line number Diff line change
@@ -168,5 +168,21 @@
<addUniqueConstraint columnNames="URL" constraintName="IX_REALVEHICLE_URL" deferrable="false" disabled="false" initiallyDeferred="false" tableName="REALVEHICLE"/>
<addUniqueConstraint columnNames="NAME" constraintName="IX_DEVICETYPE_NAME" deferrable="false" disabled="false" initiallyDeferred="false" tableName="DEVICETYPE"/>
<addUniqueConstraint columnNames="TOPICROOT" constraintName="IX_DEVICE_TOPICROOT" deferrable="false" disabled="false" initiallyDeferred="false" tableName="DEVICE"/>
<modifySql dbms="oracle">
<regExpReplace replace="BOOLEAN\(\d+\)" with="NUMBER(1,0)" />
<regExpReplace replace="BIGINT\(\d+\)" with="NUMBER(19,0)" />
<regExpReplace replace="INT\(\d+\)" with="INTEGER" />
</modifySql>
<modifySql dbms="postgresql">
<regExpReplace replace="BIGINT\(\d+\)" with="INT8" />
<regExpReplace replace="BLOB" with="BYTEA" />
<regExpReplace replace="BOOLEAN\(\d+\)" with="BOOLEAN" />
<regExpReplace replace="CLOB" with="TEXT" />
<regExpReplace replace="CHAR\((\d+)(\s*CHAR)?\)" with="CHAR($1)" />
<regExpReplace replace="INT\(\d+\)" with="INT4" />
<regExpReplace replace="OID" with="BYTEA" />
<regExpReplace replace="VARCHAR\((\d+)(\s*CHAR)?\)" with="VARCHAR($1)" />
<regExpReplace replace="VARCHAR2\((\d+)(\s*CHAR)?\)" with="VARCHAR($1)" />
</modifySql>
</changeSet>
</databaseChangeLog>
28 changes: 14 additions & 14 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -58,25 +58,25 @@
<properties>
<additionalparam>-Xdoclint:none</additionalparam>
<assertj-version>3.22.0</assertj-version>
<awaitility-version>4.1.1</awaitility-version>
<awaitility-version>4.2.0</awaitility-version>
<cobertura.report.format>xml</cobertura.report.format>
<com.h2database.version>2.0.206</com.h2database.version>
<com.h2database.version>2.1.212</com.h2database.version>
<easymock-version>4.3</easymock-version>
<httpclient-version>4.5.13</httpclient-version>
<java-version>1.8</java-version>
<javax.mail.version>1.4.7</javax.mail.version>
<junit.jupiter.version>5.8.2</junit.jupiter.version>
<liquibase-version>4.7.0</liquibase-version>
<logback-version>1.2.10</logback-version>
<mockito-version>4.2.0</mockito-version>
<mockserver-version>5.11.2</mockserver-version>
<liquibase-version>4.10.0</liquibase-version>
<logback-version>1.2.11</logback-version>
<mockito-version>4.5.1</mockito-version>
<mockserver-version>5.13.2</mockserver-version>
<rosjava-version>0.0.6</rosjava-version>
<servlet-api-release-version>3.0-alpha-1</servlet-api-release-version>
<slf4j-version>1.7.32</slf4j-version>
<slf4j-version>1.7.36</slf4j-version>
<snakeyaml-version>1.30</snakeyaml-version>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<tapestry-release-version>5.7.3</tapestry-release-version>
<tomcat.version>10.0.14</tomcat.version>
<tapestry-release-version>5.8.1</tapestry-release-version>
<tomcat.version>10.0.20</tomcat.version>
</properties>

<dependencyManagement>
@@ -509,7 +509,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.10.1</version>
<configuration>
<source>${java-version}</source>
<target>${java-version}</target>
@@ -532,7 +532,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.1</version>
<version>3.2.2</version>
<configuration>
<archive>
<compress>true</compress>
@@ -543,7 +543,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</plugin>
<plugin>
<groupId>com.ning.maven.plugins</groupId>
@@ -572,7 +572,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -599,7 +599,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.7</version>
<version>0.8.8</version>
<executions>
<execution>
<goals>
5 changes: 3 additions & 2 deletions src/site/resources/index.html
View file
Original file line number Diff line number Diff line change
@@ -87,7 +87,8 @@ <h2>Demo</h2>
the demo resets daily at noon.
</p>
<p>
<a class="btn btn-primary" href="http://cs.uni-salzburg.at/cpcc-GS01/" role="button">Online Demo &raquo;</a>
<!-- <a class="btn btn-primary" href="http://cs.uni-salzburg.at/cpcc-GS01/" role="button">Online Demo &raquo;</a> -->
<a class="btn btn-primary" href="http://cpcc.cs.sbg.ac.at/cpcc-GS01/" role="button">Online Demo &raquo;</a>
</p>
</div>
<div class="col-md-6 col-lg-3">
@@ -184,7 +185,7 @@ <h2>Publications</h2>
<footer>
<hr />
<p>
&copy; <a href="http://cs.uni-salzburg.at/~ck">Computational Systems Group</a> 2017-2020. Website built with <a
&copy; <a href="http://cs.uni-salzburg.at/~ck">Computational Systems Group</a> 2017-2022. Website built with <a
href="http://getbootstrap.com" target="_blank">Bootstrap</a> and <a href="http://jquery.com">jQuery</a>.
</p>
</footer>