Skip to content

Jessica Hawkwell / candle-pos

Go to a project
Commit 4e71fb36 by Jessica Hawkwell
Options

Merge branch 'develop' into 'master' 

Develop

See merge request !4
2 parents 5949a126 8b6552f5
Inline Side-by-side
Showing with 122 additions and 24 deletions
.gitlab-ci.yml 0 → 100644
# This file is a template, and might need editing before it works on your project.
---
# Build JAVA applications using Apache Maven (http://maven.apache.org)
# For docker image tags see https://hub.docker.com/_/maven/
#
# For general lifecycle information see https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
#
# This template will build and test your projects as well as create the documentation.
#
# * Caches downloaded dependencies and plugins between invocation.
# * Does only verify merge requests but deploy built artifacts of the
# master branch.
# * Shows how to use multiple jobs in test stage for verifying functionality
# with multiple JDKs.
# * Uses site:stage to collect the documentation for multi-module projects.
# * Publishes the documentation for `master` branch.
variables:
# This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
# `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
# As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
# when running from the command line.
# `installAtEnd` and `deployAtEnd`are only effective with recent version of the corresponding plugins.
MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
# Cache downloaded dependencies and plugins between builds.
# To keep cache across branches add 'key: "$CI_JOB_REF_NAME"'
# This will only validate and compile stuff and run e.g. maven-enforcer-plugin.
# Because some enforcer rules might check dependency convergence and class duplications
# we use `test-compile` here instead of `validate`, so the correct classpath is picked up.
.validate: &validate
stage: build
script:
- 'mvn $MAVEN_CLI_OPTS test-compile'
# For merge requests do not `deploy` but only run `verify`.
# See https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
.verify: &verify
stage: test
script:
- 'mvn $MAVEN_CLI_OPTS verify site site:stage'
except:
- master
# Validate merge requests using JDK8
validate:jdk8:
<<: *validate
image: maven:3.3.9-jdk-8
# Verify merge requests using JDK8
verify:jdk8:
<<: *verify
image: maven:3.3.9-jdk-8
# For `master` branch run `mvn deploy` automatically.
# Here you need to decide whether you want to use JDK7 or 8.
# To get this working you need to define a volume while configuring your gitlab-ci-multi-runner.
# Mount your `settings.xml` as `/root/.m2/settings.xml` which holds your secrets.
# See https://maven.apache.org/settings.html
deploy:jdk8:
# Use stage test here, so the pages job may later pickup the created site.
stage: test
script:
- 'mvn $MAVEN_CLI_OPTS deploy site site:stage'
only:
- master
# Archive up the built documentation site.
artifacts:
paths:
- target/staging
image: maven:3.3.9-jdk-8
pages:
image: busybox:latest
stage: deploy
script:
# Because Maven appends the artifactId automatically to the staging path if you did define a parent pom,
# you might need to use `mv target/staging/YOUR_ARTIFACT_ID public` instead.
- mv target/staging public
dependencies:
- deploy:jdk8
artifacts:
paths:
- public
only:
- master
pom.xml
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<artifactId>candle_pos</artifactId> <artifactId>candle_pos</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<name>Candle POS</name> <name>Candle POS</name>
<url>https://ladyserenakitty.felinewith.me/candle-pos/</url>
<organization> <organization>
<name>StarPhoenix Media</name> <name>StarPhoenix Media</name>
<url>http://starphoenixmedia.com/</url> <url>http://starphoenixmedia.com/</url>
...@@ -22,7 +23,7 @@ ...@@ -22,7 +23,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.6</version> <version>3.0.2</version>
<configuration> <configuration>
<archive> <archive>
<addMavenDescriptor>true</addMavenDescriptor> <addMavenDescriptor>true</addMavenDescriptor>
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
<addClasspath>true</addClasspath> <addClasspath>true</addClasspath>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries> <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
<classpathMavenRepositoryLayout>true</classpathMavenRepositoryLayout> <classpathLayoutType>repository</classpathLayoutType>
<packageName>CandlePOS</packageName> <packageName>CandlePOS</packageName>
<mainClass>com.starphoenixmedia.candle_pos.Starter</mainClass> <mainClass>com.starphoenixmedia.candle_pos.Starter</mainClass>
</manifest> </manifest>
...@@ -40,7 +41,7 @@ ...@@ -40,7 +41,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.5</version> <version>3.6.1</version>
<configuration> <configuration>
<showDeprecation>true</showDeprecation> <showDeprecation>true</showDeprecation>
</configuration> </configuration>
...@@ -48,21 +49,29 @@ ...@@ -48,21 +49,29 @@
</plugins> </plugins>
</build> </build>
<distributionManagement>
<site>
<id>stage</id>
<url>https://ladyserenakitty.felinewith.me/candle-pos/</url>
</site>
</distributionManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>commons-net</groupId> <groupId>commons-net</groupId>
<artifactId>commons-net</artifactId> <artifactId>commons-net</artifactId>
<version>3.4</version> <version>3.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>3.4</version> <version>3.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.neuronrobotics</groupId> <groupId>com.neuronrobotics</groupId>
<artifactId>nrjavaserial</artifactId> <artifactId>nrjavaserial</artifactId>
<version>3.11.0</version> <version>3.13.0</version>
<type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.freedesktop.tango</groupId> <groupId>org.freedesktop.tango</groupId>
...@@ -72,82 +81,82 @@ ...@@ -72,82 +81,82 @@
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <artifactId>derby</artifactId>
<version>10.12.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId> <artifactId>derbytools</artifactId>
<version>10.12.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbyoptionaltools</artifactId> <artifactId>derbyoptionaltools</artifactId>
<version>10.12.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_cs</artifactId> <artifactId>derbyLocale_cs</artifactId>
<version>10.12.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_de_DE</artifactId> <artifactId>derbyLocale_de_DE</artifactId>
<version>10.12.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_es</artifactId> <artifactId>derbyLocale_es</artifactId>
<version>10.12.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_fr</artifactId> <artifactId>derbyLocale_fr</artifactId>
<version>10.12.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_hu</artifactId> <artifactId>derbyLocale_hu</artifactId>
<version>10.12.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_it</artifactId> <artifactId>derbyLocale_it</artifactId>
<version>10.12.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_ja_JP</artifactId> <artifactId>derbyLocale_ja_JP</artifactId>
<version>10.12.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_ko_KR</artifactId> <artifactId>derbyLocale_ko_KR</artifactId>
<version>10.12.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_pl</artifactId> <artifactId>derbyLocale_pl</artifactId>
<version>10.12.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_pt_BR</artifactId> <artifactId>derbyLocale_pt_BR</artifactId>
<version>10.12.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_ru</artifactId> <artifactId>derbyLocale_ru</artifactId>
<version>10.12.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_zh_CN</artifactId> <artifactId>derbyLocale_zh_CN</artifactId>
<version>10.12.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_zh_TW</artifactId> <artifactId>derbyLocale_zh_TW</artifactId>
<version>10.12.1.1</version> <version>10.13.1.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
src/main/java/com/starphoenixmedia/candle_pos/Starter.java
package com.starphoenixmedia.candle_pos; package com.starphoenixmedia.candle_pos;
import com.sun.glass.ui.Application;
import java.io.File; import java.io.File;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
......
src/main/java/com/starphoenixmedia/candle_pos/scale/ScaleReader.java
package com.starphoenixmedia.candle_pos.scale; package com.starphoenixmedia.candle_pos.scale;
import com.starphoenixmedia.candle_pos.scale.ScaleAction;
import com.starphoenixmedia.candle_pos.util.ScaleActionListener; import com.starphoenixmedia.candle_pos.util.ScaleActionListener;
import gnu.io.NRSerialPort; import gnu.io.NRSerialPort;
import java.io.IOException; import java.io.IOException;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!