Merge pull request #201 from HSLdevcom/develop

1.3.23
HSLdevcom · Jun 14, 2021 · 7edad0c · 7edad0c
2 parents b6be4f5 + f41acaa
commit 7edad0c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml
@@ -7,12 +7,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2.1.0
         with:
-          java-version: 1.8
+          distribution: 'adopt'
+          java-version: '8'
       - name: Cache Maven packages
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.6
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -34,4 +35,4 @@ jobs:
       - name: Publish package
         run: mvn --batch-mode deploy
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/HSLdevcom/transitdata-common.svg?branch=master)](https://travis-ci.org/HSLdevcom/transitdata-common) [![Download](https://api.bintray.com/packages/hsldevcom/maven/transitdata-common/images/download.svg) ](https://bintray.com/hsldevcom/maven/transitdata-common/_latestVersion)
+[![Build status](https://github.com/HSLdevcom/transitdata-common/actions/workflows/test-and-build.yml/badge.svg)](https://github.com/HSLdevcom/transitdata-common/actions/workflows/test-and-build.yml)
 
 # HSL Transitdata Common-library
 
@@ -7,26 +7,27 @@ This repository contains code and constants to be shared between [Transitdata-pr
 
 ## Including the Library
 
-Project is published as fat-jar via [bintray maven repository](https://bintray.com/hsldevcom/maven/transitdata-common).
+Project is published as fat-jar via [GitHub Packages](https://github.com/orgs/HSLdevcom/packages?repo_name=transitdata-common).
 Add the dependency to the project by adding this snippet to your pom.xml file:
 
 ```
     <repositories>
-      <repository>
-        <id>bintray</id>
-        <name>bintray</name>
-        <url>https://dl.bintray.com/hsldevcom/maven</url>
-      </repository>
+        <repository>
+            <id>github</id>
+            <url>https://maven.pkg.github.com/HSLdevcom/*</url>
+        </repository>
     </repositories>
     <dependencies>
        <dependency>
          <groupId>fi.hsl</groupId>
          <artifactId>transitdata-common</artifactId>
          <version>${common.version}</version>
        </dependency>
-     </dependencies>
+    </dependencies>
 ```   
 
+To access GitHub Packages, you also need to create an access token and include it in Maven settings. See [GitHub documentation](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry#authenticating-to-github-packages) for more details.
+
 
 It is also possible to compile the project yourself and use it via local maven repository.
 
@@ -44,7 +45,7 @@ in this repository but you can also generate the files yourself:
  `cd protos && ./generate-protos.sh`   
 
 
-## Configuration[ ![Download](https://api.bintray.com/packages/hsldevcom/maven/transitdata-common/images/download.svg) ](https://bintray.com/hsldevcom/maven/transitdata-common/_latestVersion)
+## Configuration
 
 Library contains package [config](src/main/java/fi/hsl/common/config) which has tools to configure the application.
 By default the configuration file is read from resources inside the application jar-bundle from a file named `environment.conf`.

diff --git a/pom.xml b/pom.xml
@@ -2,15 +2,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.hsl</groupId>
     <artifactId>transitdata-common</artifactId>
-    <version>1.3.22</version>
+    <version>1.3.23</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.15.2</testcontainers.version>
+        <testcontainers.version>1.15.3</testcontainers.version>
     </properties>
 
     <profiles>
@@ -95,7 +95,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.1.7</version>
+            <version>1.2.3</version>
         </dependency>
 
         <dependency>
@@ -119,13 +119,13 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>16.0.2</version>
+            <version>20.1.0</version>
         </dependency>
 
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
 
@@ -183,7 +183,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.8.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -282,7 +282,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.0</version>
+                <version>2.22.2</version>
                 <configuration>
                     <skipTests>${skip.unit.tests}</skipTests>
                     <!-- Excludes integration tests when unit tests are run -->