Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OPENJPA-2896] automatic module name is set for bundles (#92) 

* [OPENJPA-2896] automatic module name is set for bundles

* Automatic-module-names for fat jars only

* 'org.apache.openjpa.jakarta' is dropped

* auto-module-name is dropped from openjpa-all
This commit is contained in:
Maxim Solodovnik 2021-12-23 22:52:23 +07:00 committed by GitHub
parent e15296c415
commit 468a4538fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 7 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openjpa-all/pom.xml
View File

@ -35,9 +35,6 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OpenJPA Aggregate Jar with Dependencies</name> <name>OpenJPA Aggregate Jar with Dependencies</name>
<properties>
<automatic-module-name>org.apache.openjpa.all</automatic-module-name>
</properties>
<build> <build>
<plugins> <plugins>
<!-- disable creating javadoc for this module --> <!-- disable creating javadoc for this module -->

1
openjpa-examples/image-gallery/pom.xml
View File

@ -42,7 +42,6 @@
<test.jvm.maxheapsize>1024m</test.jvm.maxheapsize> <test.jvm.maxheapsize>1024m</test.jvm.maxheapsize>
<test.jvm.arguments>-Xmx${test.jvm.maxheapsize}</test.jvm.arguments> <test.jvm.arguments>-Xmx${test.jvm.maxheapsize}</test.jvm.arguments>
<surefire.jvm.args>${test.jvm.arguments}</surefire.jvm.args> <surefire.jvm.args>${test.jvm.arguments}</surefire.jvm.args>
<automatic-module-name>org.apache.openjpa.examples.gallery</automatic-module-name>
<checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location> <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
</properties> </properties>

1
openjpa-examples/openbooks/pom.xml
View File

@ -41,7 +41,6 @@
<properties> <properties>
<checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.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> </properties>
<dependencies> <dependencies>
<dependency> <dependency>

1
openjpa-examples/simple/pom.xml
View File

@ -48,7 +48,6 @@
<properties> <properties>
<checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.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> </properties>
<build> <build>
<plugins> <plugins>

1
openjpa-integration/daytrader/pom.xml
View File

@ -42,7 +42,6 @@
<dbcp.minIdle>2</dbcp.minIdle> <dbcp.minIdle>2</dbcp.minIdle>
<dbcp.maxWait>10000</dbcp.maxWait> <dbcp.maxWait>10000</dbcp.maxWait>
<dbcp.args>MaxTotal=${dbcp.maxTotal},MaxIdle=${dbcp.maxIdle},MinIdle=${dbcp.minIdle},MaxWait=${dbcp.maxWait}</dbcp.args> <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> </properties>
<dependencies> <dependencies>

1
openjpa-integration/jmx/pom.xml
View File

@ -43,7 +43,6 @@
<test.jvm.jmxauth>com.sun.management.jmxremote.authenticate=false</test.jvm.jmxauth> <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> <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> <surefire.jvm.args>${test.jvm.arguments}</surefire.jvm.args>
<automatic-module-name>org.apache.openjpa.integration.jmx</automatic-module-name>
</properties> </properties>
<dependencies> <dependencies>

1
openjpa-integration/slf4j/pom.xml
View File

@ -38,7 +38,6 @@
<properties> <properties>
<!-- use SLF4JLogFactory for logging --> <!-- use SLF4JLogFactory for logging -->
<openjpa.Log>slf4j</openjpa.Log> <openjpa.Log>slf4j</openjpa.Log>
<automatic-module-name>org.apache.openjpa.integration.slf4j</automatic-module-name>
</properties> </properties>
<dependencies> <dependencies>

1
openjpa-integration/validation/pom.xml
View File

@ -37,7 +37,6 @@
<properties> <properties>
<checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.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> </properties>
<profiles> <profiles>

3
openjpa-jdbc/pom.xml
View File

@ -35,9 +35,6 @@
<name>OpenJPA JDBC</name> <name>OpenJPA JDBC</name>
<description>OpenJPA JDBC</description> <description>OpenJPA JDBC</description>
<properties>
<automatic-module-name>org.apache.openjpa.jdbc</automatic-module-name>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>

3
openjpa-jest/pom.xml
View File

@ -35,9 +35,6 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OpenJPA JEST</name> <name>OpenJPA JEST</name>
<properties>
<automatic-module-name>org.apache.openjpa.jest</automatic-module-name>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>

4
openjpa-junit5/pom.xml
View File

@ -32,10 +32,6 @@
<name>OpenJPA JUnit 5</name> <name>OpenJPA JUnit 5</name>
<description>OpenJPA JUnit 5</description> <description>OpenJPA JUnit 5</description>
<properties>
<automatic-module-name>org.apache.openjpa.junit5</automatic-module-name>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>

3
openjpa-kernel/pom.xml
View File

@ -35,9 +35,6 @@
<name>OpenJPA Kernel</name> <name>OpenJPA Kernel</name>
<description>OpenJPA Kernel</description> <description>OpenJPA Kernel</description>
<properties>
<automatic-module-name>org.apache.openjpa.kernel</automatic-module-name>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>

3
openjpa-lib/pom.xml
View File

@ -35,9 +35,6 @@
<name>OpenJPA Utilities Library</name> <name>OpenJPA Utilities Library</name>
<description>OpenJPA Utilities Library</description> <description>OpenJPA Utilities Library</description>
<properties>
<automatic-module-name>org.apache.openjpa.lib</automatic-module-name>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>jakarta-regexp</groupId> <groupId>jakarta-regexp</groupId>

3
openjpa-persistence-jdbc/pom.xml
View File

@ -35,9 +35,6 @@
<name>OpenJPA Persistence JDBC</name> <name>OpenJPA Persistence JDBC</name>
<description>OpenJPA Persistence JDBC</description> <description>OpenJPA Persistence JDBC</description>
<properties>
<automatic-module-name>org.apache.openjpa.persistence.jdbc</automatic-module-name>
</properties>
<profiles> <profiles>
<!-- Profile for testing with test-dynamic-enhancer --> <!-- Profile for testing with test-dynamic-enhancer -->
<profile> <profile>

1
openjpa-persistence-locking/pom.xml
View File

@ -41,7 +41,6 @@
<derby.locks.deadlockTimeout>5</derby.locks.deadlockTimeout> <derby.locks.deadlockTimeout>5</derby.locks.deadlockTimeout>
<!-- set this =** on cmdline to skip all tests --> <!-- set this =** on cmdline to skip all tests -->
<surefire.excludes.locking /> <surefire.excludes.locking />
<automatic-module-name>org.apache.openjpa.persistence.locking</automatic-module-name>
</properties> </properties>
<profiles> <profiles>

3
openjpa-persistence/pom.xml
View File

@ -35,9 +35,6 @@
<name>OpenJPA Persistence</name> <name>OpenJPA Persistence</name>
<description>OpenJPA Persistence</description> <description>OpenJPA Persistence</description>
<properties>
<automatic-module-name>org.apache.openjpa.persistence</automatic-module-name>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>

3
openjpa-slice/pom.xml
View File

@ -35,9 +35,6 @@
<name>OpenJPA Slice</name> <name>OpenJPA Slice</name>
<description>OpenJPA Slice</description> <description>OpenJPA Slice</description>
<properties>
<automatic-module-name>org.apache.openjpa.slice</automatic-module-name>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>

1
openjpa-tools/openjpa-fetch-statistics-was/pom.xml
View File

@ -29,7 +29,6 @@
<properties> <properties>
<checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.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> </properties>
<dependencies> <dependencies>

1
openjpa-tools/openjpa-fetch-statistics/pom.xml
View File

@ -29,7 +29,6 @@
<properties> <properties>
<checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.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> </properties>
<dependencies> <dependencies>

3
openjpa-xmlstore/pom.xml
View File

@ -35,9 +35,6 @@
<name>OpenJPA XML Store</name> <name>OpenJPA XML Store</name>
<description>OpenJPA XML Store</description> <description>OpenJPA XML Store</description>
<properties>
<automatic-module-name>org.apache.openjpa.xmlstore</automatic-module-name>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>

7
openjpa/pom.xml
View File

@ -109,6 +109,12 @@
<createSourcesJar>${createSources}</createSourcesJar> <createSourcesJar>${createSources}</createSourcesJar>
<transformers> <transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<!-- Need to add some MANIFEST.MF metadata -->
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Automatic-Module-Name>org.apache.openjpa</Automatic-Module-Name>
</manifestEntries>
</transformer>
</transformers> </transformers>
<artifactSet> <artifactSet>
<includes> <includes>
@ -223,6 +229,7 @@
<Specification-Title>JSR-338 Java Persistence</Specification-Title> <Specification-Title>JSR-338 Java Persistence</Specification-Title>
<Specification-Vendor>ORACLE, Inc.</Specification-Vendor> <Specification-Vendor>ORACLE, Inc.</Specification-Vendor>
<Specification-Version>2.2</Specification-Version> <Specification-Version>2.2</Specification-Version>
<Automatic-Module-Name>org.apache.openjpa</Automatic-Module-Name>
<!-- OSGi Bundle Metadata --> <!-- OSGi Bundle Metadata -->
<Bundle-DocURL>${project.url}</Bundle-DocURL> <Bundle-DocURL>${project.url}</Bundle-DocURL>
<Bundle-Activator>org.apache.openjpa.persistence.osgi.PersistenceActivator</Bundle-Activator> <Bundle-Activator>org.apache.openjpa.persistence.osgi.PersistenceActivator</Bundle-Activator>

2
pom.xml
View File

@ -103,7 +103,6 @@
<ant.version>1.10.9</ant.version> <ant.version>1.10.9</ant.version>
<jmock.version>2.9.0</jmock.version> <jmock.version>2.9.0</jmock.version>
<automatic-module-name>-SUBMODULES-NEED-TO-OVERRIDE-THIS-</automatic-module-name>
<dbcp2.version>2.8.0</dbcp2.version> <dbcp2.version>2.8.0</dbcp2.version>
<pool2.version>2.9.0</pool2.version> <pool2.version>2.9.0</pool2.version>
</properties> </properties>
@ -2160,7 +2159,6 @@
<manifestEntries> <manifestEntries>
<Implementation-Build>${buildNumber}</Implementation-Build> <Implementation-Build>${buildNumber}</Implementation-Build>
<Implementation-Date>${timestamp}</Implementation-Date> <Implementation-Date>${timestamp}</Implementation-Date>
<Automatic-Module-Name>${automatic-module-name}</Automatic-Module-Name>
</manifestEntries> </manifestEntries>
</archive> </archive>
</configuration> </configuration>