This is an automated email from the ASF dual-hosted git repository. elserj pushed a commit to branch 344-rc0-feedback in repository https://gitbox.apache.org/repos/asf/incubator-ratis-thirdparty.git
commit 6f7042d4a75bd94f1037fba6861203da82b8bcdc Author: Josh Elser <[email protected]> AuthorDate: Tue Oct 16 12:53:51 2018 -0400 RATIS-344 Rename artifacts and including incubating in release artifact name Also bumps up the apache.pom to 21 over 19 which fixes the issues with `mvn clean` on the shade plugin --- dev-support/make_rc.sh | 3 +- hadoop/pom.xml | 4 +- hadoop/src/main/resources/META-INF/DISCLAIMER | 7 +++ {thirdparty => misc}/pom.xml | 8 ++-- .../src/main/appended-resources/META-INF/LICENSE | 0 .../src/main/appended-resources/META-INF/NOTICE | 0 misc/src/main/resources/META-INF/DISCLAIMER | 7 +++ pom.xml | 50 +++------------------- 8 files changed, 28 insertions(+), 51 deletions(-) diff --git a/dev-support/make_rc.sh b/dev-support/make_rc.sh index ff3900e..18b621d 100755 --- a/dev-support/make_rc.sh +++ b/dev-support/make_rc.sh @@ -80,7 +80,8 @@ repodir=`cd ${repodir} > /dev/null; pwd` mkdir "${archivedir}" archivedir=`cd ${archivedir} > /dev/null; pwd` artifactid=$(mvnGet project.artifactId) -version=$(mvnGet project.version) +# Need to include "incubating" in the artifact +version="$(mvnGet project.version)-incubating" # Make sure to clean up all state before building the src-tarball mvnRun clean diff --git a/hadoop/pom.xml b/hadoop/pom.xml index 4b30f62..46efd41 100644 --- a/hadoop/pom.xml +++ b/hadoop/pom.xml @@ -16,7 +16,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.ratis</groupId> - <artifactId>ratis-thirdparty-parent</artifactId> + <artifactId>ratis-thirdparty</artifactId> <version>0.1.0-SNAPSHOT</version> </parent> <artifactId>ratis-thirdparty-hadoop</artifactId> @@ -26,7 +26,7 @@ <dependencies> <dependency> <groupId>org.apache.ratis</groupId> - <artifactId>ratis-thirdparty</artifactId> + <artifactId>ratis-thirdparty-misc</artifactId> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop/src/main/resources/META-INF/DISCLAIMER b/hadoop/src/main/resources/META-INF/DISCLAIMER new file mode 100644 index 0000000..132b1e0 --- /dev/null +++ b/hadoop/src/main/resources/META-INF/DISCLAIMER @@ -0,0 +1,7 @@ +Apache Ratis is an effort undergoing incubation at The Apache Software +Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required +of all newly accepted projects until a further review indicates that the +infrastructure, communications, and decision making process have stabilized in +a manner consistent with other successful ASF projects. While incubation status +is not necessarily a reflection of the completeness or stability of the code, +it does indicate that the project has yet to be fully endorsed by the ASF. diff --git a/thirdparty/pom.xml b/misc/pom.xml similarity index 97% rename from thirdparty/pom.xml rename to misc/pom.xml index da792c0..ee01d4c 100644 --- a/thirdparty/pom.xml +++ b/misc/pom.xml @@ -16,13 +16,13 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.ratis</groupId> - <artifactId>ratis-thirdparty-parent</artifactId> + <artifactId>ratis-thirdparty</artifactId> <version>0.1.0-SNAPSHOT</version> </parent> - <artifactId>ratis-thirdparty</artifactId> - <name>Apache Ratis Thirdparty</name> + <artifactId>ratis-thirdparty-misc</artifactId> + <name>Apache Ratis Thirdparty Miscellaneous</name> <packaging>jar</packaging> - <description>Thirdparty dependencies for Apache Ratis</description> + <description>Miscellaneous thirdparty dependencies for Apache Ratis</description> <dependencies> <dependency> <groupId>com.google.protobuf</groupId> diff --git a/thirdparty/src/main/appended-resources/META-INF/LICENSE b/misc/src/main/appended-resources/META-INF/LICENSE similarity index 100% rename from thirdparty/src/main/appended-resources/META-INF/LICENSE rename to misc/src/main/appended-resources/META-INF/LICENSE diff --git a/thirdparty/src/main/appended-resources/META-INF/NOTICE b/misc/src/main/appended-resources/META-INF/NOTICE similarity index 100% rename from thirdparty/src/main/appended-resources/META-INF/NOTICE rename to misc/src/main/appended-resources/META-INF/NOTICE diff --git a/misc/src/main/resources/META-INF/DISCLAIMER b/misc/src/main/resources/META-INF/DISCLAIMER new file mode 100644 index 0000000..132b1e0 --- /dev/null +++ b/misc/src/main/resources/META-INF/DISCLAIMER @@ -0,0 +1,7 @@ +Apache Ratis is an effort undergoing incubation at The Apache Software +Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required +of all newly accepted projects until a further review indicates that the +infrastructure, communications, and decision making process have stabilized in +a manner consistent with other successful ASF projects. While incubation status +is not necessarily a reflection of the completeness or stability of the code, +it does indicate that the project has yet to be fully endorsed by the ASF. diff --git a/pom.xml b/pom.xml index 204a317..8f94995 100644 --- a/pom.xml +++ b/pom.xml @@ -17,19 +17,19 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>18</version> + <version>21</version> <relativePath /> <!-- resolve from repository --> </parent> - <artifactId>ratis-thirdparty-parent</artifactId> + <artifactId>ratis-thirdparty</artifactId> <groupId>org.apache.ratis</groupId> <version>0.1.0-SNAPSHOT</version> - <name>Apache Ratis Thirdparty Parent</name> + <name>Apache Ratis Thirdparty</name> <packaging>pom</packaging> <description>Thirdparty dependencies for Apache Ratis</description> <url>https://ratis.apache.org/</url> <inceptionYear>2017</inceptionYear> <modules> - <module>thirdparty</module> + <module>misc</module> <module>hadoop</module> </modules> <licenses> @@ -54,22 +54,8 @@ <!-- Maven plugin versions --> <maven-bundle-plugin.version>2.5.3</maven-bundle-plugin.version> <maven-checkstyle-plugin.version>2.15</maven-checkstyle-plugin.version> - <maven-clean-plugin.version>3.0.0</maven-clean-plugin.version> - <maven-dependency-plugin.version>2.10</maven-dependency-plugin.version> - <maven-deploy-plugin.version>2.8.1</maven-deploy-plugin.version> - <maven-install-plugin.version>2.5.1</maven-install-plugin.version> - <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version> - <maven-resources-plugin.version>2.6</maven-resources-plugin.version> - <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version> - <maven-site-plugin.version>3.5</maven-site-plugin.version> - <maven-source-plugin.version>2.3</maven-source-plugin.version> - - <!-- - ! Can be removed if changing to ASF parent version 19 - --> - <apache-rat-plugin.version>0.12</apache-rat-plugin.version> + <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version> <exec-maven-plugin.version>1.3.1</exec-maven-plugin.version> - <findbugs.version>3.0.0</findbugs.version> <native-maven-plugin.version>1.0-alpha-8</native-maven-plugin.version> <!-- define the Java language version used by the compiler --> @@ -95,7 +81,7 @@ <dependencies> <dependency> <groupId>org.apache.ratis</groupId> - <artifactId>ratis-thirdparty</artifactId> + <artifactId>ratis-thirdparty-misc</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -168,15 +154,6 @@ <pluginManagement> <plugins> <plugin> - <artifactId>maven-shade-plugin</artifactId> - <version>${maven-shade-plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>${maven-install-plugin.version}</version> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>${maven-javadoc-plugin.version}</version> @@ -194,22 +171,12 @@ <version>${native-maven-plugin.version}</version> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>${maven-resources-plugin.version}</version> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <version>${exec-maven-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>${maven-dependency-plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <configuration> <rules> @@ -264,11 +231,6 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>${maven-deploy-plugin.version}</version> - </plugin> - <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <version>${apache-rat-plugin.version}</version>
