Skip to content

Resync POM with changes made to main branch #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pandrex247 wants to merge 2 commits into
base: Payara7
Choose a base branch
from
Open

Resync POM with changes made to main branch #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4472f66
Resync POM with changes made to main branch, and update some dependen…
Pandrex247 Feb 26, 2025
049dd7c
Update Jenkinsfile
abdulrahim458 Mar 21, 2025
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
12 changes: 0 additions & 12 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,6 @@ pipeline {
}
stages {

stage('Checkout Payara7') {
steps {
script {
checkout changelog: false, poll: true, scm: [$class: 'GitSCM',
branches: [[name: "Payara7"]],
doGenerateSubmoduleConfigurations: false,
extensions: [],
submoduleCfg: [],
userRemoteConfigs: [[credentialsId: 'payara-devops-github-personal-access-token-as-username-password', url:"https://github.com/payara/monitoring-console.git"]]]
}
}
}
stage('Build') {
steps {
script {
Expand Down
1 change: 1 addition & 0 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
</parent>

<artifactId>monitoring-console-api</artifactId>
<version>3.0.0-SNAPSHOT</version>
<name>monitoring-console-api</name>

<description>
Expand Down
28 changes: 6 additions & 22 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
<version.maven.bundle.plugin>5.1.9</version.maven.bundle.plugin>
<version.maven.merge.plugin>1.2.0</version.maven.merge.plugin>

<version.jakarta.jakartaee-api>11.0.0-M2</version.jakarta.jakartaee-api>
<version.jakarta.servlet-api>6.1.0-M2</version.jakarta.servlet-api>
<version.jakarta.jakartaee-api>11.0.0-M5</version.jakarta.jakartaee-api>
<version.jakarta.servlet-api>6.1.0</version.jakarta.servlet-api>
<version.jakarta.json.bind-api>3.0.1</version.jakarta.json.bind-api>
<version.jakarta.json-api>2.1.3</version.jakarta.json-api>
<version.jakarta.ws.rs-api>4.0.0</version.jakarta.ws.rs-api>
Expand Down Expand Up @@ -110,12 +110,12 @@

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<id>payara-nexus-enterprise-snapshots</id>
<url>https://nexus.dev.payara.fish/repository/payara-enterprise-snapshots-private</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<id>payara-nexus-enterprise-artifacts</id>
<url>https://nexus.dev.payara.fish/repository/payara-enterprise-artifacts-private</url>
</repository>
</distributionManagement>

Expand Down Expand Up @@ -225,11 +225,6 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${version.maven.javadoc.plugin}</version>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${version.maven.nexus.staging.plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Expand Down Expand Up @@ -304,17 +299,6 @@
</executions>
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion process/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
</parent>

<artifactId>monitoring-console-process</artifactId>
<version>3.0.0-SNAPSHOT</version>
<name>monitoring-console-process</name>

<description>
Expand Down Expand Up @@ -95,7 +96,7 @@
<dependency>
<groupId>fish.payara.monitoring-console</groupId>
<artifactId>monitoring-console-api</artifactId>
<version>${project.version}</version>
<version>3.0.0-SNAPSHOT</version>
</dependency>

<!-- The below dependencies are expected to be provided by the monitored application -->
Expand Down
13 changes: 7 additions & 6 deletions webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
</parent>

<artifactId>monitoring-console-webapp</artifactId>
<version>3.0.0-SNAPSHOT</version>

<packaging>war</packaging>

Expand All @@ -66,38 +67,38 @@
<dependency>
<groupId>fish.payara.monitoring-console</groupId>
<artifactId>monitoring-console-process</artifactId>
<version>${project.version}</version>
<version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
<version>6.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-api</artifactId>
<version>2.0.0</version>
<version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
<version>2.0.0</version>
<version>2.1.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.0.0</version>
<version>4.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>10.0.0</version>
<version>11.0.0-M5</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down