Skip to content
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

FISH-6607: Introduce core-parent #6246

Merged
merged 34 commits into from
May 23, 2023
Merged

FISH-6607: Introduce core-parent #6246

Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
406fefb
FISH-6607: Move core module under core aggregator
pdudits Mar 23, 2023
d570565
FISH-6607: Introduce core-parent to core modules
pdudits Mar 23, 2023
f0c8a88
FISH-6607: Move test-utils to core packages
pdudits Mar 23, 2023
d2f7e22
FISH-6607: Add opentelemetry BOM to core
pdudits Mar 23, 2023
8ae06c6
FISH-6607: Add trilead-ssh2 to core
pdudits Mar 23, 2023
5c95102
FISH-6607: Add j-interop to core
pdudits Mar 23, 2023
cc60e60
FISH-6607: Add cluster-common to core
pdudits Mar 23, 2023
89828be
FISH-6607: add cluster-ssh to core
pdudits Mar 23, 2023
52a89bd
FISH-6607: Add opentelemetry-repackaged to core
pdudits Mar 23, 2023
b8e3e9b
FISH-6607: Add cluster-admin to core
pdudits Mar 23, 2023
ff9030b
FISH-6607: Depend on managed versions of core modules
pdudits Mar 23, 2023
969dcfc
FISH-6607: Drop core designation from metro-xmlsec-repackaged
pdudits Mar 23, 2023
f01e19c
FISH-6607: Fix references of payara-api to use managed version
pdudits Mar 23, 2023
8879e28
FISH-6607: Fix BuildExtras profile
pdudits Mar 27, 2023
a5190f9
FISH-6607: Add server-mgmt to core
pdudits Mar 28, 2023
b5f89fc
FISH-6607: Add cluster-cli to core
pdudits Mar 28, 2023
a5397c5
FISH-6607: Add gf-admingui-connector to core
pdudits Mar 29, 2023
e9012b9
FISH-6607: Add console-plugin-service to core
pdudits Mar 29, 2023
278ec5d
FISH-6607: Remove dependency of console-common on rest-service
pdudits Mar 29, 2023
add7eea
FISH-6607: Add rest-client to core
pdudits Mar 29, 2023
91c3cce
FISH-6607: Add deployment client to core
pdudits Mar 29, 2023
9ebf40d
FISH-6607: Add faces-compat to core
pdudits Mar 29, 2023
c7281cd
FISH-6607: Add console-common to core
pdudits Mar 29, 2023
b93b560
FISH-6607: Make certificate management depend on core only
pdudits Mar 29, 2023
1e1dacc
Sync version changes from master
pdudits Apr 21, 2023
95089bb
Merge remote-tracking branch 'origin/master' into fish-6607
pdudits Apr 21, 2023
66d59d1
Don't use payara.core.version expression in dependency management
pdudits Apr 21, 2023
3348e0a
Undo core version change
pdudits Apr 21, 2023
d61caf6
Drop SCM tag in core
pdudits Apr 21, 2023
c5a01ca
Fix versions of certificate-management
pdudits Apr 24, 2023
de4d0c8
Update versions from master
pdudits May 11, 2023
6e3081e
Merge remote-tracking branch 'origin/master'
pdudits May 11, 2023
f0956b9
Merge remote-tracking branch 'origin/master' into fish-6607
pdudits May 16, 2023
c6d3489
Sync changes from master, update versions
pdudits May 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 6 additions & 4 deletions api/payara-api/pom.xml
View file
Open in desktop
pdudits marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>fish.payara.api</groupId>
<artifactId>api-parent</artifactId>
<groupId>fish.payara.server.core</groupId>
<artifactId>core-parent</artifactId>
<version>6.2023.5-SNAPSHOT</version>
<relativePath>../../core/core-parent</relativePath>
</parent>
<groupId>fish.payara.api</groupId>
<artifactId>payara-api</artifactId>
<name>Payara-API</name>
<description>Artefact that exposes public API of Payara Application Server</description>
Expand Down Expand Up @@ -119,8 +121,8 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>fish.payara.api</groupId>
<artifactId>payara-bom</artifactId>
<groupId>fish.payara.server.core</groupId>
<artifactId>core-bom</artifactId>
<type>pom</type>
<version>${project.version}</version>
<scope>import</scope>
Expand Down
37 changes: 7 additions & 30 deletions api/payara-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,13 @@
</dependency>

<dependency>
<groupId>fish.payara.api</groupId>
<artifactId>payara-api</artifactId>
<version>${project.version}</version>
<groupId>fish.payara.server.core</groupId>
<artifactId>core-bom</artifactId>
<version>${payara.core.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>fish.payara.security.connectors</groupId>
<artifactId>security-connectors-api</artifactId>
<version>${payara.security-connectors.version}</version>
</dependency>

<dependency>
<groupId>fish.payara.server.appclient</groupId>
Expand Down Expand Up @@ -491,20 +488,6 @@
<version>${jakarta.jws-api.version}</version>
</dependency>

<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>${opentelemetry.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom-alpha</artifactId>
<version>${opentelemetry.alpha.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- packaged components -->
<dependency>
<groupId>io.opentelemetry</groupId>
Expand Down Expand Up @@ -893,14 +876,6 @@
</dependency>

<!-- Other libraries -->
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-bom</artifactId>
<version>${hk2.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>

<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
Expand Down Expand Up @@ -954,8 +929,10 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.3.0</version>
<configuration>
<flattenMode>bom</flattenMode>
<flattenDependencyMode>all</flattenDependencyMode>
</configuration>
</plugin>
</plugins>
Expand Down
Loading