Skip to content
This repository has been archived by the owner on Mar 5, 2020. It is now read-only.

Commit

Permalink
Merge pull request #548 from AmyAssist/dev
Browse files Browse the repository at this point in the history
Release 0.8.0
  • Loading branch information
Legion2 authored Mar 28, 2019
2 parents 07bbab4 + 1fb2fe4 commit 99f3e8d
Show file tree
Hide file tree
Showing 109 changed files with 4,261 additions and 698 deletions.
2 changes: 1 addition & 1 deletion .dev/config/instance.config.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodeId=development
nodeId=development
1 change: 0 additions & 1 deletion .docker/config/persistence.properties

This file was deleted.

2 changes: 1 addition & 1 deletion .settings/org.sonarlint.eclipse.core.prefs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ autoEnabled=true
eclipse.preferences.version=1
extraProperties=
fileExclusions=
idePrefixKey=plugins
idePrefixKey=
projectKey=io.github.amyassist\:amy
serverId=SonarCloud/amyassist
sqPrefixKey=
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,5 @@ EXPOSE $AMY_SERVER_CONFIG_SERVER_SOCKET_PORT
EXPOSE $AMY_SOCKET_CONFIG_WEB_SOCKET_PORT

RUN mkdir /config
RUN mkdir /data

CMD ["java", "-jar", "amy.jar", "-c", "/config"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ In the plugin.config set the plugin path acordingly, the default is to load all
Executing `java -jar amy-master-node.jar` will run Amy in the current working directory.
Use the option `-h` to get help `java -jar amy-master-node.jar -h`.

As soon as the confirmation `[INFORMATION] :: Speech Recognition activated` pops up in your console you are good to go.
As soon as the confirmation `Sphinx listening` pops up in your console you are good to go.

#### Waking her up and setting her to sleep
Before giving Amy any commands, she first has to be woken up.
Expand Down
2 changes: 1 addition & 1 deletion amy-master-node/.settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
activeProfiles=
activeProfiles=development,\!production
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
44 changes: 40 additions & 4 deletions amy-master-node/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>io.github.amyassist</groupId>
<artifactId>amy-core</artifactId>
Expand Down Expand Up @@ -60,6 +56,16 @@
<artifactId>amy-chat-socket</artifactId>
<version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.github.amyassist</groupId>
<artifactId>amy-logger</artifactId>
<version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.github.amyassist</groupId>
<artifactId>amy-persistence</artifactId>
<version>0.8.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down Expand Up @@ -132,6 +138,36 @@
</plugins>
</build>
<profiles>
<profile>
<id>development</id>
<activation>
<property>
<name>development</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>io.github.amyassist</groupId>
<artifactId>amy-development-database</artifactId>
<version>0.8.0-SNAPSHOT</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>production</id>
<activation>
<property>
<name>!development</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>io.github.amyassist</groupId>
<artifactId>amy-generic-jdbc-adapter</artifactId>
<version>0.8.0-SNAPSHOT</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>licenses</id>
<build>
Expand Down
2 changes: 1 addition & 1 deletion amy-message-hub/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
<version>1.0.2</version>
<version>1.2.0</version>
</dependency>
<!-- Console -->
<dependency>
Expand Down
Loading

0 comments on commit 99f3e8d

Please sign in to comment.