Skip to content

Commit cfdb36a

Browse files
LangvannLangvann
committed
Merge branch 'graceful-shutdown'
2 parents f115448 + ec3a28e commit cfdb36a

File tree

11 files changed

+171
-175
lines changed

11 files changed

+171
-175
lines changed

‎pom.xml

+6-87
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<groupId>com.github.nlnwa</groupId>
@@ -17,11 +18,6 @@
1718
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1819
<maven.compiler.source>11</maven.compiler.source>
1920
<maven.compiler.target>11</maven.compiler.target>
20-
21-
<veidemann.commons.version>0.3.11</veidemann.commons.version>
22-
<antlr.version>4.7.2</antlr.version>
23-
<antlr4test-maven-plugin.version>1.8</antlr4test-maven-plugin.version>
24-
<log4j.version>2.7</log4j.version>
2521
</properties>
2622

2723
<repositories>
@@ -42,97 +38,20 @@
4238
</repository>
4339
</repositories>
4440

45-
<dependencies>
46-
<!-- Do all logging thru Log4j -->
47-
<dependency>
48-
<groupId>org.slf4j</groupId>
49-
<artifactId>slf4j-api</artifactId>
50-
<version>1.7.21</version>
51-
</dependency>
52-
<dependency>
53-
<groupId>org.apache.logging.log4j</groupId>
54-
<artifactId>log4j-api</artifactId>
55-
<version>${log4j.version}</version>
56-
</dependency>
57-
<dependency>
58-
<groupId>org.apache.logging.log4j</groupId>
59-
<artifactId>log4j-core</artifactId>
60-
<version>${log4j.version}</version>
61-
</dependency>
62-
<dependency>
63-
<groupId>org.apache.logging.log4j</groupId>
64-
<artifactId>log4j-slf4j-impl</artifactId>
65-
<version>${log4j.version}</version>
66-
</dependency>
67-
<dependency>
68-
<groupId>org.apache.logging.log4j</groupId>
69-
<artifactId>log4j-jul</artifactId>
70-
<version>${log4j.version}</version>
71-
</dependency>
72-
73-
<!-- Test dependencies -->
74-
<dependency>
75-
<groupId>junit</groupId>
76-
<artifactId>junit</artifactId>
77-
<version>4.12</version>
78-
<scope>test</scope>
79-
</dependency>
80-
<dependency>
81-
<groupId>org.assertj</groupId>
82-
<artifactId>assertj-core</artifactId>
83-
<version>3.8.0</version>
84-
<scope>test</scope>
85-
</dependency>
86-
<dependency>
87-
<groupId>com.squareup.okhttp3</groupId>
88-
<artifactId>mockwebserver</artifactId>
89-
<version>3.14.2</version>
90-
<scope>test</scope>
91-
</dependency>
92-
</dependencies>
93-
9441
<build>
9542
<pluginManagement>
9643
<plugins>
9744
<plugin>
98-
<groupId>org.apache.maven.plugins</groupId>
99-
<artifactId>maven-failsafe-plugin</artifactId>
100-
<version>2.19.1</version>
101-
<executions>
102-
<execution>
103-
<goals>
104-
<goal>integration-test</goal>
105-
<goal>verify</goal>
106-
</goals>
107-
</execution>
108-
</executions>
109-
</plugin>
110-
<plugin>
111-
<groupId>io.fabric8</groupId>
112-
<artifactId>docker-maven-plugin</artifactId>
113-
<version>0.28.0</version>
114-
</plugin>
115-
<plugin>
116-
<groupId>org.codehaus.mojo</groupId>
117-
<artifactId>appassembler-maven-plugin</artifactId>
45+
<groupId>com.google.cloud.tools</groupId>
46+
<artifactId>jib-maven-plugin</artifactId>
11847
<version>2.0.0</version>
11948
</plugin>
12049
<plugin>
12150
<groupId>org.apache.maven.plugins</groupId>
12251
<artifactId>maven-jar-plugin</artifactId>
123-
<version>3.0.2</version>
124-
</plugin>
125-
<plugin>
126-
<groupId>org.antlr</groupId>
127-
<artifactId>antlr4-maven-plugin</artifactId>
128-
<version>${antlr.version}</version>
129-
</plugin>
130-
<plugin>
131-
<groupId>com.khubla.antlr</groupId>
132-
<artifactId>antlr4test-maven-plugin</artifactId>
133-
<version>${antlr4test-maven-plugin.version}</version>
52+
<version>3.2.0</version>
13453
</plugin>
13554
</plugins>
13655
</pluginManagement>
13756
</build>
138-
</project>
57+
</project>

‎veidemann-robotsevaluator-codegen/pom.xml

+23-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>com.github.nlnwa</groupId>
@@ -10,6 +11,11 @@
1011
<artifactId>veidemann-robotsevaluator-codegen</artifactId>
1112
<packaging>jar</packaging>
1213

14+
<properties>
15+
<antlr.version>4.8-1</antlr.version>
16+
<antlr4test-maven-plugin.version>1.12</antlr4test-maven-plugin.version>
17+
</properties>
18+
1319
<dependencies>
1420
<dependency>
1521
<groupId>org.antlr</groupId>
@@ -19,16 +25,28 @@
1925
</dependencies>
2026

2127
<build>
28+
<pluginManagement>
29+
<plugins>
30+
<plugin>
31+
<groupId>org.antlr</groupId>
32+
<artifactId>antlr4-maven-plugin</artifactId>
33+
<version>${antlr.version}</version>
34+
</plugin>
35+
<plugin>
36+
<groupId>com.khubla.antlr</groupId>
37+
<artifactId>antlr4test-maven-plugin</artifactId>
38+
<version>${antlr4test-maven-plugin.version}</version>
39+
</plugin>
40+
</plugins>
41+
</pluginManagement>
42+
2243
<plugins>
2344
<plugin>
2445
<groupId>org.antlr</groupId>
2546
<artifactId>antlr4-maven-plugin</artifactId>
2647
<configuration>
27-
<sourceDirectory>src/main/grammars/</sourceDirectory>
28-
<grammars>useragent.g4,robotstxt.g4</grammars>
2948
<visitor>true</visitor>
3049
<listener>true</listener>
31-
<outputDirectory>${project.build.directory}/generated-sources/antlr4/no/nb/nna/veidemann/robots</outputDirectory>
3250
</configuration>
3351
<executions>
3452
<execution>
@@ -74,4 +92,4 @@
7492
</plugin>
7593
</plugins>
7694
</build>
77-
</project>
95+
</project>

‎veidemann-robotsevaluator-codegen/src/main/grammars/RobotstxtLexer.g4 ‎veidemann-robotsevaluator-codegen/src/main/antlr4/no/nb/nna/veidemann/robots/RobotstxtLexer.g4

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ options {
44
language = Java;
55
}
66

7-
@header {
8-
package no.nb.nna.veidemann.robots;
9-
}
10-
117
LWS : ((CR? LF)?(SP|HT)+) -> skip;
128
COLON : ':';
139
SLASH : '/';

‎veidemann-robotsevaluator-codegen/src/main/grammars/RobotstxtParser.g4 ‎veidemann-robotsevaluator-codegen/src/main/antlr4/no/nb/nna/veidemann/robots/RobotstxtParser.g4

-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ options {
55
tokenVocab=RobotstxtLexer;
66
}
77

8-
@header {
9-
package no.nb.nna.veidemann.robots;
10-
}
11-
128
robotstxt : entries* EOF;
139

1410
entries : entry+;

‎veidemann-robotsevaluator-codegen/src/main/grammars/Useragent.g4 ‎veidemann-robotsevaluator-codegen/src/main/antlr4/no/nb/nna/veidemann/robots/Useragent.g4

-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ options {
3636
language = Java;
3737
}
3838

39-
@header {
40-
package no.nb.nna.veidemann.robots;
41-
}
42-
4339
prog
4440
: (product comment?) +
4541
;

‎veidemann-robotsevaluator-service/pom.xml

+82-24
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>com.github.nlnwa</groupId>
@@ -10,12 +11,18 @@
1011
<packaging>jar</packaging>
1112

1213
<properties>
13-
<docker.tag>latest</docker.tag>
14+
<docker.username>${env.DOCKER_USERNAME}</docker.username>
15+
<docker.password>${env.DOCKER_PASSWORD}</docker.password>
16+
<docker.tag>${project.version}</docker.tag>
1417

15-
<docker.java.image>openjdk:8-jdk-alpine</docker.java.image>
16-
<cache2k-version>1.2.2.Final</cache2k-version>
17-
<veidemann.rethinkdbadapter.version>0.3.16</veidemann.rethinkdbadapter.version>
18-
<log4j.version>2.7</log4j.version>
18+
<log4j.version>2.13.0</log4j.version>
19+
<slf4j.version>1.7.30</slf4j.version>
20+
21+
<cache2k-version>1.2.4.Final</cache2k-version>
22+
<okhttp3.version>4.4.0</okhttp3.version>
23+
24+
<veidemann.rethinkdbadapter.version>0.4.5</veidemann.rethinkdbadapter.version>
25+
<veidemann.commons.version>0.4.1</veidemann.commons.version>
1926
</properties>
2027

2128
<repositories>
@@ -37,11 +44,60 @@
3744
</repositories>
3845

3946
<dependencies>
47+
<!-- Do all logging thru Log4j -->
48+
<dependency>
49+
<groupId>org.slf4j</groupId>
50+
<artifactId>slf4j-api</artifactId>
51+
<version>${slf4j.version}</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.apache.logging.log4j</groupId>
55+
<artifactId>log4j-api</artifactId>
56+
<version>${log4j.version}</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.apache.logging.log4j</groupId>
60+
<artifactId>log4j-core</artifactId>
61+
<version>${log4j.version}</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.apache.logging.log4j</groupId>
65+
<artifactId>log4j-slf4j-impl</artifactId>
66+
<version>${log4j.version}</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.apache.logging.log4j</groupId>
70+
<artifactId>log4j-jul</artifactId>
71+
<version>${log4j.version}</version>
72+
</dependency>
73+
74+
<!-- Configuration framework -->
75+
<dependency>
76+
<groupId>com.typesafe</groupId>
77+
<artifactId>config</artifactId>
78+
<version>1.4.0</version>
79+
</dependency>
80+
81+
<!-- Test dependencies -->
82+
<dependency>
83+
<groupId>junit</groupId>
84+
<artifactId>junit</artifactId>
85+
<version>4.13</version>
86+
<scope>test</scope>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.assertj</groupId>
90+
<artifactId>assertj-core</artifactId>
91+
<version>3.15.0</version>
92+
<scope>test</scope>
93+
</dependency>
94+
4095
<dependency>
4196
<groupId>${project.groupId}</groupId>
4297
<artifactId>veidemann-robotsevaluator-codegen</artifactId>
4398
<version>${project.version}</version>
4499
</dependency>
100+
45101
<dependency>
46102
<groupId>org.netpreserve.commons</groupId>
47103
<artifactId>webarchive-commons-uri</artifactId>
@@ -54,34 +110,35 @@
54110
<version>${veidemann.commons.version}</version>
55111
</dependency>
56112

113+
<dependency>
114+
<groupId>com.github.nlnwa</groupId>
115+
<artifactId>veidemann-rethinkdbadapter</artifactId>
116+
<version>${veidemann.rethinkdbadapter.version}</version>
117+
</dependency>
118+
57119
<dependency>
58120
<groupId>com.squareup.okhttp3</groupId>
59121
<artifactId>okhttp</artifactId>
60-
<version>3.14.2</version>
122+
<version>${okhttp3.version}</version>
61123
</dependency>
62124

63125
<dependency>
64126
<groupId>org.cache2k</groupId>
65127
<artifactId>cache2k-api</artifactId>
66128
<version>${cache2k-version}</version>
67129
</dependency>
130+
68131
<dependency>
69132
<groupId>org.cache2k</groupId>
70133
<artifactId>cache2k-core</artifactId>
71134
<version>${cache2k-version}</version>
72135
</dependency>
73136

74137
<dependency>
75-
<groupId>com.github.nlnwa</groupId>
76-
<artifactId>veidemann-rethinkdbadapter</artifactId>
77-
<version>${veidemann.rethinkdbadapter.version}</version>
78-
</dependency>
79-
80-
<!-- Configuration framework -->
81-
<dependency>
82-
<groupId>com.typesafe</groupId>
83-
<artifactId>config</artifactId>
84-
<version>1.3.3</version>
138+
<groupId>com.squareup.okhttp3</groupId>
139+
<artifactId>mockwebserver</artifactId>
140+
<version>${okhttp3.version}</version>
141+
<scope>test</scope>
85142
</dependency>
86143
</dependencies>
87144

@@ -102,30 +159,31 @@
102159
<plugin>
103160
<groupId>com.google.cloud.tools</groupId>
104161
<artifactId>jib-maven-plugin</artifactId>
105-
<version>1.3.0</version>
106162
<configuration>
107163
<to>
108164
<image>docker.io/norsknettarkiv/${project.artifactId}</image>
109165
<tags>
110166
<tag>${docker.tag}</tag>
111167
</tags>
112168
<auth>
113-
<username>${env.DOCKER_USERNAME}</username>
114-
<password>${env.DOCKER_PASSWORD}</password>
169+
<username>${docker.username}</username>
170+
<password>${docker.password}</password>
115171
</auth>
116172
</to>
117173
<container>
118174
<ports>
119175
<port>50053</port>
120176
</ports>
177+
<jvmFlags>
178+
<jvmFlag>-Dfile.encoding=UTF-8</jvmFlag>
179+
</jvmFlags>
121180
</container>
122-
<jvmFlags>
123-
<jvmFlag>-Dfile.encoding=UTF-8</jvmFlag>
124-
</jvmFlags>
181+
125182
</configuration>
126183
</plugin>
127184
</plugins>
128185
</build>
186+
129187
<profiles>
130188
<profile>
131189
<id>docker-build</id>
@@ -166,4 +224,4 @@
166224
</build>
167225
</profile>
168226
</profiles>
169-
</project>
227+
</project>

0 commit comments

Comments
 (0)