Skip to content

Commit

Permalink
Merge pull request #13 from rtdi/master
Browse files Browse the repository at this point in the history
version update
  • Loading branch information
wernerdaehn authored Dec 14, 2021
2 parents 7f2e1f3 + 5ba6b69 commit f80246a
Show file tree
Hide file tree
Showing 7 changed files with 1,639 additions and 1,658 deletions.
58 changes: 29 additions & 29 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
name: Test

on:
push:
branches:
- master

jobs:
build:
name: Test build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/cache@v1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Set up JDK 12
uses: actions/setup-java@main
with:
java-version: 12
distribution: 'adopt'
- name: Build and test project
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
mvn -DskipTests=true --no-transfer-progress clean package
name: Test

on:
push:
branches:
- master

jobs:
build:
name: Test build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/cache@v1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Set up JDK 12
uses: actions/setup-java@main
with:
java-version: 12
distribution: 'adopt'
- name: Build and test project
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
mvn -DskipTests=true --no-transfer-progress clean package
104 changes: 52 additions & 52 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
name: Release

on:
push:
branches:
- main

jobs:
build:
name: Release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/cache@v1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Set up JDK 12
uses: actions/setup-java@v1
with:
java-version: 12
distribution: 'adopt'
- name: Build and test project
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
export MVN_PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
echo "MVN_PROJECT_VERSION=$MVN_PROJECT_VERSION" >> $GITHUB_ENV
mvn -DskipTests=true --no-transfer-progress clean package
- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: v${{ env.MVN_PROJECT_VERSION }}
release_name: Release v${{ env.MVN_PROJECT_VERSION }}
draft: false
prerelease: false
- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: target/hanaconnector.war
asset_name: hanaconnector.war
asset_content_type: application/war
name: Release

on:
push:
branches:
- main

jobs:
build:
name: Release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/cache@v1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Set up JDK 12
uses: actions/setup-java@v1
with:
java-version: 12
distribution: 'adopt'
- name: Build and test project
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
export MVN_PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
echo "MVN_PROJECT_VERSION=$MVN_PROJECT_VERSION" >> $GITHUB_ENV
mvn -DskipTests=true --no-transfer-progress clean package
- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: v${{ env.MVN_PROJECT_VERSION }}
release_name: Release v${{ env.MVN_PROJECT_VERSION }}
draft: false
prerelease: false
- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: target/hanaconnector.war
asset_name: hanaconnector.war
asset_content_type: application/war
138 changes: 69 additions & 69 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,69 +1,69 @@
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>io.rtdi.bigdata.connector</groupId>
<artifactId>hanaconnector</artifactId>
<version>0.9.8</version>
<packaging>war</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<io.rtdi.bigdata.connector.version>0.10.9</io.rtdi.bigdata.connector.version>
</properties>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>12</source>
<target>12</target>
<fork>true</fork>
</configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.1</version>
<configuration>
<warSourceDirectory>WebContent</warSourceDirectory>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>io.rtdi.bigdata.connector</groupId>
<artifactId>webappfoundation</artifactId>
<version>${io.rtdi.bigdata.connector.version}</version>
</dependency>
<dependency>
<groupId>io.rtdi.bigdata.connector</groupId>
<artifactId>pipelinekafkatcp</artifactId>
<version>${io.rtdi.bigdata.connector.version}</version>
</dependency>
<dependency>
<groupId>io.rtdi.bigdata.connector</groupId>
<artifactId>pipelinetest</artifactId>
<version>${io.rtdi.bigdata.connector.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sap.cloud.db.jdbc</groupId>
<artifactId>ngdbc</artifactId>
<version>2.7.7</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>io.rtdi.bigdata.connector</groupId>
<artifactId>hanaconnector</artifactId>
<version>0.9.11</version>
<packaging>war</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<io.rtdi.bigdata.connector.version>0.10.16</io.rtdi.bigdata.connector.version>
</properties>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>12</source>
<target>12</target>
<fork>true</fork>
</configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.1</version>
<configuration>
<warSourceDirectory>WebContent</warSourceDirectory>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>io.rtdi.bigdata.connector</groupId>
<artifactId>webappfoundation</artifactId>
<version>${io.rtdi.bigdata.connector.version}</version>
</dependency>
<dependency>
<groupId>io.rtdi.bigdata.connector</groupId>
<artifactId>pipelinekafkatcp</artifactId>
<version>${io.rtdi.bigdata.connector.version}</version>
</dependency>
<dependency>
<groupId>io.rtdi.bigdata.connector</groupId>
<artifactId>pipelinetest</artifactId>
<version>${io.rtdi.bigdata.connector.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sap.cloud.db.jdbc</groupId>
<artifactId>ngdbc</artifactId>
<version>2.11.14</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
Loading

0 comments on commit f80246a

Please sign in to comment.