Merge pull request #179 from HSLdevcom/develop

1.3.21

.github/workflows/test-and-build.yml

@@ -0,0 +1,37 @@
+name: Test and publish Maven package
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Cache Maven packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+      - name: Build with Maven
+        run: mvn clean package -Dmaven.javadoc.skip=true -B -V
+      - name: Run integration tests
+        run: mvn failsafe:integration-test && mvn failsafe:verify
+  publish:
+    needs: test
+    runs-on: ubuntu-latest
+    # Run only for tagged commits
+    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Publish package
+        run: mvn --batch-mode deploy
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

pom.xml

@@ -2,15 +2,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.hsl</groupId>
     <artifactId>transitdata-common</artifactId>
-    <version>1.3.20</version>
+    <version>1.3.21</version>
     <packaging>jar</packaging>
     <name>Common utilities for Transitdata projects</name>
     <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>
         <pulsar.version>2.3.1</pulsar.version>
-        <testcontainers.version>1.9.0</testcontainers.version>
+        <testcontainers.version>1.15.2</testcontainers.version>
     </properties>
 
     <profiles>
@@ -45,6 +45,14 @@
         </profile>
     </profiles>
 
+    <distributionManagement>
+        <repository>
+            <id>github</id>
+            <name>GitHub HSLdevcom Apache Maven Packages</name>
+            <url>https://maven.pkg.github.com/HSLdevcom/transitdata-common</url>
+        </repository>
+    </distributionManagement>
+
     <dependencies>
         <dependency>
             <groupId>com.google.protobuf</groupId>
@@ -307,7 +315,5 @@
                 </executions>
             </plugin>
         </plugins>
-
     </build>
-
 </project>

src/integration-test/java/fi/hsl/common/pulsar/MockContainers.java

@@ -21,7 +21,7 @@ public class MockContainers {
     private MockContainers() {}
 
     public static GenericContainer newRedisContainer() {
-        return new GenericContainer("redis:3.0.2")
+        return new GenericContainer("redis:5.0.6")
                 .withExposedPorts(6379);
     }