Skip to content

Commit 8754193

Browse files
jeandelavarenejeandelavarene
authored
Merge pull request #3 from oracle/pom_fixes
Various pom.xml fixes
2 parents e87c884 + 1dbb11f commit 8754193

File tree

1 file changed

+106
-20
lines changed

1 file changed

+106
-20
lines changed

‎pom.xml‎

Lines changed: 106 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,45 @@
2727
<groupId>com.oracle.database.r2dbc</groupId>
2828
<artifactId>oracle-r2dbc</artifactId>
2929
<version>0.1.0</version>
30+
<name>oracle-r2dbc</name>
31+
<description>
32+
Oracle R2DBC Driver implementing version 0.8.2 of the R2DBC SPI for Oracle Database.
33+
</description>
34+
<url>
35+
https://github.com/oracle/oracle-r2dbc
36+
</url>
37+
<inceptionYear>2019</inceptionYear>
38+
<licenses>
39+
<license>
40+
<name>Universal Permissive License v1.0</name>
41+
<url>https://opensource.org/licenses/UPL</url>
42+
</license>
43+
<license>
44+
<name>Apache License, Version 2.0</name>
45+
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
46+
</license>
47+
</licenses>
48+
<developers>
49+
<developer>
50+
<organization>Oracle America, Inc.</organization>
51+
<organizationUrl>http://www.oracle.com</organizationUrl>
52+
</developer>
53+
</developers>
54+
<scm>
55+
<url>https://github.com/oracle/oracle-r2dbc.git</url>
56+
<connection>
57+
scm:git:https://github.com/oracle/oracle-r2dbc.git
58+
</connection>
59+
<developerConnection>scm:git:git@github.com:oracle/oracle-r2dbc.git</developerConnection>
60+
</scm>
61+
<issueManagement>
62+
<system>GitHub</system>
63+
<url>https://github.com/oracle/oracle-r2dbc/issues</url>
64+
</issueManagement>
3065

3166
<properties>
3267
<java.version>11</java.version>
68+
<ojdbc.version>21.1.0.0</ojdbc.version>
3369
<r2dbc.version>0.8.2.RELEASE</r2dbc.version>
3470
<reactor.version>3.3.0.RELEASE</reactor.version>
3571
<reactive-streams.version>1.0.3</reactive-streams.version>
@@ -52,14 +88,13 @@
5288
<arg>-Xlint:-serial</arg>
5389
</compilerArgs>
5490
<showWarnings>true</showWarnings>
55-
<source>${java.version}</source>
56-
<target>${java.version}</target>
91+
<release>${java.version}</release>
5792
</configuration>
5893
</plugin>
5994
<plugin>
6095
<groupId>org.apache.maven.plugins</groupId>
6196
<artifactId>maven-jar-plugin</artifactId>
62-
<version>2.1</version>
97+
<version>3.2.0</version>
6398
<configuration>
6499
<archive>
65100
<manifestEntries>
@@ -85,15 +120,35 @@
85120
</archive>
86121
</configuration>
87122
</plugin>
123+
<plugin>
124+
<groupId>org.apache.maven.plugins</groupId>
125+
<artifactId>maven-source-plugin</artifactId>
126+
<version>3.2.1</version>
127+
</plugin>
88128
<plugin>
89129
<groupId>org.apache.maven.plugins</groupId>
90130
<artifactId>maven-deploy-plugin</artifactId>
91-
<version>2.8.2</version>
131+
<version>3.0.0-M1</version>
132+
</plugin>
133+
<plugin>
134+
<groupId>org.apache.maven.plugins</groupId>
135+
<artifactId>maven-install-plugin</artifactId>
136+
<version>3.0.0-M1</version>
137+
</plugin>
138+
<plugin>
139+
<groupId>org.apache.maven.plugins</groupId>
140+
<artifactId>maven-clean-plugin</artifactId>
141+
<version>3.1.0</version>
142+
</plugin>
143+
<plugin>
144+
<groupId>org.apache.maven.plugins</groupId>
145+
<artifactId>maven-resources-plugin</artifactId>
146+
<version>3.2.0</version>
92147
</plugin>
93148
<plugin>
94149
<groupId>org.apache.maven.plugins</groupId>
95150
<artifactId>maven-surefire-plugin</artifactId>
96-
<version>2.22.2</version>
151+
<version>3.0.0-M5</version>
97152
<configuration>
98153
<includes>
99154
<include>**/*Test.java</include>
@@ -131,16 +186,7 @@
131186
</configuration>
132187
</plugin>
133188
</plugins>
134-
<directory>${project.basedir}/target</directory>
135-
<outputDirectory>${project.build.directory}/classes</outputDirectory>
136-
<finalName>${project.artifactId}-${project.version}</finalName>
137-
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
138-
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
139-
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
140189
<resources>
141-
<resource>
142-
<directory>${project.basedir}/src/main/resources</directory>
143-
</resource>
144190
<resource>
145191
<directory>${project.basedir}</directory>
146192
<includes>
@@ -151,11 +197,6 @@
151197
<targetPath>META-INF</targetPath>
152198
</resource>
153199
</resources>
154-
<testResources>
155-
<testResource>
156-
<directory>${project.basedir}/src/test/resources</directory>
157-
</testResource>
158-
</testResources>
159200
</build>
160201

161202
<dependencies>
@@ -168,7 +209,7 @@
168209
<dependency>
169210
<groupId>com.oracle.database.jdbc</groupId>
170211
<artifactId>ojdbc11</artifactId>
171-
<version>21.1.0.0</version>
212+
<version>${ojdbc.version}</version>
172213
</dependency>
173214
<dependency>
174215
<groupId>io.projectreactor</groupId>
@@ -215,6 +256,51 @@
215256

216257
</dependencies>
217258

259+
<profiles>
260+
<profile>
261+
<id>publication</id>
262+
<activation>
263+
<property>
264+
<name>release</name>
265+
</property>
266+
</activation>
267+
<build>
268+
<plugins>
269+
<plugin>
270+
<groupId>org.apache.maven.plugins</groupId>
271+
<artifactId>maven-javadoc-plugin</artifactId>
272+
<executions>
273+
<execution>
274+
<id>attach-javadocs</id>
275+
<goals>
276+
<goal>jar</goal>
277+
</goals>
278+
<configuration>
279+
<attach>true</attach>
280+
</configuration>
281+
</execution>
282+
</executions>
283+
</plugin>
284+
<plugin>
285+
<groupId>org.apache.maven.plugins</groupId>
286+
<artifactId>maven-source-plugin</artifactId>
287+
<executions>
288+
<execution>
289+
<id>attach-sources</id>
290+
<goals>
291+
<goal>jar</goal>
292+
</goals>
293+
<configuration>
294+
<attach>true</attach>
295+
</configuration>
296+
</execution>
297+
</executions>
298+
</plugin>
299+
</plugins>
300+
</build>
301+
</profile>
302+
</profiles>
303+
218304
</project>
219305

220306
<!--

0 commit comments

Comments
 (0)