Compare commits
No commits in common. "main" and "1.0.0" have entirely different histories.
4 changed files with 2 additions and 124 deletions
|
|
@ -1,76 +0,0 @@
|
||||||
# This file is a template, and might need editing before it works on your project.
|
|
||||||
# To contribute improvements to CI/CD templates, please follow the Development guide at:
|
|
||||||
# https://docs.gitlab.com/ee/development/cicd/templates.html
|
|
||||||
# This specific template is located at:
|
|
||||||
# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Maven.gitlab-ci.yml
|
|
||||||
|
|
||||||
# Build JAVA applications using Apache Maven (http://maven.apache.org)
|
|
||||||
# For docker image tags see https://hub.docker.com/_/maven/
|
|
||||||
#
|
|
||||||
# For general lifecycle information see https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
|
|
||||||
|
|
||||||
# This template will build and test your projects
|
|
||||||
# * Caches downloaded dependencies and plugins between invocation.
|
|
||||||
# * Verify but don't deploy merge requests.
|
|
||||||
# * Deploy built artifacts from master branch only.
|
|
||||||
|
|
||||||
variables:
|
|
||||||
# This will suppress any download for dependencies and plugins or upload messages which would clutter the console log.
|
|
||||||
# `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
|
|
||||||
MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
|
|
||||||
# As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
|
|
||||||
# when running from the command line.
|
|
||||||
# `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins.
|
|
||||||
MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
|
|
||||||
|
|
||||||
# This template uses jdk8 for verifying and deploying images
|
|
||||||
image: maven:3.8.5-openjdk-17
|
|
||||||
|
|
||||||
# Cache downloaded dependencies and plugins between builds.
|
|
||||||
# To keep cache across branches add 'key: "$CI_JOB_NAME"'
|
|
||||||
cache:
|
|
||||||
paths:
|
|
||||||
- .m2/repository
|
|
||||||
|
|
||||||
# For merge requests do not `deploy` but only run `verify`.
|
|
||||||
# See https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
|
|
||||||
.build: &verify
|
|
||||||
stage: test
|
|
||||||
script:
|
|
||||||
- 'mvn $MAVEN_CLI_OPTS verify'
|
|
||||||
except:
|
|
||||||
variables:
|
|
||||||
- $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
|
||||||
stage: deploy
|
|
||||||
script:
|
|
||||||
- 'mvn $MAVEN_CLI_OPTS deploy -s ci_settings.xml'
|
|
||||||
except:
|
|
||||||
variables:
|
|
||||||
- $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
|
||||||
|
|
||||||
# Verify merge requests using JDK8
|
|
||||||
build:
|
|
||||||
<<: *verify
|
|
||||||
|
|
||||||
# To deploy packages from CI, create a ci_settings.xml file
|
|
||||||
# For deploying packages to GitLab's Maven Repository: See https://docs.gitlab.com/ee/user/packages/maven_repository/index.html#create-maven-packages-with-gitlab-cicd for more details.
|
|
||||||
# Please note: The GitLab Maven Repository is currently only available in GitLab Premium / Ultimate.
|
|
||||||
# For `master` branch run `mvn deploy` automatically.
|
|
||||||
upload artifacts:
|
|
||||||
stage: deploy
|
|
||||||
script:
|
|
||||||
- if [ ! -f ci_settings.xml ];
|
|
||||||
then echo "CI settings missing\! If deploying to GitLab Maven Repository, please see https://docs.gitlab.com/ee/user/packages/maven_repository/index.html#create-maven-packages-with-gitlab-cicd for instructions.";
|
|
||||||
fi
|
|
||||||
- eval $(ssh-agent -s)
|
|
||||||
- ssh-add <(echo "$GITLAB_RUNNER_KEY")
|
|
||||||
- mkdir -p ~/.ssh
|
|
||||||
- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
|
|
||||||
- git config --global user.email "gitlab@c4181.xyz"
|
|
||||||
- git config --global user.name "gitlab_runner"
|
|
||||||
- git checkout -B "$CI_COMMIT_BRANCH"
|
|
||||||
- 'mvn -B release:prepare -s ci_settings.xml'
|
|
||||||
- 'mvn -B release:perform -s ci_settings.xml'
|
|
||||||
only:
|
|
||||||
variables:
|
|
||||||
- $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
|
|
||||||
<servers>
|
|
||||||
<server>
|
|
||||||
<id>gitlab-maven</id>
|
|
||||||
<configuration>
|
|
||||||
<httpHeaders>
|
|
||||||
<property>
|
|
||||||
<name>Job-Token</name>
|
|
||||||
<value>${CI_JOB_TOKEN}</value>
|
|
||||||
</property>
|
|
||||||
</httpHeaders>
|
|
||||||
</configuration>
|
|
||||||
</server>
|
|
||||||
</servers>
|
|
||||||
</settings>
|
|
||||||
32
pom.xml
32
pom.xml
|
|
@ -4,10 +4,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.c4181</groupId>
|
<groupId>com.c4181</groupId>
|
||||||
<artifactId>email2telegram-message-service</artifactId>
|
<artifactId>email2telegram-message-service</artifactId>
|
||||||
<version>1.0.2-SNAPSHOT</version>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
<scm>
|
|
||||||
<connection>scm:git:git://192.168.1.198/c4181/email2telegram-message-service.git</connection>
|
|
||||||
</scm>
|
|
||||||
<properties>
|
<properties>
|
||||||
<compiler-plugin.version>3.8.1</compiler-plugin.version>
|
<compiler-plugin.version>3.8.1</compiler-plugin.version>
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
<maven.compiler.release>17</maven.compiler.release>
|
||||||
|
|
@ -100,14 +97,6 @@
|
||||||
</systemPropertyVariables>
|
</systemPropertyVariables>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-release-plugin</artifactId>
|
|
||||||
<version>2.5.1</version>
|
|
||||||
<configuration>
|
|
||||||
<scmCommentPrefix>[skip ci] [maven-release-plugin]</scmCommentPrefix>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-failsafe-plugin</artifactId>
|
<artifactId>maven-failsafe-plugin</artifactId>
|
||||||
<version>${surefire-plugin.version}</version>
|
<version>${surefire-plugin.version}</version>
|
||||||
|
|
@ -139,25 +128,8 @@
|
||||||
</activation>
|
</activation>
|
||||||
<properties>
|
<properties>
|
||||||
<skipITs>false</skipITs>
|
<skipITs>false</skipITs>
|
||||||
<quarkus.package.type>native</quarkus.package.type>
|
<quarkus.package.type>uber-jar</quarkus.package.type>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>gitlab-maven</id>
|
|
||||||
<url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
<distributionManagement>
|
|
||||||
<repository>
|
|
||||||
<id>gitlab-maven</id>
|
|
||||||
<url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
|
|
||||||
</repository>
|
|
||||||
<snapshotRepository>
|
|
||||||
<id>gitlab-maven</id>
|
|
||||||
<url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
|
|
||||||
</snapshotRepository>
|
|
||||||
</distributionManagement>
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
package com.c4181.model;
|
package com.c4181.model;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import io.quarkus.runtime.annotations.RegisterForReflection;
|
|
||||||
|
|
||||||
@RegisterForReflection
|
|
||||||
public class SendMessage {
|
public class SendMessage {
|
||||||
|
|
||||||
@JsonProperty("chat_id")
|
@JsonProperty("chat_id")
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue