Skip to content

Commit

Permalink
Replace outdated Sonatype parent POM with plugin definitions #1258
Browse files Browse the repository at this point in the history
  • Loading branch information
@mp911de
mp911de committed Apr 2, 2020
1 parent 3741d63 commit e8411b0
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 29 deletions.
7 changes: 1 addition & 6 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
target/
*.rdb
*.aof

-
atlassian-ide-plugin.xml
*.iml
Expand All @@ -14,8 +13,4 @@ work/
.settings
dependency-reduced-pom.xml
.idea
.vagrant
Vagrantfile
CluTest.java

CluTest.java
.flattened-pom.xml
85 changes: 62 additions & 23 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>9</version>
</parent>

<groupId>io.lettuce</groupId>
<artifactId>lettuce-core</artifactId>
<version>6.0.0.BUILD-SNAPSHOT</version>
Expand Down Expand Up @@ -45,14 +40,14 @@
</issueManagement>

<developers>
<developer>
<id>will</id>
<name>Will Glozer</name>
</developer>
<developer>
<id>mp911de</id>
<name>Mark Paluch</name>
</developer>
<developer>
<id>will</id>
<name>Will Glozer</name>
</developer>
</developers>

<properties>
Expand Down Expand Up @@ -94,6 +89,19 @@
<tag>HEAD</tag>
</scm>

<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<dependencyManagement>
<dependencies>

Expand Down Expand Up @@ -495,7 +503,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
</plugin>

<plugin>
Expand All @@ -513,7 +521,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.0</version>
</plugin>

<plugin>
Expand All @@ -525,7 +533,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -563,13 +571,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.1</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
</plugin>

<plugin>
Expand All @@ -594,6 +602,37 @@

<plugins>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>oss</flattenMode>
<pomElements>
<distributionManagement>remove</distributionManagement>
<properties>remove</properties>
<repositories>remove</repositories>
<profiles>remove</profiles>
</pomElements>
</configuration>
</execution>
<execution>
<id>flatten-clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down Expand Up @@ -722,7 +761,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down Expand Up @@ -773,7 +811,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<id>bin</id>
Expand Down Expand Up @@ -902,7 +939,7 @@
<arguments>
<argument>-Xmx2G</argument>
<argument>-classpath</argument>
<classpath />
<classpath/>
<argument>org.openjdk.jmh.Main</argument>
<argument>.*</argument>
<argument>-tu</argument>
Expand Down Expand Up @@ -976,7 +1013,9 @@
<phase>process-resources</phase>
<configuration>
<target>
<copy failonerror="false" file="${project.build.directory}/generated-docs/index.pdf" tofile="target/site/reference/pdf/lettuce-reference.pdf" />
<copy failonerror="false"
file="${project.build.directory}/generated-docs/index.pdf"
tofile="target/site/reference/pdf/lettuce-reference.pdf"/>
</target>
</configuration>
<goals>
Expand Down Expand Up @@ -1043,9 +1082,9 @@
<toclevels>3</toclevels>
<numbered>true</numbered>
<ext-doc>https://raw.githubusercontent.com/wiki/lettuce-io/lettuce-core/</ext-doc>
<allow-uri-read />
<docinfo />
<toc2 />
<allow-uri-read/>
<docinfo/>
<toc2/>
<icons>font</icons>
<source-highlighter>coderay</source-highlighter>
</attributes>
Expand Down

0 comments on commit e8411b0

Please sign in to comment.