Skip to content

Commit

Permalink
ci: use dev and SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
moabu committed Mar 2, 2023
1 parent e96b8f3 commit d85ded4
Show file tree
Hide file tree
Showing 23 changed files with 45 additions and 45 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/releaseplease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ on:
node_release_as:
description: 'Release version for the admin ui'
required: true
default: '1.0.8'
default: '1.0.9'
java_release_as:
description: 'Release version for the java projects casa'
required: true
default: '5.0.0-8'
default: '5.0.0-9'
docker_release_as:
description: 'Release version for the docker images docker-*'
required: true
default: '1.0.8-1'
default: '1.0.9-1'
python_release_as:
description: 'Release version for the python projects'
required: true
default: '1.0.8'
default: '1.0.9'
mega_release_as:
description: 'Mega release version'
required: true
default: '5.0.0-8'
default: '5.0.0-9'
jobs:
release-java-pr:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion admin-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gluu-admin-ui",
"version": "1.0.8",
"version": "1.0.9-dev",
"description": "UI to administer the jans-sever features",
"keywords": [
"jans-server",
Expand Down
2 changes: 1 addition & 1 deletion casa/app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.gluu</groupId>
<artifactId>casa-base</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion casa/config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.gluu</groupId>
<artifactId>casa-base</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions casa/plugins/bioid/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.gluu.casa.plugins</groupId>
<artifactId>${plugin.id}</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down Expand Up @@ -69,7 +69,7 @@
<dependency>
<groupId>org.gluu</groupId>
<artifactId>casa-shared</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions casa/plugins/cert-authn/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

<groupId>org.gluu.casa.plugins</groupId>
<artifactId>${plugin.id}</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<plugin.id>cert-authn</plugin.id>
<plugin.version>5.0.0-8</plugin.version>
<jans.version>1.0.8</jans.version>
<jans.version>1.0.9-SNAPSHOT</jans.version>
</properties>

<repositories>
Expand Down
4 changes: 2 additions & 2 deletions casa/plugins/client-authorizations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.gluu.casa.plugins</groupId>
<artifactId>${plugin.id}</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down Expand Up @@ -70,7 +70,7 @@
<dependency>
<groupId>org.gluu</groupId>
<artifactId>casa-shared</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions casa/plugins/custom-branding/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

<groupId>org.gluu.casa.plugins</groupId>
<artifactId>${plugin.id}</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<plugin.id>custom-branding</plugin.id>
<plugin.version>5.0.0-8</plugin.version>
<jans.version>1.0.8</jans.version>
<jans.version>1.0.9-SNAPSHOT</jans.version>
</properties>

<repositories>
Expand Down Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>org.gluu</groupId>
<artifactId>casa-shared</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions casa/plugins/inwebo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.gluu.casa.plugins</groupId>
<artifactId>${plugin.id}</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down Expand Up @@ -98,7 +98,7 @@
<dependency>
<groupId>org.gluu</groupId>
<artifactId>casa-shared</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions casa/plugins/samples/authentication-script-properties/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>co.acme</groupId>
<artifactId>${plugin.id}</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down Expand Up @@ -64,7 +64,7 @@
<dependency>
<groupId>org.gluu</groupId>
<artifactId>casa-shared</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions casa/plugins/samples/clients-management/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>co.acme</groupId>
<artifactId>${plugin.id}</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down Expand Up @@ -65,7 +65,7 @@
<dependency>
<groupId>org.gluu</groupId>
<artifactId>casa-shared</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions casa/plugins/samples/helloworld/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>co.acme</groupId>
<artifactId>${plugin.id}</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down Expand Up @@ -69,7 +69,7 @@
<dependency>
<groupId>org.gluu</groupId>
<artifactId>casa-shared</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- Add other required dependencies here. All their classes will be shipped in your plugin's fat jar -->
Expand Down
4 changes: 2 additions & 2 deletions casa/plugins/samples/sample-cred-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.gluu.casa.plugins</groupId>
<artifactId>${plugin.id}</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down Expand Up @@ -64,7 +64,7 @@
<dependency>
<groupId>org.gluu</groupId>
<artifactId>casa-shared</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions casa/plugins/strong-authn-settings/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

<groupId>org.gluu.casa.plugins</groupId>
<artifactId>${plugin.id}</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<plugin.id>strong-authn-settings</plugin.id>
<plugin.version>5.0.0-8</plugin.version>
<jans.version>1.0.8</jans.version>
<jans.version>1.0.9-SNAPSHOT</jans.version>
</properties>

<repositories>
Expand Down
2 changes: 1 addition & 1 deletion casa/plugins/stytch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.gluu.casa.plugins</groupId>
<artifactId>${plugin.id}</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down
6 changes: 3 additions & 3 deletions casa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.gluu</groupId>
<artifactId>casa-base</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>

<packaging>pom</packaging>
<url>http://www.gluu.org</url>
Expand All @@ -21,8 +21,8 @@
<maven.min-version>3.6.3</maven.min-version>
<weld.version>4.0.3.Final</weld.version>
<pf4j.version>3.8.0</pf4j.version>
<casa.version>5.0.0-8</casa.version>
<jans.version>1.0.8</jans.version>
<casa.version>5.0.0-SNAPSHOT</casa.version>
<jans.version>1.0.9-SNAPSHOT</jans.version>
<log4j.version>2.19.0</log4j.version>
<jackson.version>2.14.1</jackson.version>
<zk.version>9.6.0.2-jakarta</zk.version>
Expand Down
2 changes: 1 addition & 1 deletion casa/shared/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.gluu</groupId>
<artifactId>casa-base</artifactId>
<version>5.0.0-8</version>
<version>5.0.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions docker-admin-ui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ ENV CN_WAIT_MAX_TIME=300 \
LABEL name="gluufederation/admin-ui" \
maintainer="Gluu Inc. <support@gluu.org>" \
vendor="Gluu Federation" \
version="1.0.8" \
release="1" \
version="1.0.9" \
release="dev" \
summary="Gluu Admin UI" \
description=""

Expand Down
2 changes: 1 addition & 1 deletion docker-admin-ui/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GLUU_VERSION?=1.0.8
GLUU_VERSION?=1.0.9
IMAGE_NAME=gluufederation/admin-ui
UNSTABLE_VERSION?=dev

Expand Down
6 changes: 3 additions & 3 deletions docker-casa/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ EXPOSE 8080
# Casa
# ====

ENV GLUU_VERSION=5.0.0-8
ENV GLUU_VERSION=5.0.0-SNAPSHOT
ENV GLUU_BUILD_DATE='2023-03-02 09:33'
ENV GLUU_SOURCE_URL=https://jenkins.gluu.org/maven/org/gluu/casa/${GLUU_VERSION}/casa-${GLUU_VERSION}.war

Expand Down Expand Up @@ -206,7 +206,7 @@ ENV CN_MAX_RAM_PERCENTAGE=75.0 \
CN_GOOGLE_SECRET_NAME_PREFIX=jans \
GLUU_CASA_ADMIN_LOCK_FILE=/opt/jans/jetty/casa/resources/.administrable \
CN_PROMETHEUS_PORT="" \
CN_VERSION=1.0.8
CN_VERSION=1.0.9-SNAPSHOT

# ==========
# misc stuff
Expand All @@ -216,7 +216,7 @@ LABEL name="gluufederation/casa" \
maintainer="Gluu Inc. <support@gluu.org>" \
vendor="Gluu Federation" \
version="5.0.0" \
release="8" \
release="dev" \
summary="Gluu Casa" \
description="Self-service portal for people to manage their account security preferences in the Gluu Server, like 2FA"

Expand Down
2 changes: 1 addition & 1 deletion flex-cn-setup/pygluu/kubernetes/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
"""

__version__ = "1.0.8"
__version__ = "1.0.9-dev"
6 changes: 3 additions & 3 deletions flex-linux-setup/flex_linux_setup/flex_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,10 @@ def download_jans_install_py(setup_branch):
"SETUP_BRANCH": argsp.jans_setup_branch,
"FLEX_BRANCH": argsp.flex_branch,
"JANS_BRANCH": argsp.jans_branch,
"JANS_APP_VERSION": "1.0.8",
"JANS_BUILD": "",
"JANS_APP_VERSION": "1.0.9",
"JANS_BUILD": "-SNAPSHOT",
"NODE_VERSION": "v14.18.2",
"CASA_VERSION": "5.0.0-8",
"CASA_VERSION": "5.0.0-SNAPSHOT",
"NODE_MODULES_BRANCH": argsp.node_modules_branch or argsp.flex_branch
}

Expand Down
2 changes: 1 addition & 1 deletion flex-linux-setup/flex_linux_setup/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.0.8"
__version__ = "1.0.9-dev"

0 comments on commit d85ded4

Please sign in to comment.