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

[OPENJPA-2798] java11 friendly #57

Merged
merged 3 commits into from Jan 16, 2020
Merged

[OPENJPA-2798] java11 friendly #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f004496
[OPENJPA-2798] geronimo-jpa_2.2_spec is replaced with jakarta.persist…
solomax Dec 15, 2019
b1504de
Automatic module names are added
solomax Dec 17, 2019
6966b2c
indentation, stats -> statistics
solomax Dec 17, 2019
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
3 changes: 3 additions & 0 deletions openjpa-all/pom.xml
View file
Open in desktop
Expand Up @@ -35,6 +35,9 @@
<packaging>jar</packaging>
<name>OpenJPA Aggregate Jar with Dependencies</name>

<properties>
<automatic-module-name>org.apache.openjpa.all</automatic-module-name>
</properties>
<build>
<plugins>
<!-- disable creating javadoc for this module -->
Expand Down
1 change: 1 addition & 0 deletions openjpa-examples/image-gallery/pom.xml
View file
Open in desktop
Expand Up @@ -44,6 +44,7 @@
<test.jvm.maxheapsize>1024m</test.jvm.maxheapsize>
<test.jvm.arguments>-Xmx${test.jvm.maxheapsize}</test.jvm.arguments>
<surefire.jvm.args>${test.jvm.arguments}</surefire.jvm.args>
<automatic-module-name>org.apache.openjpa.examples.gallery</automatic-module-name>
</properties>

<dependencies>
Expand Down
1 change: 1 addition & 0 deletions openjpa-examples/openbooks/pom.xml
View file
Open in desktop
Expand Up @@ -42,6 +42,7 @@
<properties>
<checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
<checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
<automatic-module-name>org.apache.openjpa.examples.openbooks</automatic-module-name>
</properties>
<dependencies>
<dependency>
Expand Down
1 change: 1 addition & 0 deletions openjpa-examples/simple/pom.xml
View file
Open in desktop
Expand Up @@ -49,6 +49,7 @@
<properties>
<checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
<checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
<automatic-module-name>org.apache.openjpa.examples.simple</automatic-module-name>
</properties>
<build>
<plugins>
Expand Down
1 change: 1 addition & 0 deletions openjpa-integration/daytrader/pom.xml
View file
Open in desktop
Expand Up @@ -44,6 +44,7 @@
<dbcp.minIdle>2</dbcp.minIdle>
<dbcp.maxWait>10000</dbcp.maxWait>
<dbcp.args>MaxTotal=${dbcp.maxTotal},MaxIdle=${dbcp.maxIdle},MinIdle=${dbcp.minIdle},MaxWait=${dbcp.maxWait}</dbcp.args>
<automatic-module-name>org.apache.openjpa.integration.daytrader</automatic-module-name>
</properties>

<dependencies>
Expand Down
1 change: 1 addition & 0 deletions openjpa-integration/jmx/pom.xml
View file
Open in desktop
Expand Up @@ -45,6 +45,7 @@
<test.jvm.jmxauth>com.sun.management.jmxremote.authenticate=false</test.jvm.jmxauth>
<test.jvm.arguments>-Xmx${test.jvm.maxheapsize} -D${test.jvm.jmxprovider} -D${test.jvm.jmxauth}</test.jvm.arguments>
<surefire.jvm.args>${test.jvm.arguments}</surefire.jvm.args>
<automatic-module-name>org.apache.openjpa.integration.jmx</automatic-module-name>
</properties>

<dependencies>
Expand Down
1 change: 1 addition & 0 deletions openjpa-integration/slf4j/pom.xml
View file
Open in desktop
Expand Up @@ -40,6 +40,7 @@
<checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
<!-- use SLF4JLogFactory for logging -->
<openjpa.Log>slf4j</openjpa.Log>
<automatic-module-name>org.apache.openjpa.integration.slf4j</automatic-module-name>
</properties>

<dependencies>
Expand Down
5 changes: 2 additions & 3 deletions openjpa-integration/tck/pom.xml
View file
Open in desktop
Expand Up @@ -446,9 +446,8 @@ databaseName=${db.name}

<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.2_spec</artifactId>
<scope>compile</scope>
<groupId>org.eclipse.persistence</groupId>
<artifactId>jakarta.persistence</artifactId>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
Expand Down
3 changes: 2 additions & 1 deletion openjpa-integration/validation/pom.xml
View file
Open in desktop
Expand Up @@ -38,6 +38,7 @@
<properties>
<checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
<checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
<automatic-module-name>org.apache.openjpa.integration.validation</automatic-module-name>
</properties>

<profiles>
Expand Down Expand Up @@ -95,7 +96,7 @@
<version>4.0.2.GA</version>
<scope>test</scope>
<exclusions>
<!-- force usage of the geronimo-jpa_2.1_spec -->
<!-- force usage of own jpa -->
<exclusion>
<groupId>org.hibernate.java-persistence</groupId>
<artifactId>jpa-api</artifactId>
Expand Down
3 changes: 3 additions & 0 deletions openjpa-jdbc/pom.xml
View file
Open in desktop
Expand Up @@ -35,6 +35,9 @@
<name>OpenJPA JDBC</name>
<description>OpenJPA JDBC</description>

<properties>
<automatic-module-name>org.apache.openjpa.jdbc</automatic-module-name>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
Expand Down
7 changes: 5 additions & 2 deletions openjpa-jest/pom.xml
View file
Open in desktop
Expand Up @@ -35,15 +35,18 @@
<packaging>jar</packaging>
<name>OpenJPA JEST</name>

<properties>
<automatic-module-name>org.apache.openjpa.jest</automatic-module-name>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.2_spec</artifactId>
<groupId>org.eclipse.persistence</groupId>
<artifactId>jakarta.persistence</artifactId>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
Expand Down
3 changes: 3 additions & 0 deletions openjpa-kernel/pom.xml
View file
Open in desktop
Expand Up @@ -35,6 +35,9 @@
<name>OpenJPA Kernel</name>
<description>OpenJPA Kernel</description>

<properties>
<automatic-module-name>org.apache.openjpa.kernel</automatic-module-name>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
Expand Down
3 changes: 3 additions & 0 deletions openjpa-lib/pom.xml
View file
Open in desktop
Expand Up @@ -35,6 +35,9 @@
<name>OpenJPA Utilities Library</name>
<description>OpenJPA Utilities Library</description>

<properties>
<automatic-module-name>org.apache.openjpa.lib</automatic-module-name>
</properties>
<dependencies>
<dependency>
<groupId>jakarta-regexp</groupId>
Expand Down
3 changes: 3 additions & 0 deletions openjpa-persistence-jdbc/pom.xml
View file
Open in desktop
Expand Up @@ -35,6 +35,9 @@
<name>OpenJPA Persistence JDBC</name>
<description>OpenJPA Persistence JDBC</description>

<properties>
<automatic-module-name>org.apache.openjpa.persistence.jdbc</automatic-module-name>
</properties>
<profiles>
<!-- Profile for testing with test-dynamic-enhancer -->
<profile>
Expand Down
1 change: 1 addition & 0 deletions openjpa-persistence-locking/pom.xml
View file
Open in desktop
Expand Up @@ -41,6 +41,7 @@
<derby.locks.deadlockTimeout>5</derby.locks.deadlockTimeout>
<!-- set this =** on cmdline to skip all tests -->
<surefire.excludes.locking />
<automatic-module-name>org.apache.openjpa.persistence.locking</automatic-module-name>
</properties>

<profiles>
Expand Down
7 changes: 5 additions & 2 deletions openjpa-persistence/pom.xml
View file
Open in desktop
Expand Up @@ -35,15 +35,18 @@
<name>OpenJPA Persistence</name>
<description>OpenJPA Persistence</description>

<properties>
<automatic-module-name>org.apache.openjpa.persistence</automatic-module-name>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.2_spec</artifactId>
<groupId>org.eclipse.persistence</groupId>
<artifactId>jakarta.persistence</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Expand Down
2 changes: 1 addition & 1 deletion openjpa-project/assembly.xml
View file
Open in desktop
Expand Up @@ -139,7 +139,7 @@
<include>org.apache.commons:commons-dbcp2</include>

<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jpa_2.2_spec</include>
<include>org.eclipse.persistence:jakarta.persistence</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
<include>org.apache.bval:org.apache.bval.bundle</include>
Expand Down
2 changes: 1 addition & 1 deletion openjpa-project/bin-assembly.xml
View file
Open in desktop
Expand Up @@ -78,7 +78,7 @@
<include>org.apache.commons:commons-dbcp2</include>

<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jpa_2.2_spec</include>
<include>org.eclipse.persistence:jakarta.persistence</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
<include>org.apache.bval:org.apache.bval.bundle</include>
Expand Down
7 changes: 5 additions & 2 deletions openjpa-slice/pom.xml
View file
Open in desktop
Expand Up @@ -35,6 +35,9 @@
<name>OpenJPA Slice</name>
<description>OpenJPA Slice</description>

<properties>
<automatic-module-name>org.apache.openjpa.slice</automatic-module-name>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
Expand All @@ -47,8 +50,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.2_spec</artifactId>
<groupId>org.eclipse.persistence</groupId>
<artifactId>jakarta.persistence</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
1 change: 1 addition & 0 deletions openjpa-tools/openjpa-fetch-statistics-was/pom.xml
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@
<properties>
<checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
<checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
<automatic-module-name>org.apache.openjpa.tools.statistics.was</automatic-module-name>
</properties>

<dependencies>
Expand Down
5 changes: 3 additions & 2 deletions openjpa-tools/openjpa-fetch-statistics/pom.xml
View file
Open in desktop
Expand Up @@ -30,12 +30,13 @@
<properties>
<checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
<checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
<automatic-module-name>org.apache.openjpa.tools.statistics</automatic-module-name>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.2_spec</artifactId>
<groupId>org.eclipse.persistence</groupId>
<artifactId>jakarta.persistence</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Expand Down
4 changes: 2 additions & 2 deletions openjpa-tools/openjpa-maven-plugin/pom.xml
View file
Open in desktop
Expand Up @@ -118,8 +118,8 @@
</dependency>

<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.2_spec</artifactId>
<groupId>org.eclipse.persistence</groupId>
<artifactId>jakarta.persistence</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Expand Down
5 changes: 2 additions & 3 deletions openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml
View file
Open in desktop
Expand Up @@ -34,10 +34,9 @@
<artifactId>enhance</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>

<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.2_spec</artifactId>
<groupId>org.eclipse.persistence</groupId>
<artifactId>jakarta.persistence</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Expand Down
4 changes: 2 additions & 2 deletions openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/pom.xml
View file
Open in desktop
Expand Up @@ -42,8 +42,8 @@

<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.2_spec</artifactId>
<groupId>org.eclipse.persistence</groupId>
<artifactId>jakarta.persistence</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Expand Down
4 changes: 2 additions & 2 deletions openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/pom.xml
View file
Open in desktop
Expand Up @@ -36,8 +36,8 @@

<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.2_spec</artifactId>
<groupId>org.eclipse.persistence</groupId>
<artifactId>jakarta.persistence</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Expand Down
4 changes: 2 additions & 2 deletions openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml
View file
Open in desktop
Expand Up @@ -35,8 +35,8 @@
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.2_spec</artifactId>
<groupId>org.eclipse.persistence</groupId>
<artifactId>jakarta.persistence</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Expand Down
4 changes: 2 additions & 2 deletions openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/pom.xml
View file
Open in desktop
Expand Up @@ -35,8 +35,8 @@
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.2_spec</artifactId>
<groupId>org.eclipse.persistence</groupId>
<artifactId>jakarta.persistence</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Expand Down
4 changes: 2 additions & 2 deletions openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml
View file
Open in desktop
Expand Up @@ -35,8 +35,8 @@

<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.2_spec</artifactId>
<groupId>org.eclipse.persistence</groupId>
<artifactId>jakarta.persistence</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Expand Down
3 changes: 3 additions & 0 deletions openjpa-xmlstore/pom.xml
View file
Open in desktop
Expand Up @@ -35,6 +35,9 @@
<name>OpenJPA XML Store</name>
<description>OpenJPA XML Store</description>

<properties>
<automatic-module-name>org.apache.openjpa.xmlstore</automatic-module-name>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
Expand Down
8 changes: 5 additions & 3 deletions pom.xml
View file
Open in desktop
Expand Up @@ -96,6 +96,7 @@

<bval.version>1.1.2</bval.version>
<jmock.version>2.9.0</jmock.version>
<automatic-module-name>-SUBMODULES-NEED-TO-OVERRIDE-THIS-</automatic-module-name>
</properties>

<licenses>
Expand Down Expand Up @@ -1713,9 +1714,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.2_spec</artifactId>
<version>1.0</version>
<groupId>org.eclipse.persistence</groupId>
<artifactId>jakarta.persistence</artifactId>
<version>2.2.3</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Expand Down Expand Up @@ -2074,6 +2075,7 @@
<manifestEntries>
<Implementation-Build>${buildNumber}</Implementation-Build>
<Implementation-Date>${timestamp}</Implementation-Date>
<Automatic-Module-Name>${automatic-module-name}</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
Expand Down