Skip to content

Commit 940ac75

Browse files
bytefishbytefish
authored
Merge pull request #104 from PgBulkInsert/jdk18
Issue #103 Do not use Multi-Modules
2 parents 35bf796 + 20b695a commit 940ac75

109 files changed

Lines changed: 17 additions & 263 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/maven.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232

3333
steps:
3434
- uses: actions/checkout@v2
35-
- name: Set up JDK 11
35+
- name: Set up JDK 8
3636
uses: actions/setup-java@v1
3737
with:
38-
java-version: 11
38+
java-version: 8
3939
- name: Build with Maven
4040
uses: paambaati/codeclimate-action@v2.6.0
4141
env:

‎PgBulkInsert/deployment/deploy_release.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ echo - Bundling Artifacts for OSSRH Repository Upload -
88
echo ---------------------------------------------------
99

1010
:: Define the Executables, so we don't have to rely on pathes:
11-
set MVN_EXECUTABLE="C:\Program Files (x86)\Maven\apache-maven-3.6.3\bin\mvn.cmd"
12-
set GPG_EXECUTABLE="C:\Program Files (x86)\GNU\GnuPG\pub\gpg.exe"
11+
set MVN_EXECUTABLE="G:\apache-maven-3.6.3-bin\apache-maven-3.6.3\bin\mvn.cmd"
12+
set GPG_EXECUTABLE="C:\Program Files (x86)\gnupg\bin\gpg.exe"
1313

1414
:: GPG Key ID used for signing:
1515
set GPG_KEY_ID=E4B54CD3

‎PgBulkInsert/pgbulkinsert-bulkprocessor/pom.xml‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎PgBulkInsert/pgbulkinsert-core/pom.xml‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎PgBulkInsert/pgbulkinsert-rowwriter/pom.xml‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎PgBulkInsert/pom.xml‎

Lines changed: 8 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,13 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>de.bytefish.pgbulkinsert</groupId>
8-
<artifactId>pgbulkinsert-parent</artifactId>
9-
<packaging>pom</packaging>
10-
<version>7.0.1</version>
7+
<groupId>de.bytefish</groupId>
8+
<artifactId>pgbulkinsert</artifactId>
9+
<version>8.0.0</version>
1110
<name>pgbulkinsert</name>
1211
<description>PgBulkInsert is a Java library for Bulk Inserts with PostgreSQL.</description>
1312
<url>http://www.github.com/bytefish/PgBulkInsert</url>
1413

15-
<modules>
16-
<module>pgbulkinsert-core</module>
17-
<module>pgbulkinsert-rowwriter</module>
18-
<module>pgbulkinsert-bulkprocessor</module>
19-
</modules>
20-
2114
<!-- Define the License -->
2215
<licenses>
2316
<license>
@@ -59,67 +52,20 @@
5952
<groupId>org.apache.maven.plugins</groupId>
6053
<artifactId>maven-compiler-plugin</artifactId>
6154
<version>3.8.1</version>
62-
<executions>
63-
<execution>
64-
<id>compile-jdk8</id>
65-
<goals>
66-
<goal>compile</goal>
67-
</goals>
68-
<configuration>
69-
<release>8</release>
70-
<outputDirectory>${project.build.outputDirectory}_jdk8</outputDirectory>
71-
</configuration>
72-
</execution>
73-
</executions>
7455
<configuration>
75-
<release>11</release>
56+
<source>1.8</source>
57+
<target>1.8</target>
7658
<fork>true</fork>
7759
<showWarnings>true</showWarnings>
7860
<compilerArgs>
7961
<arg>-Xlint:unchecked</arg>
8062
<arg>-Xlint:deprecation</arg>
8163
<arg>-XDcompilePolicy=simple</arg>
82-
<arg>-Xplugin:ErrorProne -Xep:NullAway:ERROR -XepOpt:NullAway:AnnotatedPackages=de.bytefish.pgbulkinsert</arg>
8364
</compilerArgs>
84-
<annotationProcessorPaths>
85-
<path>
86-
<groupId>com.google.errorprone</groupId>
87-
<artifactId>error_prone_core</artifactId>
88-
<version>2.3.4</version>
89-
</path>
90-
<path>
91-
<groupId>com.uber.nullaway</groupId>
92-
<artifactId>nullaway</artifactId>
93-
<version>0.7.10</version>
94-
</path>
95-
</annotationProcessorPaths>
9665
<showDeprecation>true</showDeprecation>
9766
<showWarnings>true</showWarnings>
9867
</configuration>
9968
</plugin>
100-
<plugin>
101-
<groupId>org.apache.maven.plugins</groupId>
102-
<artifactId>maven-jar-plugin</artifactId>
103-
<version>3.2.0</version>
104-
<executions>
105-
<execution>
106-
<id>jar-jdk8</id>
107-
<goals>
108-
<goal>jar</goal>
109-
</goals>
110-
<configuration>
111-
<classifier>jdk8</classifier>
112-
<classesDirectory>${project.build.outputDirectory}_jdk8</classesDirectory>
113-
<archive>
114-
<manifest>
115-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
116-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
117-
</manifest>
118-
</archive>
119-
</configuration>
120-
</execution>
121-
</executions>
122-
</plugin>
12369
</plugins>
12470
</pluginManagement>
12571
<plugins>
@@ -179,7 +125,6 @@
179125
</repository>
180126
</distributionManagement>
181127

182-
183128
<properties>
184129
<maven.compiler.source>1.8</maven.compiler.source>
185130
<maven.compiler.target>1.8</maven.compiler.target>
@@ -248,6 +193,9 @@
248193
<groupId>org.apache.maven.plugins</groupId>
249194
<artifactId>maven-javadoc-plugin</artifactId>
250195
<version>3.2.0</version>
196+
<configuration>
197+
<source>8</source>
198+
</configuration>
251199
<executions>
252200
<execution>
253201
<id>attach-javadocs</id>

PgBulkInsert/pgbulkinsert-core/src/main/java/de/bytefish/pgbulkinsert/IPgBulkInsert.java renamed to PgBulkInsert/src/main/java/de/bytefish/pgbulkinsert/IPgBulkInsert.java

File renamed without changes.

PgBulkInsert/pgbulkinsert-core/src/main/java/de/bytefish/pgbulkinsert/PgBulkInsert.java renamed to PgBulkInsert/src/main/java/de/bytefish/pgbulkinsert/PgBulkInsert.java

File renamed without changes.

PgBulkInsert/pgbulkinsert-bulkprocessor/src/main/java/de/bytefish/pgbulkinsert/bulkprocessor/BulkProcessor.java renamed to PgBulkInsert/src/main/java/de/bytefish/pgbulkinsert/bulkprocessor/BulkProcessor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ public class BulkProcessor<TEntity> implements AutoCloseable {
1818

1919
@Nullable
2020
private final ScheduledThreadPoolExecutor scheduler;
21+
2122
@Nullable
2223
private final ScheduledFuture<?> scheduledFuture;
2324

PgBulkInsert/pgbulkinsert-bulkprocessor/src/main/java/de/bytefish/pgbulkinsert/bulkprocessor/handler/BulkWriteHandler.java renamed to PgBulkInsert/src/main/java/de/bytefish/pgbulkinsert/bulkprocessor/handler/BulkWriteHandler.java

File renamed without changes.

0 commit comments

Comments
 (0)