github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#6611] [#6617] Automatic-Module-Name

Browse Source 
- [#6611] Add Automatic-Module-Name to MANIFEST.MF
- [#6617] Specify <pluginManagement> in parent pom.xml
This commit is contained in:
lukaseder 2017-09-28 18:11:23 +02:00
parent 49b814670a
commit e14839a6ef
13 changed files with 181 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jOOQ-checker/pom.xml
View File

@ -29,6 +29,22 @@
</licenses>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>org.jooq.checker</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.jooq</groupId>
@ -41,5 +57,4 @@
<version>2.0.0</version>
</dependency>
</dependencies>
</project>

13
jOOQ-codegen-maven/pom.xml
View File

@ -39,7 +39,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.5</version>
<configuration>
<!-- see http://jira.codehaus.org/browse/MNG-5346 -->
@ -62,6 +61,18 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>org.jooq.codegen.maven</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>

16
jOOQ-codegen/pom.xml
View File

@ -29,6 +29,22 @@
</licenses>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>org.jooq.codegen</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.jooq</groupId>

4
jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Public.java
View File

@ -33,7 +33,7 @@ import org.jooq.impl.SchemaImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Public extends SchemaImpl {
private static final long serialVersionUID = 1858909872;
private static final long serialVersionUID = 763160494;
/**
* The reference instance of <code>PUBLIC</code>
@ -85,8 +85,6 @@ public class Public extends SchemaImpl {
private final List<Sequence<?>> getSequences0() {
return Arrays.<Sequence<?>>asList(
Sequences.SYSTEM_SEQUENCE_BAAE77DE_8E0A_4B04_8632_BA38E2536BFD,
Sequences.SYSTEM_SEQUENCE_C32829E3_148C_42AA_A816_FCC9E789E824,
Sequences.S_AUTHOR_ID,
Sequences.S_BOOK_ID);
}

10
jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Sequences.java
View File

@ -23,16 +23,6 @@ import org.jooq.impl.SequenceImpl;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Sequences {
/**
* The sequence <code>PUBLIC.SYSTEM_SEQUENCE_BAAE77DE_8E0A_4B04_8632_BA38E2536BFD</code>
*/
public static final Sequence<Long> SYSTEM_SEQUENCE_BAAE77DE_8E0A_4B04_8632_BA38E2536BFD = new SequenceImpl<Long>("SYSTEM_SEQUENCE_BAAE77DE_8E0A_4B04_8632_BA38E2536BFD", Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT);
/**
* The sequence <code>PUBLIC.SYSTEM_SEQUENCE_C32829E3_148C_42AA_A816_FCC9E789E824</code>
*/
public static final Sequence<Long> SYSTEM_SEQUENCE_C32829E3_148C_42AA_A816_FCC9E789E824 = new SequenceImpl<Long>("SYSTEM_SEQUENCE_C32829E3_148C_42AA_A816_FCC9E789E824", Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT);
/**
* The sequence <code>PUBLIC.S_AUTHOR_ID</code>
*/

16
jOOQ-meta-extensions/pom.xml
View File

@ -28,6 +28,22 @@
</licenses>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>org.jooq.meta.extensions</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.jooq</groupId>

7
jOOQ-meta-extensions/src/main/java/org/jooq/util/ddl/DDLDatabase.java
View File

@ -40,11 +40,11 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
import java.util.Scanner;
import org.jooq.DSLContext;
@ -86,7 +86,10 @@ public class DDLDatabase extends H2Database {
}
try {
connection = DriverManager.getConnection("jdbc:h2:mem:jooq-meta-extensions", "sa", "");
Properties info = new Properties();
info.put("user", "sa");
info.put("password", "");
connection = new org.h2.Driver().connect("jdbc:h2:mem:jooq-meta-extensions", info);
InputStream in = null;
try {

7
jOOQ-meta-extensions/src/main/java/org/jooq/util/jpa/JPADatabase.java
View File

@ -39,7 +39,6 @@ import static org.jooq.tools.StringUtils.isBlank;
import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collection;
@ -47,6 +46,7 @@ import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
import java.util.Properties;
import javax.persistence.AttributeConverter;
import javax.persistence.Entity;
@ -110,7 +110,10 @@ public class JPADatabase extends H2Database {
boolean useAttributeConverters = Boolean.valueOf(getProperties().getProperty("use-attribute-converters", "true"));
try {
connection = DriverManager.getConnection("jdbc:h2:mem:jooq-meta-extensions", "sa", "");
Properties info = new Properties();
info.put("user", "sa");
info.put("password", "");
connection = new org.h2.Driver().connect("jdbc:h2:mem:jooq-meta-extensions", info);
MetadataSources metadata = new MetadataSources(
new StandardServiceRegistryBuilder()

16
jOOQ-meta/pom.xml
View File

@ -28,6 +28,22 @@
</licenses>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>org.jooq.meta</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.jooq</groupId>

15
jOOQ-scala_2.11/pom.xml
View File

@ -16,7 +16,6 @@
<properties>
<scala.version>2.11.11</scala.version>
<org.h2.version>1.4.195</org.h2.version>
</properties>
<build>
@ -125,7 +124,6 @@
<!-- [/trial] -->
@ -134,7 +132,6 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>2.15.2</version>
<executions>
<execution>
<goals>
@ -149,7 +146,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.2</version>
<executions>
<execution>
<id>empty-javadoc-jar</id>
@ -160,6 +156,11 @@
<configuration>
<classifier>javadoc</classifier>
<classesDirectory>${basedir}/javadoc</classesDirectory>
<archive>
<manifestEntries>
<Automatic-Module-Name>org.jooq.scala_2_11</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</execution>
</executions>
@ -203,12 +204,6 @@

15
jOOQ-scala_2.12/pom.xml
View File

@ -16,7 +16,6 @@
<properties>
<scala.version>2.12.3</scala.version>
<org.h2.version>1.4.195</org.h2.version>
</properties>
<build>
@ -125,7 +124,6 @@
<!-- [/trial] -->
@ -134,7 +132,6 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>2.15.2</version>
<executions>
<execution>
<goals>
@ -149,7 +146,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.2</version>
<executions>
<execution>
<id>empty-javadoc-jar</id>
@ -160,6 +156,11 @@
<configuration>
<classifier>javadoc</classifier>
<classesDirectory>${basedir}/javadoc</classesDirectory>
<archive>
<manifestEntries>
<Automatic-Module-Name>org.jooq.scala_2_11</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</execution>
</executions>
@ -203,12 +204,6 @@

6
jOOQ/pom.xml
View File

@ -34,7 +34,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.5.4</version>
<extensions>true</extensions>
<executions>
<execution>
@ -65,11 +64,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<configuration>
<archive>
<!-- add the generated manifest to the jar -->
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestEntries>
<Automatic-Module-Name>org.jooq</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>

88
pom.xml
View File

@ -94,16 +94,96 @@
<!-- Some projects will need an H2 database for testing, or to create temporary in-memory databases -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.4.196</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<finalName>${project.artifactId}-${project.version}</finalName>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>sql-maven-plugin</artifactId>
<version>1.5</version>
</plugin>
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>2.15.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<configuration>
<archive>
<manifestEntries>
<Built-By>Data Geekery GmbH</Built-By>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<configuration>
<!-- When compilers say false, they mean true ...
https://issues.apache.org/jira/browse/MCOMPILER-209 -->
@ -132,12 +212,6 @@
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
</plugin>
</plugins>
</build>