rename parent-pom-1-rc4 which was released to parent-pom-1
git-svn-id: https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-1@1038482 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/README.txt b/README.txt
index 6667986..8c38734 100644
--- a/README.txt
+++ b/README.txt
@@ -7,5 +7,5 @@
mvn clean install
-A list of issues fixed is in issuesFixed/jira-remote.html.
+A list of issues fixed is in issuesFixed/jira-report.html.
diff --git a/marker-file-identifying-parent-pom b/marker-file-identifying-parent-pom
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/marker-file-identifying-parent-pom
diff --git a/pom.xml b/pom.xml
index d847ecd..d30693c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,13 +126,13 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-1
+ scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-1-rc4
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-1
+ scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-1-rc4
</developerConnection>
<url>
- http://svn.apache.org/viewvc/uima/build/tags/parent-pom-1
+ http://svn.apache.org/viewvc/uima/build/tags/parent-pom-1-rc4
</url>
</scm>
@@ -333,6 +333,12 @@
<artifactId>maven-dependency-plugin</artifactId>
<version>2.1</version>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -544,35 +550,24 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>2.3</version>
-
- <configuration>
- <fixVersionIds>${jiraVersion}</fixVersionIds>
- <columnNames>Type,Key,Summary</columnNames>
- <resolutionIds>Fixed</resolutionIds>
- <statusIds>Closed</statusIds>
- <sortColumnNames>Type, Key</sortColumnNames>
- <outputDirectory>${basedir}/issuesFixed/</outputDirectory>
- <maxEntries>1000</maxEntries> <!-- hopefully, bigger than ever needed -->
- </configuration>
- </plugin>
-
- <!-- this overrides the apache:7 pom to
- use this resource bundle which
- allows additional text after the NOTICE file -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
+ <executions>
<execution>
- <goals><goal>process</goal></goals>
+ <id>default-cli</id>
+ <goals><goal>jira-report</goal></goals>
+ <!-- don't use generate-sources - because javadoc plugin re-exec's that -->
+ <phase>generate-resources</phase>
<configuration>
- <resourceBundles>
- <resourceBundle>org.apache.uima:uima-build-resources:${uimaBuildResourcesVersion}</resourceBundle>
- </resourceBundles>
+ <fixVersionIds>${jiraVersion}</fixVersionIds>
+ <columnNames>Type,Key,Summary</columnNames>
+ <resolutionIds>Fixed</resolutionIds>
+ <statusIds>Closed</statusIds>
+ <sortColumnNames>Type, Key</sortColumnNames>
+ <outputDirectory>${basedir}/issuesFixed/</outputDirectory>
+ <maxEntries>1000</maxEntries> <!-- hopefully, bigger than ever needed -->
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</pluginManagement>
@@ -602,6 +597,52 @@
</plugin>
<plugin>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uima-build-helper-maven-plugin</artifactId>
+ <version>2</version>
+ <executions>
+ <execution>
+ <id>set buildYear and buildMonth</id>
+ <goals><goal>parse-date-time</goal></goals>
+ <configuration>
+ <parseSpecs>
+ <parseSpec>
+ <name>buildYear</name>
+ <format>yyyy</format>
+ </parseSpec>
+ <parseSpec>
+ <name>buildMonth</name>
+ <format>MMMM</format>
+ </parseSpec>
+ </parseSpecs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- this overrides the apache:7 pom to
+ use this resource bundle which
+ allows additional text after the NOTICE file
+
+ Note: putting this in the pluginManagement section
+ fails to override the configuration from the
+ Apache common parent pom -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals><goal>process</goal></goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache.uima:uima-build-resources:${uimaBuildResourcesVersion}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<executions>
@@ -609,12 +650,13 @@
<id>default-cli</id>
<configuration>
<excludes>
- <exclude>release.properties</exclude>
+ <exclude>release.properties</exclude> <!-- generated file -->
<exclude>README*</exclude>
<exclude>RELEASE_NOTES*</exclude>
- <exclude>issuesFixed/**</exclude>
+ <exclude>issuesFixed/**</exclude> <!-- generated file -->
<exclude>src/main/resources/docbook-shared/titlepage/*.xsl</exclude>
- <exclude>marker-file-identifying-*</exclude>
+ <exclude>marker-file-identifying-*</exclude> <!-- empty file -->
+ <exclude>DEPENDENCIES</exclude> <!-- generated file -->
</excludes>
</configuration>
</execution>
@@ -629,9 +671,16 @@
<profiles>
- <!-- ********************************** -->
- <!-- * apache-release * -->
- <!-- ********************************** -->
+ <!-- ************************************************** -->
+ <!-- * apache-release * -->
+ <!-- * NOTE: This profile is activated while * -->
+ <!-- * running the Maven build pipeline, usually * -->
+ <!-- * clean verify (for mvn release:prepare) or * -->
+ <!-- * deploy (for mvn release;perform), * -->
+ <!-- * but is not activated for the * -->
+ <!-- * outer execution for mvn release... * -->
+ <!-- * on the pom being released * -->
+ <!-- ************************************************** -->
<!-- fix apache common pom -->
<profile>
<id>apache-release</id>
@@ -671,8 +720,78 @@
</plugins>
</build>
</profile>
+
+ <!-- **************************************** -->
+ <!-- * Produce Jira report * -->
+ <!-- **************************************** -->
+ <profile>
+ <id>mavenJirareport</id>
+ <activation>
+ <!-- NOTE: if you try to make this work more generally, by
+ using a marker file in all top-level release projects,
+ this approach fails because for other top-level
+ release projects, it substitutes the value of
+ the jiraVersion property from the top level pom, not
+ the pom being released. So other release projects include
+ this kind of profile within themselves, in a profile
+ for "apache-release" triggered by name. -->
+
+ <!-- It would be nice to have this only run when releasing,
+ but the activation clauses are currently only
+ "ored" together, not "anded". -->
+
+ <file><exists>marker-file-identifying-parent-pom</exists></file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-cli</id>
+ <configuration>
+ <fixVersionIds>${jiraVersion}</fixVersionIds>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- **************************************** -->
+ <!-- * Override - don't produce Jira report * -->
+ <!-- **************************************** -->
+
+ <!-- NOTE: if you use this, you MUST check in
+ the generated Jira report into SVN, otherwise
+ it won't appear in the release assemblies. -->
+
+ <profile>
+ <id>mavenJirareportSkip</id>
+ <activation>
+ <property>
+ <name>maven.jiraReport.skip</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <!-- Skip jira report -->
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-cli</id>
+ <phase />
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<!-- ********************************** -->
<!-- * Docbook Processing * -->
<!-- ********************************** -->
@@ -733,31 +852,7 @@
</execution>
</executions>
</plugin-->
-
- <plugin>
- <groupId>org.apache.uima</groupId>
- <artifactId>uima-build-helper-maven-plugin</artifactId>
- <version>2</version>
- <executions>
- <execution>
- <id>set buildYear and buildMonth</id>
- <goals><goal>parse-date-time</goal></goals>
- <configuration>
- <parseSpecs>
- <parseSpec>
- <name>buildYear</name>
- <format>yyyy</format>
- </parseSpec>
- <parseSpec>
- <name>buildMonth</name>
- <format>MMMM</format>
- </parseSpec>
- </parseSpecs>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
+
<!-- use the dependency:unpack goal to get the shared resource
that has the docbook-shared directory
Unpack into spot relative to project - because
@@ -788,7 +883,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>uima-build-resources</artifactId>
<version>1-SNAPSHOT</version>
- <excludes>META-INF/**</excludes>
+ <includes>docbook-shared/**</includes>
<outputDirectory>${project.build.directory}</outputDirectory>
</artifactItem>
</artifactItems>
@@ -811,7 +906,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>uima-build-resources</artifactId>
<version>1-SNAPSHOT</version>
- <excludes>META-INF/**</excludes>
+ <includes>docbook-shared/**</includes>
<outputDirectory>${dolRepo}</outputDirectory>
</artifactItem>
</artifactItems>
@@ -1035,8 +1130,7 @@
</plugin>
</plugins>
</build>
- </profile>
-
+ </profile>
<!-- ********************************** -->
<!-- * Build Standard PEAR * -->
<!-- ********************************** -->
@@ -1229,7 +1323,6 @@
</descriptors>
<finalName>${assemblyFinalName}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
- <attach>false</attach> <!-- assembly results not put into Maven repos -->
</configuration>
</execution>
</executions>
@@ -1339,7 +1432,7 @@
</pluginManagement>
</build>
</profile>
-
+
<!-- **************************************** -->
<!-- * Build Simple Project Binary Assembly * -->
<!-- **************************************** -->
@@ -1414,7 +1507,7 @@
</plugins>
</build>
</profile>
-
+
</profiles>
</project>
\ No newline at end of file
