Skip to content

Commit f2fa0ab

Browse files
robfrankrobfrank
committed
#54 remove prod-single profile
removes prod-single from pom moves h2sql dep to prod profile removes build of prod-single from travis
1 parent 14fdb2e commit f2fa0ab

3 files changed

Lines changed: 6 additions & 195 deletions

File tree

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ notifications:
1616

1717
script:
1818
- ./mvnw clean -DskipTests deploy -Pprod --quiet -fae --settings .travis/settings.xml
19-
- ./mvnw clean -DskipTests deploy -Pprod-single --quiet -fae --settings .travis/settings.xml
2019

2120
jdk:
2221
- openjdk8

‎pom.xml‎

Lines changed: 5 additions & 193 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<validation-api.version>1.1.0.Final</validation-api.version>
5252
<mapstruct.version>1.2.0.Final</mapstruct.version>
5353

54-
<arcade-connectors.version>1.0.3</arcade-connectors.version>
54+
<arcade-connectors.version>1.0.4</arcade-connectors.version>
5555
<!-- Plugin versions -->
5656
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
5757
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
@@ -1077,180 +1077,6 @@
10771077
</profile>
10781078
<profile>
10791079
<id>prod</id>
1080-
<dependencies>
1081-
<dependency>
1082-
<groupId>org.springframework.boot</groupId>
1083-
<artifactId>spring-boot-starter-undertow</artifactId>
1084-
</dependency>
1085-
</dependencies>
1086-
<build>
1087-
<plugins>
1088-
<plugin>
1089-
<artifactId>maven-clean-plugin</artifactId>
1090-
<version>${maven-clean-plugin.version}</version>
1091-
<configuration>
1092-
<filesets>
1093-
<fileset>
1094-
<directory>target/www/</directory>
1095-
</fileset>
1096-
</filesets>
1097-
</configuration>
1098-
</plugin>
1099-
<plugin>
1100-
<groupId>org.apache.maven.plugins</groupId>
1101-
<artifactId>maven-war-plugin</artifactId>
1102-
<version>${maven-war-plugin.version}</version>
1103-
<configuration>
1104-
<failOnMissingWebXml>false</failOnMissingWebXml>
1105-
<warSourceDirectory>target/www/</warSourceDirectory>
1106-
<webResources>
1107-
<resource>
1108-
<directory>src/main/webapp</directory>
1109-
<includes>
1110-
<include>WEB-INF/**</include>
1111-
</includes>
1112-
</resource>
1113-
</webResources>
1114-
</configuration>
1115-
</plugin>
1116-
<plugin>
1117-
<groupId>org.springframework.boot</groupId>
1118-
<artifactId>spring-boot-maven-plugin</artifactId>
1119-
<version>${spring-boot.version}</version>
1120-
<configuration>
1121-
<mainClass>${start-class}</mainClass>
1122-
<executable>true</executable>
1123-
</configuration>
1124-
<executions>
1125-
<execution>
1126-
<goals>
1127-
<goal>build-info</goal>
1128-
</goals>
1129-
</execution>
1130-
</executions>
1131-
</plugin>
1132-
<plugin>
1133-
<groupId>com.github.eirslett</groupId>
1134-
<artifactId>frontend-maven-plugin</artifactId>
1135-
<version>${frontend-maven-plugin.version}</version>
1136-
<executions>
1137-
<execution>
1138-
<id>install node and yarn</id>
1139-
<goals>
1140-
<goal>install-node-and-yarn</goal>
1141-
</goals>
1142-
<configuration>
1143-
<nodeVersion>${node.version}</nodeVersion>
1144-
<yarnVersion>${yarn.version}</yarnVersion>
1145-
</configuration>
1146-
</execution>
1147-
<execution>
1148-
<id>yarn install</id>
1149-
<goals>
1150-
<goal>yarn</goal>
1151-
</goals>
1152-
<configuration>
1153-
<arguments>install --force</arguments>
1154-
</configuration>
1155-
</execution>
1156-
<execution>
1157-
<id>webpack build test</id>
1158-
<goals>
1159-
<goal>yarn</goal>
1160-
</goals>
1161-
<phase>test</phase>
1162-
<configuration>
1163-
<arguments>run webpack:test</arguments>
1164-
<yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
1165-
</configuration>
1166-
</execution>
1167-
<execution>
1168-
<id>webpack build prod</id>
1169-
<goals>
1170-
<goal>yarn</goal>
1171-
</goals>
1172-
<phase>generate-resources</phase>
1173-
<configuration>
1174-
<arguments>run webpack:prod</arguments>
1175-
<yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
1176-
</configuration>
1177-
</execution>
1178-
</executions>
1179-
</plugin>
1180-
<plugin>
1181-
<groupId>pl.project13.maven</groupId>
1182-
<artifactId>git-commit-id-plugin</artifactId>
1183-
<version>2.2.6</version>
1184-
<executions>
1185-
<execution>
1186-
<goals>
1187-
<goal>revision</goal>
1188-
</goals>
1189-
</execution>
1190-
</executions>
1191-
<configuration>
1192-
<failOnNoGitDirectory>false</failOnNoGitDirectory>
1193-
<generateGitPropertiesFile>true</generateGitPropertiesFile>
1194-
<includeOnlyProperties>
1195-
<includeOnlyProperty>^git.commit.id.abbrev$</includeOnlyProperty>
1196-
<includeOnlyProperty>^git.commit.id.describe$</includeOnlyProperty>
1197-
<includeOnlyProperty>^git.branch$</includeOnlyProperty>
1198-
</includeOnlyProperties>
1199-
</configuration>
1200-
</plugin>
1201-
1202-
<plugin>
1203-
<groupId>com.spotify</groupId>
1204-
<artifactId>dockerfile-maven-plugin</artifactId>
1205-
<version>${dockerfile-maven-plugin.version}</version>
1206-
<executions>
1207-
<execution>
1208-
<id>default</id>
1209-
<phase>package</phase>
1210-
<goals>
1211-
<goal>build</goal>
1212-
<goal>tag</goal>
1213-
</goals>
1214-
<configuration>
1215-
<tag>latest</tag>
1216-
</configuration>
1217-
</execution>
1218-
<execution>
1219-
<id>tag-version</id>
1220-
<phase>package</phase>
1221-
<goals>
1222-
<goal>tag</goal>
1223-
</goals>
1224-
<configuration>
1225-
<tag>${project.version}-${maven.build.timestamp}</tag>
1226-
</configuration>
1227-
</execution>
1228-
<execution>
1229-
<id>deploy</id>
1230-
<phase>deploy</phase>
1231-
<goals>
1232-
<goal>push</goal>
1233-
</goals>
1234-
</execution>
1235-
</executions>
1236-
<configuration>
1237-
<repository>docker.io/arcadeanalytics/arcadeanalytics</repository>
1238-
<contextDirectory>${project.build.directory}</contextDirectory>
1239-
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
1240-
1241-
</configuration>
1242-
</plugin>
1243-
1244-
1245-
</plugins>
1246-
</build>
1247-
<properties>
1248-
<!-- default Spring profiles -->
1249-
<spring.profiles.active>prod${profile.swagger}${profile.no-liquibase}</spring.profiles.active>
1250-
</properties>
1251-
</profile>
1252-
<profile>
1253-
<id>prod-single</id>
12541080
<dependencies>
12551081
<dependency>
12561082
<groupId>org.springframework.boot</groupId>
@@ -1262,7 +1088,6 @@
12621088
</dependency>
12631089
</dependencies>
12641090
<build>
1265-
<finalName>${project.artifactId}-single-${project.version}</finalName>
12661091
<plugins>
12671092
<plugin>
12681093
<artifactId>maven-clean-plugin</artifactId>
@@ -1377,6 +1202,7 @@
13771202
</includeOnlyProperties>
13781203
</configuration>
13791204
</plugin>
1205+
13801206
<plugin>
13811207
<groupId>com.spotify</groupId>
13821208
<artifactId>dockerfile-maven-plugin</artifactId>
@@ -1400,7 +1226,7 @@
14001226
<goal>tag</goal>
14011227
</goals>
14021228
<configuration>
1403-
<tag>${project.version}-${maven.build.timestamp}</tag>
1229+
<tag>${project.version}</tag>
14041230
</configuration>
14051231
</execution>
14061232
<execution>
@@ -1412,17 +1238,16 @@
14121238
</execution>
14131239
</executions>
14141240
<configuration>
1415-
<repository>docker.io/arcadeanalytics/arcadeanalytics-single</repository>
1241+
<repository>docker.io/arcadeanalytics/arcadeanalytics</repository>
14161242
<contextDirectory>${project.build.directory}</contextDirectory>
14171243
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
14181244
</configuration>
14191245
</plugin>
1420-
14211246
</plugins>
14221247
</build>
14231248
<properties>
14241249
<!-- default Spring profiles -->
1425-
<spring.profiles.active>prod-single${profile.swagger}${profile.no-liquibase}</spring.profiles.active>
1250+
<spring.profiles.active>prod${profile.swagger}${profile.no-liquibase}</spring.profiles.active>
14261251
</properties>
14271252
</profile>
14281253
<profile>
@@ -1627,19 +1452,6 @@
16271452
</plugin>
16281453

16291454

1630-
<!--<plugin>-->
1631-
<!--<groupId>org.apache.maven.plugins</groupId>-->
1632-
<!--<artifactId>maven-javadoc-plugin</artifactId>-->
1633-
<!--<version>3.0.1</version>-->
1634-
<!--<executions>-->
1635-
<!--<execution>-->
1636-
<!--<id>attach-javadocs</id>-->
1637-
<!--<goals>-->
1638-
<!--<goal>jar</goal>-->
1639-
<!--</goals>-->
1640-
<!--</execution>-->
1641-
<!--</executions>-->
1642-
<!--</plugin>-->
16431455
<plugin>
16441456
<groupId>org.apache.maven.plugins</groupId>
16451457
<artifactId>maven-gpg-plugin</artifactId>

‎src/main/docker/app-single.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '2'
22
services:
33
arcadeanalytics-single:
4-
image: arcadeanalytics/arcadeanalytics-single:latest
4+
image: arcadeanalytics/arcadeanalytics:latest
55
user: ${CURRENT_UID}
66
environment:
77
- SPRING_PROFILES_ACTIVE=prod-single

0 commit comments

Comments
 (0)