Skip to content

Commit 0476d76

Browse files
mikebell90mikebell90
authored
Merge branch 'master' into update.postgres
2 parents 62de4d4 + 723c3dd commit 0476d76

File tree

1 file changed

+16
-190
lines changed

1 file changed

+16
-190
lines changed

‎pom.xml‎

Lines changed: 16 additions & 190 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
<parent>
2121
<groupId>org.basepom</groupId>
22-
<artifactId>basepom-minimal</artifactId>
23-
<version>55</version>
22+
<artifactId>basepom-oss</artifactId>
23+
<version>63</version>
2424
</parent>
2525

2626
<scm>
@@ -32,18 +32,11 @@
3232

3333
<groupId>com.opentable.components</groupId>
3434
<artifactId>otj-pg-embedded</artifactId>
35-
<version>1.1.1-SNAPSHOT</version>
35+
<version>1.1.2-SNAPSHOT</version>
3636
<description>Embedded PostgreSQL driver</description>
37+
<url>https://github.com/opentable/otj-pg-embedded</url>
3738

3839
<properties>
39-
<dep.plugin.gpg.version>3.1.0</dep.plugin.gpg.version>
40-
<dep.plugin.license.version>4.2</dep.plugin.license.version>
41-
<basepom.check.phase-license>validate</basepom.check.phase-license> <!-- this is overriding basepom default -->
42-
<basepom.license.skip-existing>true</basepom.license.skip-existing>
43-
<basepom.release.profiles>basepom.oss-release,oss-build</basepom.release.profiles>
44-
45-
<basepom.check.skip-license>${basepom.check.skip-extended}</basepom.check.skip-license>
46-
<basepom.check.fail-license>${basepom.check.fail-extended}</basepom.check.fail-license>
4740
<basepom.check.skip-spotbugs>true</basepom.check.skip-spotbugs>
4841
<project.build.targetJdk>11</project.build.targetJdk>
4942
<maven.compiler.target>${project.build.targetJdk}</maven.compiler.target>
@@ -64,6 +57,10 @@
6457
<basepom.check.skip-javadoc>false</basepom.check.skip-javadoc>
6558
<basepom.check.fail-javadoc>false</basepom.check.fail-javadoc>
6659
<moduleName>com.opentable.components.otj.pg.embedded</moduleName>
60+
<basepom.central-publishing.repo-id>ot-central</basepom.central-publishing.repo-id>
61+
<basepom.deploy.snapshot.repo-id>opentable.snapshot</basepom.deploy.snapshot.repo-id>
62+
<basepom.deploy.snapshot.url>https://artifactory.otenv.com/snapshots</basepom.deploy.snapshot.url>
63+
<basepom.release.profiles>basepom.central-release</basepom.release.profiles>
6764
</properties>
6865

6966
<licenses>
@@ -75,6 +72,14 @@
7572
</license>
7673
</licenses>
7774

75+
<developers>
76+
<developer>
77+
<id>opentable</id>
78+
<name>OpenTable</name>
79+
<url>https://github.com/opentable</url>
80+
</developer>
81+
</developers>
82+
7883
<dependencies>
7984
<dependency>
8085
<groupId>org.slf4j</groupId>
@@ -94,8 +99,6 @@
9499
<scope>runtime</scope>
95100
</dependency>
96101

97-
98-
99102
<dependency>
100103
<groupId>org.flywaydb</groupId>
101104
<artifactId>flyway-core</artifactId>
@@ -217,181 +220,4 @@
217220
</plugins>
218221
</build>
219222

220-
<profiles>
221-
<profile>
222-
<id>oss-build</id>
223-
<activation>
224-
<file>
225-
<exists>.oss-build</exists>
226-
</file>
227-
</activation>
228-
229-
<!-- note the main difference is released artifacts go to oss.sonatype instead of internal -->
230-
<distributionManagement>
231-
<snapshotRepository>
232-
<id>opentable.snapshot</id>
233-
<name>opentable-snapshots</name>
234-
<uniqueVersion>true</uniqueVersion>
235-
<url>https://artifactory.otenv.com/snapshots</url>
236-
</snapshotRepository>
237-
<repository>
238-
<id>sonatype-nexus-staging</id>
239-
<name>Nexus Release Repository</name>
240-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
241-
</repository>
242-
</distributionManagement>
243-
<build>
244-
<pluginManagement>
245-
<plugins>
246-
<plugin>
247-
<groupId>org.apache.maven.plugins</groupId>
248-
<artifactId>maven-release-plugin</artifactId>
249-
<configuration>
250-
<!-- activate some basepom stuff, this binds the profile below -->
251-
<releaseProfiles>${basepom.release.profiles}</releaseProfiles>
252-
</configuration>
253-
</plugin>
254-
255-
<!-- checks for valid OSS license stuff and headers -->
256-
<plugin>
257-
<groupId>com.mycila</groupId>
258-
<artifactId>license-maven-plugin</artifactId>
259-
<version>${dep.plugin.license.version}</version>
260-
<dependencies>
261-
<dependency>
262-
<groupId>org.basepom</groupId>
263-
<artifactId>basepom-policy</artifactId>
264-
<version>${dep.basepom-policy.version}</version>
265-
</dependency>
266-
</dependencies>
267-
<configuration>
268-
<skip>${basepom.check.skip-license}</skip>
269-
<skipExistingHeaders>${basepom.license.skip-existing}</skipExistingHeaders>
270-
<failIfMissing>${basepom.check.fail-license}</failIfMissing>
271-
<header>license/basepom-apache-license-header.txt</header>
272-
<headerDefinitions>
273-
<headerDefinition>license/xml-prefix.xml</headerDefinition>
274-
</headerDefinitions>
275-
<mapping>
276-
<xml>XML_PREFIX</xml>
277-
<java>SLASHSTAR_STYLE</java>
278-
<yaml>SCRIPT_STYLE</yaml>
279-
</mapping>
280-
<strictCheck>true</strictCheck>
281-
<aggregate>true</aggregate>
282-
<useDefaultExcludes>true</useDefaultExcludes>
283-
<encoding>${project.build.sourceEncoding}</encoding>
284-
<excludes>
285-
<exclude>.*/**</exclude>
286-
<exclude>**/*.md</exclude>
287-
<exclude>**/*.rst</exclude>
288-
<exclude>**/*.adoc</exclude>
289-
<exclude>**/*.sh</exclude>
290-
<exclude>**/*.txt</exclude>
291-
<exclude>**/*.thrift</exclude>
292-
<exclude>**/*.proto</exclude>
293-
<exclude>**/*.g</exclude>
294-
<exclude>**/*.releaseBackup</exclude>
295-
<exclude>**/*.vm</exclude>
296-
<exclude>**/*.st</exclude>
297-
<exclude>**/*.raw</exclude>
298-
<exclude>**/*.ser</exclude>
299-
<exclude>**/src/license/**</exclude>
300-
</excludes>
301-
<includes>
302-
<include>src/**</include>
303-
<include>**/pom.xml</include>
304-
</includes>
305-
</configuration>
306-
</plugin>
307-
308-
<!-- sign with gpg -->
309-
<plugin>
310-
<groupId>org.apache.maven.plugins</groupId>
311-
<artifactId>maven-gpg-plugin</artifactId>
312-
<version>${dep.plugin.gpg.version}</version>
313-
<configuration>
314-
<useAgent>true</useAgent>
315-
</configuration>
316-
</plugin>
317-
</plugins>
318-
</pluginManagement>
319-
320-
<!-- more license checking. One day I'll know why both of these -->
321-
<plugins>
322-
<plugin>
323-
<groupId>com.mycila</groupId>
324-
<artifactId>license-maven-plugin</artifactId>
325-
<executions>
326-
<execution>
327-
<id>basepom.default</id>
328-
<phase>${basepom.check.phase-license}</phase>
329-
<goals>
330-
<goal>check</goal>
331-
</goals>
332-
</execution>
333-
</executions>
334-
</plugin>
335-
</plugins>
336-
</build>
337-
</profile>
338-
339-
<!-- Active during OSS release:perform -->
340-
<profile>
341-
<id>basepom.oss-release</id>
342-
<properties>
343-
<!-- tests run in the preparation step of the release -->
344-
<skipTests>true</skipTests>
345-
</properties>
346-
<build>
347-
<plugins>
348-
<!-- oss requires a javadoc jar. Build one when releasing. -->
349-
<plugin>
350-
<groupId>org.apache.maven.plugins</groupId>
351-
<artifactId>maven-javadoc-plugin</artifactId>
352-
<executions>
353-
<execution>
354-
<id>attach-javadocs</id>
355-
<phase>package</phase>
356-
<goals>
357-
<goal>jar</goal>
358-
</goals>
359-
</execution>
360-
</executions>
361-
</plugin>
362-
<!-- if necessary, build a scaladoc jar. Disabled by default. -->
363-
<!-- <plugin>-->
364-
<!-- <groupId>net.alchim31.maven</groupId>-->
365-
<!-- <artifactId>scala-maven-plugin</artifactId>-->
366-
<!-- <executions>-->
367-
<!-- <execution>-->
368-
<!-- <id>attach-scaladocs</id>-->
369-
<!-- <phase>package</phase>-->
370-
<!-- <configuration>-->
371-
<!-- <skip>${basepom.oss.skip-scala-doc}</skip>-->
372-
<!-- </configuration>-->
373-
<!-- <goals>-->
374-
<!-- <goal>doc-jar</goal>-->
375-
<!-- </goals>-->
376-
<!-- </execution>-->
377-
<!-- </executions>-->
378-
<!-- </plugin>-->
379-
<!-- Sign artifacts using gpg for oss upload -->
380-
<plugin>
381-
<groupId>org.apache.maven.plugins</groupId>
382-
<artifactId>maven-gpg-plugin</artifactId>
383-
<executions>
384-
<execution>
385-
<id>basepom.sign-artifacts</id>
386-
<phase>verify</phase>
387-
<goals>
388-
<goal>sign</goal>
389-
</goals>
390-
</execution>
391-
</executions>
392-
</plugin>
393-
</plugins>
394-
</build>
395-
</profile>
396-
</profiles>
397223
</project>

0 commit comments

Comments
 (0)