Author: veithen
Date: Sat Sep 5 12:08:19 2015
New Revision: 1701376
URL: http://svn.apache.org/r1701376
Log:
Use gmavenplus-plugin instead of groovy-maven-plugin (which is no longer
maintained).
Modified:
webservices/axiom/trunk/apidocs/pom.xml
webservices/axiom/trunk/distribution/pom.xml
webservices/axiom/trunk/pom.xml
webservices/axiom/trunk/systests/eclipse-tests/pom.xml
webservices/axiom/trunk/testing/xml-testsuite/pom.xml
Modified: webservices/axiom/trunk/apidocs/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/apidocs/pom.xml?rev=1701376&r1=1701375&r2=1701376&view=diff
==============================================================================
--- webservices/axiom/trunk/apidocs/pom.xml (original)
+++ webservices/axiom/trunk/apidocs/pom.xml Sat Sep 5 12:08:19 2015
@@ -119,8 +119,8 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>add-tracking-code</id>
@@ -129,44 +129,46 @@
<goal>execute</goal>
</goals>
<configuration>
- <source><![CDATA[
- import javax.xml.parsers.*
- import javax.xml.transform.*
- import javax.xml.transform.dom.*
- import javax.xml.transform.stream.*
- import javax.xml.xpath.*
-
- import groovy.io.FileType
-
- def siteXml = new File(basedir,
'../src/site/site.xml')
- def javadocDir = new
File(project.reporting.outputDirectory)
-
- // Extract tracking code from site.xml
- def builder =
DocumentBuilderFactory.newInstance().newDocumentBuilder()
- def xpath =
XPathFactory.newInstance().newXPath()
- def nodes =
xpath.evaluate('/project/body/head/*', builder.parse(siteXml),
XPathConstants.NODESET)
- def transformer =
TransformerFactory.newInstance().newTransformer()
-
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, 'yes')
- def sw = new StringWriter()
- def result = new StreamResult(sw)
- nodes.each({ node -> transformer.transform(new
DOMSource(node), result) })
- def trackingCode = sw.toString()
-
- // Inject tracking code into Javadoc HTML files
- javadocDir.eachFileRecurse(FileType.FILES, {
file ->
- if (file.name.endsWith('.html')) {
- def lines = file.readLines('UTF-8')
- def out = file.newPrintWriter('UTF-8')
- lines.each({ line ->
- if (line == '</head>') {
- out.println(trackingCode)
- }
- out.println(line)
- })
- out.close()
- }
- })
- ]]></source>
+ <scripts>
+ <script><![CDATA[
+ import javax.xml.parsers.*
+ import javax.xml.transform.*
+ import javax.xml.transform.dom.*
+ import javax.xml.transform.stream.*
+ import javax.xml.xpath.*
+
+ import groovy.io.FileType
+
+ def siteXml = new File(basedir,
'../src/site/site.xml')
+ def javadocDir = new
File(project.reporting.outputDirectory)
+
+ // Extract tracking code from site.xml
+ def builder =
DocumentBuilderFactory.newInstance().newDocumentBuilder()
+ def xpath =
XPathFactory.newInstance().newXPath()
+ def nodes =
xpath.evaluate('/project/body/head/*', builder.parse(siteXml),
XPathConstants.NODESET)
+ def transformer =
TransformerFactory.newInstance().newTransformer()
+
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, 'yes')
+ def sw = new StringWriter()
+ def result = new StreamResult(sw)
+ nodes.each({ node ->
transformer.transform(new DOMSource(node), result) })
+ def trackingCode = sw.toString()
+
+ // Inject tracking code into Javadoc HTML
files
+ javadocDir.eachFileRecurse(FileType.FILES,
{ file ->
+ if (file.name.endsWith('.html')) {
+ def lines = file.readLines('UTF-8')
+ def out =
file.newPrintWriter('UTF-8')
+ lines.each({ line ->
+ if (line == '</head>') {
+ out.println(trackingCode)
+ }
+ out.println(line)
+ })
+ out.close()
+ }
+ })
+ ]]></script>
+ </scripts>
</configuration>
</execution>
</executions>
Modified: webservices/axiom/trunk/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/distribution/pom.xml?rev=1701376&r1=1701375&r2=1701376&view=diff
==============================================================================
--- webservices/axiom/trunk/distribution/pom.xml (original)
+++ webservices/axiom/trunk/distribution/pom.xml Sat Sep 5 12:08:19 2015
@@ -96,8 +96,8 @@
<finalName>axiom-${project.version}</finalName>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>generate-timestamp</id>
@@ -106,11 +106,13 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- import java.util.Date
- import java.text.MessageFormat
- project.properties['build_date'] =
MessageFormat.format("{0,date,MMMMM dd, yyyy}", new Date())
- </source>
+ <scripts>
+ <script>
+ import java.util.Date
+ import java.text.MessageFormat
+ project.properties['build_date'] =
MessageFormat.format("{0,date,MMMMM dd, yyyy}", new Date())
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>
Modified: webservices/axiom/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1701376&r1=1701375&r2=1701376&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Sat Sep 5 12:08:19 2015
@@ -593,9 +593,16 @@
<version>2.2-beta-5</version>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
- <version>2.0</version>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>1.5</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>2.4.4</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
@@ -645,8 +652,8 @@
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
- <groupId>org.codehaus.gmaven</groupId>
-
<artifactId>groovy-maven-plugin</artifactId>
+
<groupId>org.codehaus.gmavenplus</groupId>
+
<artifactId>gmavenplus-plugin</artifactId>
<versionRange>[0.0.0,)</versionRange>
<goals>
<goal>execute</goal>
@@ -729,8 +736,8 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>initialize</id>
@@ -739,33 +746,35 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- import java.io.File
-
- <!-- Avoid chicken and egg problem with
jar-resource-bundle -->
- if (project.packaging == 'pom') {
- project.properties['skipRemoteResources']
= 'true'
- }
-
- <!-- Since we don't generate Maven sites for
submodules the project URLs computed by Maven
- (parent project URL + artifact ID) are
wrong. Make sure that the URL is explicitly set
- to the right location, at least for
modules that deploy artifacts. -->
- if (project.properties['skipDeploy'] ==
'false' && project.properties['skipSite'] == 'true' &&
project.url != 'http://ws.apache.org/axiom/') {
- throw new Error('Invalid project URL')
- }
-
- <!-- Create the temporary directory specified
in the surefire configuration -->
- new File(project.build.directory,
'tmp').mkdirs()
-
- <!-- Skip Jacoco if necessary -->
- if (System.properties['skipTests'] == 'true') {
- println 'Disabling JaCoCo because tests
are skipped'
- project.properties['skipJacoco'] = 'true'
- } else if
(System.properties['java.specification.version'] == '1.8') {
- println 'WARNING: Java 1.8 not supported;
disabling JaCoCo'
- project.properties['skipJacoco'] = 'true'
- }
- </source>
+ <scripts>
+ <script><![CDATA[
+ import java.io.File
+
+ // Avoid chicken and egg problem with
jar-resource-bundle
+ if (project.packaging == 'pom') {
+
project.properties['skipRemoteResources'] = 'true'
+ }
+
+ // Since we don't generate Maven sites for
submodules the project URLs computed by Maven
+ // (parent project URL + artifact ID) are
wrong. Make sure that the URL is explicitly set
+ // to the right location, at least for
modules that deploy artifacts.
+ if (project.properties['skipDeploy'] ==
'false' && project.properties['skipSite'] == 'true' && project.url !=
'http://ws.apache.org/axiom/') {
+ throw new Error('Invalid project URL')
+ }
+
+ // Create the temporary directory
specified in the surefire configuration
+ new File(project.build.directory,
'tmp').mkdirs()
+
+ // Skip Jacoco if necessary
+ if (System.properties['skipTests'] ==
'true') {
+ println 'Disabling JaCoCo because
tests are skipped'
+ project.properties['skipJacoco'] =
'true'
+ } else if
(System.properties['java.specification.version'] == '1.8') {
+ println 'WARNING: Java 1.8 not
supported; disabling JaCoCo'
+ project.properties['skipJacoco'] =
'true'
+ }
+ ]]></script>
+ </scripts>
</configuration>
</execution>
<execution>
@@ -775,11 +784,13 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- if (project.properties['skipJacoco'] == 'true'
|| !new File(project.build.directory, 'jacoco.exec').exists()) {
- project.properties['skipJacocoAttach'] =
'true'
- }
- </source>
+ <scripts>
+ <script>
+ if (project.properties['skipJacoco'] ==
'true' || !new File(project.build.directory, 'jacoco.exec').exists()) {
+ project.properties['skipJacocoAttach']
= 'true'
+ }
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>
Modified: webservices/axiom/trunk/systests/eclipse-tests/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/eclipse-tests/pom.xml?rev=1701376&r1=1701375&r2=1701376&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/eclipse-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/eclipse-tests/pom.xml Sat Sep 5 12:08:19
2015
@@ -65,8 +65,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<!-- Need this to pass information to the hook
scripts. Once maven-invoker-plugin 1.9 is released,
@@ -78,18 +78,20 @@
</goals>
<inherited>false</inherited>
<configuration>
- <source>
- import java.io.*
- import java.util.*
-
- dir = new File(project.build.directory, "it")
- dir.mkdirs()
- props = new Properties()
- props.setProperty("version", project.version)
- stream = new FileOutputStream(new File(dir,
"script.properties"))
- props.store(stream, null)
- stream.close()
- </source>
+ <scripts>
+ <script>
+ import java.io.*
+ import java.util.*
+
+ dir = new File(project.build.directory,
"it")
+ dir.mkdirs()
+ props = new Properties()
+ props.setProperty("version",
project.version)
+ stream = new FileOutputStream(new
File(dir, "script.properties"))
+ props.store(stream, null)
+ stream.close()
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>
Modified: webservices/axiom/trunk/testing/xml-testsuite/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-testsuite/pom.xml?rev=1701376&r1=1701375&r2=1701376&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/xml-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/xml-testsuite/pom.xml Sat Sep 5 12:08:19
2015
@@ -66,8 +66,8 @@
</resources>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
@@ -75,10 +75,10 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
+ <scripts>
<!-- This generates a list of the files in
src/main/resources/org/apache/axiom/ts/xml/bulk.
This is useful when loading these files
from the classpath. -->
- <![CDATA[
+ <script><![CDATA[
def filelist = new
File(project.build.directory,
"generated-resources/org/apache/axiom/ts/xml/bulk/filelist");
filelist.parentFile.mkdirs();
filelist.delete();
@@ -87,8 +87,8 @@
filelist.append("$it.name\n");
}
})
- ]]>
- </source>
+ ]]></script>
+ </scripts>
</configuration>
</execution>
</executions>
