Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ jobs:
git config --global user.email "envoy-bot@users.noreply.github.com"
git config --global user.name "envoy-bot"
mvn -B -s .circleci/settings.xml release:prepare -Darguments="-s .circleci/settings.xml" -DreleaseVersion=$RELEASE -DdevelopmentVersion=$NEXT -DscmCommentPrefix="release: "
mvn -B -s .circleci/settings.xml release:perform -Darguments="-s .circleci/settings.xml -pl '!test'"
else
mvn -B -s .circleci/settings.xml deploy
mvn -B -s .circleci/settings.xml deploy -pl '!test'
fi
elif [[ -n "${DEPLOY_BRANCH}" ]]; then
echo $GPG_KEY | base64 --decode > signing-key
Expand Down
5 changes: 3 additions & 2 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@

<parent>
<artifactId>java-control-plane</artifactId>
<groupId>io.envoyproxy.controlplane</groupId>
<version>1.0.52-SNAPSHOT</version>
<groupId>io.github.ovadiagal</groupId>
<version>0.0.1-test</version>
</parent>

<artifactId>api</artifactId>
<name>api</name>

<properties>
<checkstyle.skip>true</checkstyle.skip>
Expand Down
9 changes: 5 additions & 4 deletions cache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@

<parent>
<artifactId>java-control-plane</artifactId>
<groupId>io.envoyproxy.controlplane</groupId>
<version>1.0.52-SNAPSHOT</version>
<groupId>io.github.ovadiagal</groupId>
<version>0.0.1-test</version>
</parent>

<artifactId>cache</artifactId>
<name>cache</name>

<dependencies>
<dependency>
Expand Down Expand Up @@ -37,9 +38,9 @@
</dependency>

<dependency>
<groupId>io.envoyproxy.controlplane</groupId>
<groupId>io.github.ovadiagal</groupId>
<artifactId>api</artifactId>
<version>1.0.52-SNAPSHOT</version>
<version>0.0.1-test</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<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.envoyproxy.controlplane</groupId>
<groupId>io.github.ovadiagal</groupId>
<artifactId>java-control-plane</artifactId>
<version>1.0.52-SNAPSHOT</version>
<version>0.0.1-test</version>
<packaging>pom</packaging>

<modules>
Expand Down
9 changes: 5 additions & 4 deletions server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@

<parent>
<artifactId>java-control-plane</artifactId>
<groupId>io.envoyproxy.controlplane</groupId>
<version>1.0.52-SNAPSHOT</version>
<groupId>io.github.ovadiagal</groupId>
<version>0.0.1-test</version>
</parent>

<artifactId>server</artifactId>
<name>server</name>

<dependencies>
<dependency>
<groupId>io.envoyproxy.controlplane</groupId>
<groupId>io.github.ovadiagal</groupId>
<artifactId>cache</artifactId>
<version>1.0.52-SNAPSHOT</version>
<version>0.0.1-test</version>
</dependency>

<dependency>
Expand Down
13 changes: 6 additions & 7 deletions test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,27 @@

<parent>
<artifactId>java-control-plane</artifactId>
<groupId>io.envoyproxy.controlplane</groupId>
<version>1.0.52-SNAPSHOT</version>
<groupId>io.github.ovadiagal</groupId>
<version>0.0.1-test</version>
</parent>

<artifactId>test</artifactId>

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</properties>

<dependencies>
<dependency>
<groupId>io.envoyproxy.controlplane</groupId>
<groupId>io.github.ovadiagal</groupId>
<artifactId>cache</artifactId>
<version>1.0.52-SNAPSHOT</version>
<version>0.0.1-test</version>
</dependency>

<dependency>
<groupId>io.envoyproxy.controlplane</groupId>
<groupId>io.github.ovadiagal</groupId>
<artifactId>server</artifactId>
<version>1.0.52-SNAPSHOT</version>
<version>0.0.1-test</version>
</dependency>
</dependencies>

Expand Down
Loading