You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/01/19 17:34:28 UTC
[1/7] incubator-taverna-maven-parent git commit: derby version
10.12.1.1
Repository: incubator-taverna-maven-parent
Updated Branches:
refs/heads/master 3595851a8 -> 598390bb2
derby version 10.12.1.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/commit/145a0d1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/tree/145a0d1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/diff/145a0d1c
Branch: refs/heads/master
Commit: 145a0d1caf3ba76dc0f5526f6e49df2aa044eeac
Parents: 3595851
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Nov 3 18:48:07 2015 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Nov 3 18:48:07 2015 +0100
----------------------------------------------------------------------
pom.xml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/blob/145a0d1c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c6d7366..9ae20e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,10 +128,7 @@ upgraded - this leads to recursive spaghetti.
<commons.lang.version>2.5.0</commons.lang.version>
<commons.logging.version>1.1.1</commons.logging.version>
<commons.net.version>2.0.0</commons.net.version>
-<derbyclient.version>${derby.version}</derbyclient.version>
-<derbynet.version>${derby.version}</derbynet.version>
-<derbytools.version>${derby.version}</derbytools.version>
-<derby.version>10.5.1000001.764942</derby.version>
+<derby.version>10.12.1.1</derby.version>
<dom4j.version>1.6.1</dom4j.version>
<elmo.version>1.5</elmo.version>
<geronimo.spec.jta.version>1.0-M1</geronimo.spec.jta.version>
[6/7] incubator-taverna-maven-parent git commit: On when to put
versions in
Posted by st...@apache.org.
On when to put versions in <properties>
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/commit/d339f5f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/tree/d339f5f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/diff/d339f5f9
Branch: refs/heads/master
Commit: d339f5f97d13764eff1e30f989d44e850e49bd0c
Parents: b3a1c08
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Jan 19 14:30:19 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Jan 19 14:30:19 2016 +0000
----------------------------------------------------------------------
README.md | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/blob/d339f5f9/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index bdc59de..4d56c7a 100644
--- a/README.md
+++ b/README.md
@@ -26,14 +26,16 @@ you may want to build the Apache Taverna Parent version corresponding to
- Common plugins are defined in `<plugins>`.
- This parent does NOT define the version of org.apache.taverna modules, that should
be done within `<properties>` of each top-level project.
+- Versions of dependencies that are only used within one particular project
+(e.g. `beanshell.version` within `incubator-taverna-common-activities`)
+should rather be defined in the top-level `pom.xml` of that project.
## License
(c) 2010-2014 University of Manchester
-
-(c) 2014-2015 Apache Software Foundation
+(c) 2014-2016 Apache Software Foundation
This product includes software developed at The
[Apache Software Foundation](http://www.apache.org/).
[7/7] incubator-taverna-maven-parent git commit: (c) 2016 as well
Posted by st...@apache.org.
(c) 2016 as well
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/commit/598390bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/tree/598390bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/diff/598390bb
Branch: refs/heads/master
Commit: 598390bb2163921cbdacdbbe17dca4315c65aebc
Parents: d339f5f
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Jan 19 14:30:34 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Jan 19 14:30:34 2016 +0000
----------------------------------------------------------------------
NOTICE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/blob/598390bb/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 7a503d8..c1f1b4a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,6 +1,6 @@
Apache Taverna Maven Parent
Copyright 2010-2014 University of Manchester, UK
-Copyright 2014-2015 The Apache Software Foundation
+Copyright 2014-2016 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[5/7] incubator-taverna-maven-parent git commit: versions of some
deps moved to taverna-common-activities
Posted by st...@apache.org.
versions of some deps moved to taverna-common-activities
.. as they are only used there
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/commit/b3a1c085
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/tree/b3a1c085
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/diff/b3a1c085
Branch: refs/heads/master
Commit: b3a1c085e752b921bbeab064cdf318f11aa8ba95
Parents: e3cb2ed
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Jan 19 14:28:02 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Jan 19 14:28:02 2016 +0000
----------------------------------------------------------------------
pom.xml | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/blob/b3a1c085/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b8605ea..c3de3c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,16 +93,25 @@
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
- <!-- Version of dependencies
- Note that in some cases these versions refer to a
- springsource repackaging for OSGi, e.g.
- com.springsource.org.jdom
+ <!--
+ Versions of dependencies that are used across
+ incubator-taverna-* repositories (e.g. commons-io).
+
+ Versions of dependencies that are only used in one repository,
+ e.g. beanshell, should rather be listed in the top-level pom.xml
+ of their repository (e.g. incubator-taverna-common-activities).
+
+ Note that in some cases these versions refer to a
+ springsource repackaging for OSGi, e.g.
+ com.springsource.org.jdom.
+ Before changing a version it can be a good idea to
+ grep for whatever.version in all the source-code
+ repositories to see how it is used.
Do NOT put taverna.* versions in here, as we do not want
to update taverna-parent whenever a taverna-* has been
upgraded - this leads to recursive spaghetti.
-->
-<abdera.version>1.1.3</abdera.version>
<activation.version>1.1.1</activation.version>
<antlr.version>2.7.7</antlr.version>
<apache.commons.csv.version>1.0.0.BUILD-20080106</apache.commons.csv.version>
@@ -112,10 +121,9 @@ upgraded - this leads to recursive spaghetti.
<axis.jaxrpc.version>1.4</axis.jaxrpc.version>
<axis.sggj.version>1.4</axis.sggj.version>
<axis.version>1.4.0</axis.version>
-<axis.wsdl4j.version>1.5.1</axis.wsdl4j.version>
+<!--<axis.wsdl4j.version>1.5.1</axis.wsdl4j.version>-->
<batik.version>1.7.0</batik.version>
<bcprov.jdk16.version>1.46</bcprov.jdk16.version>
-<bsh.version>2.0b5</bsh.version>
<cglib.version>2.1.3</cglib.version>
<commons.beanutils.version>1.9.2</commons.beanutils.version>
<commons.cli.version>1.2.0</commons.cli.version>
@@ -139,13 +147,11 @@ upgraded - this leads to recursive spaghetti.
<jackson.version>2.3.3</jackson.version>
<!-- http://github.com/jai-imageio/ -->
<jai.imageio.core.version>1.3.0</jai.imageio.core.version>
-<javacsv.version>2.0</javacsv.version>
<javahelp.version>2.0.02</javahelp.version>
<javax.el.version>1.0.0</javax.el.version>
<javax.servlet.jsp.version>2.1.0</javax.servlet.jsp.version>
<javax.servlet.version>2.5.0</javax.servlet.version>
<javax.transaction.version>1.1.0</javax.transaction.version>
-<javax.wsdl.version>1.6.1</javax.wsdl.version>
<jaxb.version>2.2.11</jaxb.version>
<jaxen.version>1.1.1</jaxen.version>
<jaxp.ri.version>1.4</jaxp.ri.version>
@@ -156,7 +162,6 @@ upgraded - this leads to recursive spaghetti.
<jetty.version>6.1.24</jetty.version>
<jmimemagic.version>0.1.2</jmimemagic.version>
<jmoby.version>1.1.5-taverna</jmoby.version>
-<jsch.version>1.0.6.RELEASE</jsch.version>
<json.lib.version>2.3</json.lib.version>
<jsonld.version>0.5.1</jsonld.version>
<junit.version>4.11</junit.version>
@@ -167,8 +172,6 @@ upgraded - this leads to recursive spaghetti.
<mimeutil.version>2.1.2-6</mimeutil.version>
<mockito.version>1.9.5</mockito.version>
<mysql.connector.java.version>5.1.13</mysql.connector.java.version>
-<odfdom.version>0.7</odfdom.version>
-<!-- <odfdom.version>0.8.8-incubating</odfdom.version>-->
<opencsv.version>2.1</opencsv.version>
<opm.version>1.1.8</opm.version>
<org.fife.ui.hexeditor.version>1.0.2011-07-04</org.fife.ui.hexeditor.version>
@@ -183,7 +186,6 @@ upgraded - this leads to recursive spaghetti.
<osgi.compendium.version>4.3.1</osgi.compendium.version>
<poi.ooxml.version>3.6</poi.ooxml.version>
<poi.version>3.6</poi.version>
-<santuario.xmlsec.version>1.5.7</santuario.xmlsec.version>
<saxpath.version>1.0-FCS</saxpath.version>
<servletapi.version>2.5</servletapi.version>
<sesame.version>2.7.0</sesame.version>
@@ -193,7 +195,6 @@ upgraded - this leads to recursive spaghetti.
<spring.version>3.0.5.RELEASE</spring.version>
<stax.version>1.0</stax.version>
<tupelo.version>2.6</tupelo.version>
-<velocity.version>1.7</velocity.version>
<xalan.version>2.7.1</xalan.version>
<xerces.version>2.9.1</xerces.version>
<xmlbeans.version>2.4.0</xmlbeans.version>
[4/7] incubator-taverna-maven-parent git commit: TAVERNA-883 Avoid
specifying wss4j.version here
Posted by st...@apache.org.
TAVERNA-883 Avoid specifying wss4j.version here
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/commit/e3cb2edd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/tree/e3cb2edd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/diff/e3cb2edd
Branch: refs/heads/master
Commit: e3cb2eddb314b891ba45e4becbed2c80ff9907b0
Parents: ab39b5d
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jan 18 17:38:22 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jan 18 17:38:22 2016 +0000
----------------------------------------------------------------------
pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/blob/e3cb2edd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 04a093c..b8605ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,7 +199,6 @@ upgraded - this leads to recursive spaghetti.
<xmlbeans.version>2.4.0</xmlbeans.version>
<xml.rpc.version>1.1.0</xml.rpc.version>
<xstream.version>1.4.1</xstream.version>
-<wss4j.version>1.5.12</wss4j.version>
</properties>
[2/7] incubator-taverna-maven-parent git commit: tab -> spaces
Posted by st...@apache.org.
tab -> spaces
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/commit/2ade1da7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/tree/2ade1da7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/diff/2ade1da7
Branch: refs/heads/master
Commit: 2ade1da79f4bed89b6bbe19565f2b1a265fc900f
Parents: 145a0d1
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Nov 3 18:48:54 2015 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Nov 3 18:48:54 2015 +0100
----------------------------------------------------------------------
pom.xml | 262 +++++++++++++++++++++++++++++------------------------------
1 file changed, 131 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/blob/2ade1da7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9ae20e4..408f8f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,26 +16,26 @@
limitations under the License.
-->
<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>17</version>
- </parent>
- <prerequisites>
- <maven>3.2.0</maven>
- </prerequisites>
-
- <groupId>org.apache.taverna</groupId>
- <artifactId>taverna-parent</artifactId>
- <version>2-incubating-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>Apache Taverna (incubating) Maven parent</name>
- <description>
- General POM-file parent for Apache Taverna projects
- </description>
- <url>http://taverna.incubator.apache.org/</url>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>17</version>
+ </parent>
+ <prerequisites>
+ <maven>3.2.0</maven>
+ </prerequisites>
+
+ <groupId>org.apache.taverna</groupId>
+ <artifactId>taverna-parent</artifactId>
+ <version>2-incubating-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Apache Taverna (incubating) Maven parent</name>
+ <description>
+ General POM-file parent for Apache Taverna projects
+ </description>
+ <url>http://taverna.incubator.apache.org/</url>
<inceptionYear>2015</inceptionYear>
<mailingLists>
<mailingList>
@@ -68,18 +68,18 @@
<archive>http://mail-archives.apache.org/mod_mbox/incubator-taverna-commits/</archive>
</mailingList>
</mailingLists>
- <issueManagement>
- <system>Jira</system>
- <!-- Note: Do not include Component for Maven Parent here, as
- this issueManagement is inherited by every Taverna module.
- -->
- <url>https://issues.apache.org/jira/browse/TAVERNA</url>
- </issueManagement>
+ <issueManagement>
+ <system>Jira</system>
+ <!-- Note: Do not include Component for Maven Parent here, as
+ this issueManagement is inherited by every Taverna module.
+ -->
+ <url>https://issues.apache.org/jira/browse/TAVERNA</url>
+ </issueManagement>
<scm>
- <!-- While this section will also be inherited, it should be
- overridden within each Taverna module with specific repositories.
- -->
+ <!-- While this section will also be inherited, it should be
+ overridden within each Taverna module with specific repositories.
+ -->
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent.git</developerConnection>
<url>https://github.com/apache/incubator-taverna-maven-parent/</url>
@@ -88,7 +88,7 @@
- <properties>
+ <properties>
<!-- override java version from Apache parent -->
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
@@ -201,13 +201,13 @@ upgraded - this leads to recursive spaghetti.
<xml.rpc.version>1.1.0</xml.rpc.version>
<xstream.version>1.4.1</xstream.version>
<wss4j.version>1.5.12</wss4j.version>
- </properties>
+ </properties>
- <!-- Common (test) dependencies - keep this list short
- and up to date! -->
- <dependencies>
+ <!-- Common (test) dependencies - keep this list short
+ and up to date! -->
+ <dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -215,17 +215,17 @@ upgraded - this leads to recursive spaghetti.
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.4</version>
- <extensions>true</extensions>
- </plugin>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.5.4</version>
+ <extensions>true</extensions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -234,42 +234,42 @@ upgraded - this leads to recursive spaghetti.
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- <systemProperties>
- <property>
- <name>java.awt.headless</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ <systemProperties>
+ <property>
+ <name>java.awt.headless</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
@@ -287,15 +287,15 @@ upgraded - this leads to recursive spaghetti.
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
<configuration>
<releaseProfiles>apache-release</releaseProfiles>
<tagNameFormat>@{project.version}-RC1</tagNameFormat>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -323,21 +323,21 @@ upgraded - this leads to recursive spaghetti.
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
+ <pluginManagement>
+ <plugins>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.11</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compiler.source}</source>
- <target>${maven.compiler.target}</target>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
@@ -356,9 +356,9 @@ upgraded - this leads to recursive spaghetti.
- </plugins>
- </pluginManagement>
- </build>
+ </plugins>
+ </pluginManagement>
+ </build>
<profiles>
<profile>
<id>apache-release</id>
@@ -381,37 +381,37 @@ upgraded - this leads to recursive spaghetti.
</build>
</profile>
</profiles>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.15</version>
- <configuration>
- <configLocation>
- ${basedir}/Rcheckstyle.xml
- </configLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <minmemory>128m</minmemory>
- <maxmemory>512</maxmemory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- </plugins>
- </reporting>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.15</version>
+ <configuration>
+ <configLocation>
+ ${basedir}/Rcheckstyle.xml
+ </configLocation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>512</maxmemory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ </plugins>
+ </reporting>
<pluginRepositories>
<pluginRepository>
@@ -426,7 +426,7 @@ upgraded - this leads to recursive spaghetti.
</pluginRepositories>
- <repositories>
+ <repositories>
<!-- Apache snapshot repository inherited from Apache parent:
<repository>
@@ -499,11 +499,11 @@ also in Maven Central:
</repository>
- </repositories>
+ </repositories>
<!-- inherited from Apache parent
- <distributionManagement>
+ <distributionManagement>
</distributionManagement>
-->
[3/7] incubator-taverna-maven-parent git commit: derby.version now
specified in taverna-language/pom.xml
Posted by st...@apache.org.
derby.version now specified in taverna-language/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/commit/ab39b5d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/tree/ab39b5d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/diff/ab39b5d3
Branch: refs/heads/master
Commit: ab39b5d389828889688c7f3526114c77100fa66d
Parents: 2ade1da
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Nov 3 18:53:13 2015 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Nov 3 18:53:13 2015 +0100
----------------------------------------------------------------------
pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-maven-parent/blob/ab39b5d3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 408f8f8..04a093c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,6 @@ upgraded - this leads to recursive spaghetti.
<commons.lang.version>2.5.0</commons.lang.version>
<commons.logging.version>1.1.1</commons.logging.version>
<commons.net.version>2.0.0</commons.net.version>
-<derby.version>10.12.1.1</derby.version>
<dom4j.version>1.6.1</dom4j.version>
<elmo.version>1.5</elmo.version>
<geronimo.spec.jta.version>1.0-M1</geronimo.spec.jta.version>