taverna-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Menaka Madushanka <menaka12...@gmail.com>
Subject Re: [GitHub] incubator-taverna-language pull request: New features
Date Thu, 25 Jun 2015 13:54:52 GMT
Hi Stian,
>
> I have merged your pull requests #7 and #8 with Ian's modifications to
> the poms to parameterize the airline version.


To make this work, the taverna language pom must be updated with

  <repository>
      <id>apache Staging</id>
      <name>Apache Staging Repository</name>
      <url>http://repository.apache.org/content/groups/staging</url>
</repository>

Said Christian....

On 25 June 2015 at 19:09, Menaka Madushanka <menaka12350@gmail.com> wrote:

> I'm on to it..... :-)
> I'll close the pull request 9 and re open it after doing the modifications.
>
> Thank you
>
> On 25 June 2015 at 19:04, Stian Soiland-Reyes <stain@apache.org> wrote:
>
>> Menaka,
>>
>> I have merged your pull requests #7 and #8 with Ian's modifications to
>> the poms to parameterize the airline version.
>>
>> I had to do a squash commit for #8 to avoid iwirTools.jar in the commit
>> history.
>>
>> Because of this you should git pull the latest master to avoid any
>> future conflicts.
>>
>>
>> your pull request 9 seems to incorporate *some* of the commits in 7/8
>> - but not all of them - and therefore I am unable to merge it with
>> master. Are you able to do it again? You might need to copy relevant
>> files manually to a new branch off master to avoid too much git
>> magic..
>>
>>
>>
>> On 24 June 2015 at 16:42, menaka121 <git@git.apache.org> wrote:
>> > GitHub user menaka121 opened a pull request:
>> >
>> >     https://github.com/apache/incubator-taverna-language/pull/9
>> >
>> >     New features
>> >
>> >     Avoided the conflicts.
>> >     Closed the previous one and reopened
>> >
>> > You can merge this pull request into a Git repository by running:
>> >
>> >     $ git pull https://github.com/menaka121/incubator-taverna-language
>> new_features
>> >
>> > Alternatively you can review and apply these changes as the patch at:
>> >
>> >     https://github.com/apache/incubator-taverna-language/pull/9.patch
>> >
>> > To close this pull request, make a commit to your master/trunk branch
>> > with (at least) the following in the commit message:
>> >
>> >     This closes #9
>> >
>> > ----
>> > commit da4bbca7781b4cae4bb8a80e957acf2f5f7a07ee
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-24T13:12:52Z
>> >
>> >     airline version added
>> >
>> > commit 915c10f049495cc06e467eb750356b23d1e86b26
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-17T14:35:56Z
>> >
>> >     Dependancy arrangement
>> >
>> > commit ea405a96b8fd3d7fb04edde2083bdfb13d7622ad
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-17T14:42:38Z
>> >
>> >     Iwir added
>> >
>> > commit 9cee2ae06c8dded978340deb4039b969e4a0c08f
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-17T14:47:20Z
>> >
>> >     Iwir conversion and tojson
>> >
>> > commit 99a8bf7b8276479c731dc4e6ebb205055a7133fc
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-17T14:53:51Z
>> >
>> >     --iwir feature added
>> >
>> > commit abcc8a7c80c67d1fd394221ae90ef3e70d1e5ef1
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-17T15:23:08Z
>> >
>> >     Changed pom - mvn clean install is working
>> >
>> > commit 073811df4cf0b4b375c63fa32081adf0806e7a42
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-17T15:41:53Z
>> >
>> >     Basic error detection
>> >
>> > commit d24663090747f8df27f1dd5d480ce07a20a3796c
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-19T14:44:30Z
>> >
>> >     Apache header restored
>> >
>> > commit 92aba95d61da8c753f7773612f98154502b5f590
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-19T15:17:20Z
>> >
>> >     iwir removed
>> >
>> > commit a7eea3cd85370702853c5baec71257f915de8129
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-19T15:18:32Z
>> >
>> >     iwir removed
>> >
>> > commit 528920bb18a2f5aef16b9496b1ffa8a6592dd71d
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-19T15:19:19Z
>> >
>> >     iwir removed
>> >
>> > commit 954660a413164f7d27f6398aeb5b31710ccf03f7
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-19T17:45:21Z
>> >
>> >     new
>> >
>> > commit c587c123aeb4791c6fa59b9e33eb0d8b425ac1f2
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-19T17:47:34Z
>> >
>> >     Revert "new"
>> >
>> >     This reverts commit e5beb625f29eeda80f64aaf84e22ac6e7efd22df.
>> >
>> > commit 39b6b782412c278b9801fa8b3104147b102259b2
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-19T17:51:12Z
>> >
>> >     no iwir
>> >
>> > commit b2a17212c3f8bd3a2036cece34103cf58c53541f
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-20T12:58:05Z
>> >
>> >     pom
>> >
>> > commit 325cfda1f7f5171b3cac1023a5679bbc009f23e8
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-20T21:28:33Z
>> >
>> >     Validation addad
>> >
>> > commit 4d24e43b6cc669529e8345c4e9f95f1f9e8bb08f
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-20T21:51:50Z
>> >
>> >     Seperated read()
>> >
>> > commit abb9e494f3b4e76d95b6bdcee6a315185fa3abc2
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-22T17:14:13Z
>> >
>> >     Revert "Seperated read()"
>> >
>> >     This reverts commit cfe35cfa22caaf519724211d4824624d937349dd.
>> >
>> > commit 91a054c52adf4176fe1b7596ec2bea28558e3865
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-22T17:16:54Z
>> >
>> >     Revert "Validation addad"
>> >
>> >     This reverts commit 532e7e0bd8ab17012cd644940892e3576c657d9e.
>> >
>> > commit 790099bee1c2d04d8049803a2f7948053d8b07ae
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-23T11:05:12Z
>> >
>> >     iwir jars removed
>> >
>> > commit 5bff5bb825d18830de59774e12c0888442be8d8c
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-23T11:23:44Z
>> >
>> >     Input file type dection added
>> >
>> > commit 6ffa7a2ab1c8fd713d7b4f68667f0c12ef40a76d
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-23T11:37:40Z
>> >
>> >     Input file type detection
>> >
>> > commit 94bc0af89fa6e2ead3f609fdd21b2e9e50df7033
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-24T12:29:44Z
>> >
>> >     airline dpendancy - version removed
>> >
>> > commit f75462ec295a2e4857f6eca8443865c74a0eace8
>> > Author: Menaka Madushanka <menaka12350@gmail.com>
>> > Date:   2015-06-24T13:09:29Z
>> >
>> >     airline version remove got errors - added it back
>> >
>> > ----
>> >
>> >
>> > ---
>> > If your project is set up for it, you can reply to this email and have
>> your
>> > reply appear on GitHub as well. If your project does not have this
>> feature
>> > enabled and wishes so, or if the feature is enabled but not working,
>> please
>> > contact infrastructure at infrastructure@apache.org or file a JIRA
>> ticket
>> > with INFRA.
>> > ---
>>
>>
>>
>> --
>> Stian Soiland-Reyes
>> Apache Taverna (incubating), Apache Commons RDF (incubating)
>> http://orcid.org/0000-0001-9842-9718
>>
>
>
>
> --
> Menaka Madushanka Jayawardena
> Faculty of Engineering, <http://www.pdn.ac.lk/eng>
> University of Peradeniyaya.
> LinkedIn <http://lk.linkedin.com/in/menakajayawardena>
>



-- 
Menaka Madushanka Jayawardena
Faculty of Engineering, <http://www.pdn.ac.lk/eng>
University of Peradeniyaya.
LinkedIn <http://lk.linkedin.com/in/menakajayawardena>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message