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

[3.0] Maven build - JPARS module Manifest generation - backport from master #1157

Merged
merged 2 commits into from May 26, 2021
Merged

[3.0] Maven build - JPARS module Manifest generation - backport from master #1157

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
b48e7e4
Maven build - JPARS module Manifest generation (#1139)
rfelcman May 25, 2021
fad29b7
Maven build - JPARS module Manifest generation
rfelcman May 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions jpa/org.eclipse.persistence.jpars/pom.xml
View file
Open in desktop
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -32,10 +32,10 @@
<properties>
<!--Properties used for test resources filtering/replacement-->
<!--DB connection properties-->
<DB_USER>${db.user}</DB_USER>
<DB_PWD>${db.pwd}</DB_PWD>
<DB_DRIVER>${db.driver}</DB_DRIVER>
<DB_URL>${db.url}</DB_URL>
<db_user>${db.user}</db_user>
<db_pwd>${db.pwd}</db_pwd>
<db_driver>${db.driver}</db_driver>
<db_url>${db.url}</db_url>

<test-skip-jpa-jpars>${skipTests}</test-skip-jpa-jpars>
</properties>
Expand Down
26 changes: 13 additions & 13 deletions jpa/org.eclipse.persistence.jpars/src/it/resources/META-INF/persistence.xml
View file
Open in desktop
@@ -1,6 +1,6 @@
<!--

Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -43,10 +43,10 @@
<property name="eclipselink.logging.level" value="INFO"/>
<property name="eclipselink.logging.level.jpars" value="FINEST"/>
<property name="eclipselink.logging.parameters" value="true"/>
<property name="jakarta.persistence.jdbc.url" value="@DB_URL@"/>
<property name="jakarta.persistence.jdbc.password" value="@DB_PWD@"/>
<property name="jakarta.persistence.jdbc.driver" value="@DB_DRIVER@"/>
<property name="jakarta.persistence.jdbc.user" value="@DB_USER@"/>
<property name="jakarta.persistence.jdbc.url" value="@db_url@"/>
<property name="jakarta.persistence.jdbc.password" value="@db_pwd@"/>
<property name="jakarta.persistence.jdbc.driver" value="@db_driver@"/>
<property name="jakarta.persistence.jdbc.user" value="@db_user@"/>
</properties>
</persistence-unit>

Expand All @@ -60,10 +60,10 @@
<property name="eclipselink.metadata-source" value="XML"/>
<property name="eclipselink.weaving" value="static"/>
<property name="eclipselink.metadata-source.xml.file" value="META-INF/auction-orm.xml"/>
<property name="jakarta.persistence.jdbc.url" value="@DB_URL@"/>
<property name="jakarta.persistence.jdbc.password" value="@DB_PWD@"/>
<property name="jakarta.persistence.jdbc.driver" value="@DB_DRIVER@"/>
<property name="jakarta.persistence.jdbc.user" value="@DB_USER@"/>
<property name="jakarta.persistence.jdbc.url" value="@db_url@"/>
<property name="jakarta.persistence.jdbc.password" value="@db_pwd@"/>
<property name="jakarta.persistence.jdbc.driver" value="@db_driver@"/>
<property name="jakarta.persistence.jdbc.user" value="@db_user@"/>
</properties>
</persistence-unit>

Expand All @@ -75,10 +75,10 @@
<property name="eclipselink.metadata-source" value="XML"/>
<property name="eclipselink.weaving" value="static"/>
<property name="eclipselink.metadata-source.xml.file" value="META-INF/phonebook-orm.xml"/>
<property name="jakarta.persistence.jdbc.url" value="@DB_URL@"/>
<property name="jakarta.persistence.jdbc.password" value="@DB_PWD@"/>
<property name="jakarta.persistence.jdbc.driver" value="@DB_DRIVER@"/>
<property name="jakarta.persistence.jdbc.user" value="@DB_USER@"/>
<property name="jakarta.persistence.jdbc.url" value="@db_url@"/>
<property name="jakarta.persistence.jdbc.password" value="@db_pwd@"/>
<property name="jakarta.persistence.jdbc.driver" value="@db_driver@"/>
<property name="jakarta.persistence.jdbc.user" value="@db_user@"/>
</properties>
</persistence-unit>

Expand Down