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

Jump to bottom

PAYARA-4120 Upgraded javax.annotation to jakarta.annotation #4208

Merged
merged 4 commits into from
Sep 11, 2019
Merged

PAYARA-4120 Upgraded javax.annotation to jakarta.annotation #4208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0861f66
PAYARA-4120 Upgraded javax.annotation to jakarta.annotation
Sep 9, 2019
ec5148f
PAYARA-4120 Fixed ClassPath entry in appserver-cli manifest
Sep 11, 2019
d585d04
PAYARA-4120 Refactored DirectoryClassLoader
Sep 11, 2019
3b04aea
PAYARA-4120 Fixed payara-minimal pom
Sep 11, 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
10 changes: 5 additions & 5 deletions appserver/admin/cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</parent>
<artifactId>appserver-cli</artifactId>
<packaging>glassfish-jar</packaging>

<name>App Server CLI Skinning Class</name>
<description>App Server CLI Skinning Class</description>

Expand All @@ -65,7 +65,7 @@
</roles>
</developer>
</developers>

<build>
<plugins>
<plugin>
Expand All @@ -75,15 +75,15 @@
<archive>
<manifest>
<mainClass>org.glassfish.admin.cli.AsadminMain</mainClass>
<addClasspath>true</addClasspath>
<classpathPrefix>../../modules</classpathPrefix>
</manifest>
<manifestEntries>
<Class-Path>../../modules/admin-cli.jar ../../modules/jaxb-osgi.jar ../../modules/istack-commons-runtime.jar jna.jar jline-terminal-jna.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>fish.payara.server.internal.admin</groupId>
Expand Down
6 changes: 3 additions & 3 deletions appserver/appclient/client/acc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,8 +364,8 @@
</dependency>

<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -409,7 +409,7 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>

<!--
The next two mail-related dependencies allow mail session look-up
and use from clients.
Expand Down
6 changes: 3 additions & 3 deletions appserver/deployment/dol/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions appserver/extras/javaee/manifest-jar/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Class-Path>../modules/jakarta.servlet-api.jar ../modules/javax.annotation-api.jar ../modules/jakarta.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/javax.enterprise.deploy-api.jar ../modules/javax.management.j2ee-api.jar ../modules/jakarta.resource-api.jar ../modules/jakarta.security.auth.message-api.jar ../modules/jakarta.security.jacc-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/jakarta.xml.bind-api.jar ../modules/webservices-api-osgi.jar ../modules/javax.xml.rpc-api.jar ../modules/javax.xml.registry-api.jar ../modules/jakarta.mail.jar ../modules/jakarta.faces.jar ../modules/javax.servlet.jsp-api.jar ../modules/javax.el.jar ../modules/javax.servlet.jsp.jstl-api.jar ../modules/jakarta.persistence.jar ../modules/jakarta.jms-api.jar ../modules/hibernate-validator.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/jakarta.ws.rs-api.jar ../modules/jakarta.json.jar ../modules/javax.websocket-api.jar ../modules/javax.enterprise.concurrent-api.jar ../modules/javax.batch-api.jar</Class-Path>
<GlassFish-ServerExcluded>true</GlassFish-ServerExcluded>
</manifestEntries>
<manifestEntries>
<Class-Path>../modules/jakarta.servlet-api.jar ../modules/jakarta.annotation-api.jar ../modules/jakarta.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/javax.enterprise.deploy-api.jar ../modules/javax.management.j2ee-api.jar ../modules/jakarta.resource-api.jar ../modules/jakarta.security.auth.message-api.jar ../modules/jakarta.security.jacc-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/jakarta.xml.bind-api.jar ../modules/webservices-api-osgi.jar ../modules/javax.xml.rpc-api.jar ../modules/javax.xml.registry-api.jar ../modules/jakarta.mail.jar ../modules/jakarta.faces.jar ../modules/javax.servlet.jsp-api.jar ../modules/javax.el.jar ../modules/javax.servlet.jsp.jstl-api.jar ../modules/jakarta.persistence.jar ../modules/jakarta.jms-api.jar ../modules/hibernate-validator.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/jakarta.ws.rs-api.jar ../modules/jakarta.json.jar ../modules/javax.websocket-api.jar ../modules/javax.enterprise.concurrent-api.jar ../modules/javax.batch-api.jar</Class-Path>
<GlassFish-ServerExcluded>true</GlassFish-ServerExcluded>
</manifestEntries>
</archive>
</configuration>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions appserver/packager/glassfish-common-web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,8 @@
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
Expand Down
12 changes: 6 additions & 6 deletions appserver/payara-appserver-modules/microprofile/config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
-->
<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>

<parent>
<groupId>fish.payara.server.internal.payara-appserver-modules</groupId>
<artifactId>microprofile</artifactId>
Expand All @@ -52,7 +52,7 @@
<packaging>glassfish-jar</packaging>
<name>Microprofile-Config</name>
<description>Implementation of Microprofile Configuration API</description>

<dependencies>
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
Expand All @@ -70,12 +70,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
</dependency>
</dependencies>
</project>
20 changes: 10 additions & 10 deletions appserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,14 +468,14 @@
<!-- Common Annotations -->
<spec>
<artifact>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotation-api.version}</version>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotation-api.version}</version>
</artifact>
<nonFinal>false</nonFinal>
<jarType>api</jarType>
<specVersion>${javax.annotation-api.version}</specVersion>
<specImplVersion>${javax.annotation-api.version}</specImplVersion>
<specVersion>${jakarta.annotation-api.version}</specVersion>
<specImplVersion>${jakarta.annotation-api.version}</specImplVersion>
<apiPackage>javax.annotation</apiPackage>
</spec>

Expand Down Expand Up @@ -671,17 +671,17 @@
<artifactId>javax.inject</artifactId>
<version>${javax.inject.version}</version>
</dependency>
<dependency>
<dependency>
<groupId>jakarta.resource</groupId>
<artifactId>jakarta.resource-api</artifactId>
<version>${jakarta.resource-api.version}</version>
</dependency>
<artifactId>jakarta.resource-api</artifactId>
<version>${jakarta.resource-api.version}</version>
</dependency>
<dependency>
<groupId>javax.enterprise.deploy</groupId>
<artifactId>javax.enterprise.deploy-api</artifactId>
<version>${javax.enterprise.deploy-api.version}</version>
</dependency>

<!-- JSF - JavaServer Faces -->
<dependency>
<groupId>jakarta.faces</groupId>
Expand Down
30 changes: 11 additions & 19 deletions appserver/tests/payara-samples/samples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<artifactId>shrinkwrap-resolver-impl-maven-archive</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
Expand Down Expand Up @@ -128,7 +128,7 @@
</dependencies>

<profiles>

<!-- Helper profiles to set properties etc -->

<profile>
Expand Down Expand Up @@ -189,12 +189,12 @@
</plugins>
</build>
</profile>


<!-- Profiles for the application servers against which the samples are run -->

<profile>
<!--
<!--
This profile will install a Payara server and start up the server per sample. Useful for CI servers.
The Payara version that's used can be set via the payara.container.version property.

Expand Down Expand Up @@ -256,13 +256,6 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.1</version>
</dependency>
</dependencies>
<environmentVariables>
<GLASSFISH_HOME>${session.executionRootDirectory}/target/${payara.directory.name}</GLASSFISH_HOME>
</environmentVariables>
Expand All @@ -282,13 +275,12 @@

<profile>
<id>payara-micro-managed</id>
<!--

<!--
This profile will install a Payara Micro and start up the server per sample. Useful for CI servers.
The Payara version that's used can be set via the payara.version property.

-->

<properties>
<skipJMS>true</skipJMS>
<skipJAXWS>true</skipJAXWS>
Expand Down Expand Up @@ -351,10 +343,10 @@

<profile>
<id>payara-server-remote</id>
<!--

<!--
This profile requires you to start up a Payara server outside of the build.

Each sample will then reuse this instance to run the tests.
Useful for development to avoid the server start up cost per sample.

Expand Down
Loading