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

AC-37 Split Payara 4 Containers from Payara 5 - (Payara5) #30

Merged
merged 5 commits into from
Nov 20, 2019
Merged

AC-37 Split Payara 4 Containers from Payara 5 - (Payara5) #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
685cd43
WIP
Pandrex247 Oct 17, 2019
401c3b3
Unset enableDerby property
Pandrex247 Oct 18, 2019
aa410af
Add Client EE7 back in
Pandrex247 Oct 24, 2019
a37fd87
merge conflicts
Pandrex247 Nov 20, 2019
802cab2
pom version conflict
Pandrex247 Nov 20, 2019
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
8 changes: 4 additions & 4 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ indent_size=4

[{*.mod,*.dtd,*.ent,*.elt}]
indent_style=space
indent_size=2
indent_size=4

[{*.jhm,*.xjb,*.rng,*.wsdl,*.fxml,*.plan,*.pom,*.xslt,*.jrxml,*.ant,*.svg,*.xul,*.xsl,*.xsd,*.tld,*.jnlp,*.wsdd,*.wadl,*.xml}]
indent_style=space
indent_size=2
indent_size=4

[{.babelrc,.stylelintrc,.eslintrc,*.bowerrc,*.jsb3,*.jsb2,*.json}]
indent_style=space
indent_size=2
indent_size=4

[{*.yml,*.yaml}]
indent_style=space
indent_size=2
indent_size=4

2 changes: 1 addition & 1 deletion integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<parent>
<artifactId>parent-payara-containers</artifactId>
<groupId>fish.payara.arquillian</groupId>
<version>1.3-SNAPSHOT</version>
<version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
35 changes: 17 additions & 18 deletions payara-client-ee7/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@

<groupId>fish.payara.arquillian</groupId>
<artifactId>payara-client-ee7</artifactId>
<version>1.3-SNAPSHOT</version>
<version>2.0-SNAPSHOT</version>
<name>Payara EE 7 client libs</name>

<properties>
<version.jersey>2.25.1.payara-p7</version.jersey>
<version.jersey>2.29.payara-p5</version.jersey>
</properties>

<dependencies>
Expand All @@ -73,8 +73,8 @@
</dependency>

<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-microprofile-rest-client</artifactId>
<groupId>org.glassfish.jersey.ext.microprofile</groupId>
<artifactId>jersey-mp-rest-client</artifactId>
<version>${version.jersey}</version>
</dependency>

Expand All @@ -96,13 +96,23 @@
<version>${version.jersey}</version>
</dependency>
</dependencies>


<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<repositories>
<repository>
<id>payara-patched-externals</id>
<name>Payara Patched Externals</name>
<url>https://raw.github.com/payara/Payara_PatchedProjects/master</url>
<!--<url>file:///opt/PayaraDev/Payara_PatchedProjects</url>-->
<releases>
<enabled>true</enabled>
</releases>
Expand All @@ -112,15 +122,4 @@
</repository>
</repositories>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

</project>
4 changes: 2 additions & 2 deletions payara-client-ee8/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@

<groupId>fish.payara.arquillian</groupId>
<artifactId>payara-client-ee8</artifactId>
<version>1.3-SNAPSHOT</version>
<version>2.0-SNAPSHOT</version>
<name>Payara EE 8 client libs</name>

<properties>
<version.jersey>2.29.payara-p3</version.jersey>
<version.jersey>2.29.payara-p5</version.jersey>
</properties>

<dependencies>
Expand Down
50 changes: 0 additions & 50 deletions payara-common/dependency-reduced-pom.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion payara-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<parent>
<groupId>fish.payara.arquillian</groupId>
<artifactId>parent-payara-containers</artifactId>
<version>1.3-SNAPSHOT</version>
<version>2.0-SNAPSHOT</version>
</parent>

<artifactId>payara-container-common</artifactId>
Expand Down
26 changes: 8 additions & 18 deletions payara-embedded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<parent>
<groupId>fish.payara.arquillian</groupId>
<artifactId>parent-payara-containers</artifactId>
<version>1.3-SNAPSHOT</version>
<version>2.0-SNAPSHOT</version>
</parent>

<artifactId>arquillian-payara-server-embedded</artifactId>
Expand Down Expand Up @@ -126,6 +126,13 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>fish.payara.extras</groupId>
<artifactId>payara-embedded-all</artifactId>
<version>${version.payara}</version>
<scope>provided</scope>
</dependency>

</dependencies>

<build>
Expand All @@ -137,22 +144,5 @@
</plugins>
</build>

<profiles>
<profile>
<id>payara-4</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>fish.payara.extras</groupId>
<artifactId>payara-embedded-all</artifactId>
<version>4.1.1.171.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>

</project>

30 changes: 3 additions & 27 deletions payara-managed/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<parent>
<groupId>fish.payara.arquillian</groupId>
<artifactId>parent-payara-containers</artifactId>
<version>1.3-SNAPSHOT</version>
<version>2.0-SNAPSHOT</version>
</parent>

<artifactId>arquillian-payara-server-managed</artifactId>
Expand Down Expand Up @@ -160,8 +160,8 @@
<configuration>
<artifactItems>
<artifactItem>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<groupId>fish.payara.distributions</groupId>
<artifactId>payara</artifactId>
<version>${version.payara}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}</outputDirectory>
Expand Down Expand Up @@ -193,28 +193,4 @@
</plugins>
</build>

<profiles>
<profile>
<id>payara-4</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<groupId>fish.payara.distributions</groupId>
<artifactId>payara</artifactId>
<version.payara>4.1.1.171.1</version.payara>
<glassfish.home>payara41</glassfish.home>
</properties>
</profile>
<profile>
<id>payara-5</id>
<properties>
<groupId>fish.payara.distributions</groupId>
<artifactId>payara</artifactId>
<version.payara>5.192</version.payara>
<glassfish.home>payara5</glassfish.home>
</properties>
</profile>
</profiles>

</project>
8 changes: 2 additions & 6 deletions payara-micro-deployer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,11 @@
<parent>
<artifactId>parent-payara-containers</artifactId>
<groupId>fish.payara.arquillian</groupId>
<version>1.3-SNAPSHOT</version>
<version>2.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>

<properties>
<version.payara.micro>5.193.1</version.payara.micro>
</properties>

<artifactId>payara-micro-deployer</artifactId>
<packaging>war</packaging>

Expand All @@ -66,7 +62,7 @@
<dependency>
<groupId>fish.payara.extras</groupId>
<artifactId>payara-micro</artifactId>
<version>${version.payara.micro}</version>
<version>${version.payara}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion payara-micro-remote/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<parent>
<artifactId>parent-payara-containers</artifactId>
<groupId>fish.payara.arquillian</groupId>
<version>1.3-SNAPSHOT</version>
<version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion payara-micro/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<parent>
<groupId>fish.payara.arquillian</groupId>
<artifactId>parent-payara-containers</artifactId>
<version>1.3-SNAPSHOT</version>
<version>2.0-SNAPSHOT</version>
</parent>

<artifactId>arquillian-payara-micro-managed</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion payara-remote/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<parent>
<groupId>fish.payara.arquillian</groupId>
<artifactId>parent-payara-containers</artifactId>
<version>1.3-SNAPSHOT</version>
<version>2.0-SNAPSHOT</version>
</parent>

<artifactId>arquillian-payara-server-remote</artifactId>
Expand Down
Loading