Commit 208295d3 by Jessica Hawkwell

Updates

1 parent 0bd4805d
Pipeline #116 failed in 0 seconds
Showing with 110 additions and 23 deletions
......@@ -20,15 +20,14 @@ stages:
compile:
stage: compile
script:
- mvn $MAVEN_CLI_OPTS compile
- mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS compile
artifacts:
paths:
- target
test:
stage: compile
script:
- mvn $MAVEN_CLI_OPTS test-compile test
- mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS test-compile test
artifacts:
paths:
- target
......@@ -38,14 +37,14 @@ package:
dependencies:
- compile
script:
- mvn $MAVEN_CLI_OPTS package
- mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS package
site:
stage: package
dependencies:
- test
script:
- mvn $MAVEN_CLI_OPTS site site:jar
- mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS site site:jar
artifacts:
paths:
- target/site
......@@ -57,7 +56,7 @@ deploy:
- package
- site
script:
- mvn $MAVEN_CLI_OPTS deploy
- mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS deploy
artifacts:
paths:
- target/*.jar
......@@ -67,7 +66,7 @@ pages:
dependencies:
- site
script:
- mvn $MAVEN_CLI_OPTS site:stage
- mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS site:stage
- mv target/staging public
artifacts:
paths:
......
......@@ -3,8 +3,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.starphoenixmedia</groupId>
<artifactId>candle_pos</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Candle POS</name>
<version>1.0-SNAPSHOT</version>
<url>https://ladyserenakitty.felinewith.me/candle-pos/</url>
<organization>
<name>StarPhoenix Media</name>
......@@ -15,25 +17,24 @@
<maven>3.0.0</maven>
</prerequisites>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<rev>${env.GIT-REV}</rev>
<rev>${GIT-REV}</rev>
<tag>master</tag>
</properties>
<distributionManagement>
<repository>
<id>internal</id>
<url>https://mvn.felinewith.me/repository/internal/</url>
<id>releases</id>
</repository>
<snapshotRepository>
<id>snapshots</id>
<url>https://mvn.felinewith.me/repository/snapshots/</url>
</snapshotRepository>
<site>
<id>Main</id>
<name>Candle POS</name>
<url>https://ladyserenakitty.felinewith.me/candle-pos/</url>
</site>
</distributionManagement>
......@@ -51,8 +52,8 @@
<scm>
<connection>scm:git:https://felinewith.me/LadySerenaKitty/candle-pos.git</connection>
<developerConnection>scm:git:[email protected]:LadySerenaKitty/candle-pos.git</developerConnection>
<tag>master</tag>
<url>https://felinewith.me/LadySerenaKitty/candle-pos</url>
<tag>${tag}</tag>
<url>https://felinewith.me/LadySerenaKitty/candle-pos/blob/${tag}/</url>
</scm>
<developers>
......@@ -60,13 +61,68 @@
<id>LadySerenaKitty</id>
<name>Jessica Hawkwell</name>
<email>[email protected]</email>
<organization>StarPhoenix Media</organization>
<organizationUrl>http://starphoenixmedia.com/</organizationUrl>
<properties>
<gab>@LadySerenaKitty</gab>
</properties>
<roles>
<role>Owner</role>
<role>Administrator</role>
<role>Developer</role>
</roles>
<timezone>-4</timezone>
</developer>
</developers>
<repositories>
<repository>
<id>releases</id>
<name>SPM Releases</name>
<url>https://mvn.felinewith.me/repository/releases/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>snapshots</id>
<name>SPM Snapshots</name>
<url>https://mvn.felinewith.me/repository/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>internal</id>
<name>SPM Internal</name>
<url>https://mvn.felinewith.me/repository/internal/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<configuration>
......@@ -82,19 +138,35 @@
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<showDeprecation>true</showDeprecation>
</configuration>
<executions>
<execution>
<id>attach-javadoc</id>
<phase>prepare-package</phase>
<configuration>
<classifier>javadoc</classifier>
</configuration>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.6</version>
<executions>
<execution>
<id>attach-site</id>
<phase>prepare-package</phase>
<configuration>
<classifier>site</classifier>
</configuration>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
......@@ -267,4 +339,20 @@
<version>10.13.1.1</version>
</dependency>
</dependencies>
<profiles>
<profile>
<id>ci</id>
<activation>
<property>
<name>env.CI_COMMIT_REF_NAME</name>
</property>
</activation>
<properties>
<!-- Override only if necessary -->
<tag>${env.CI_COMMIT_REF_NAME}</tag>
</properties>
</profile>
</profiles>
</project>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!