Re: Publish plugin issue

[Holger Mappt]

Hi Vincent,

I restored to original behavior without the SVN update and commit part 
(in r34244).


Regards,
Holger


On 2018-06-03 at 18:58 +0200 Vincent Privat wrote:

Hello,
This involves unneeded work from us. As said before, please restore the 
previous mechanism, which is being used for Nexus, and simply make sure 
only the plugin jar is commited, this is the only change that is required.

Best regards,
Vincent

2018-06-01 11:07 GMT+02:00 Holger Mappt:

On 2018-05-31 at 21:00 +0200 Dirk Stöcker wrote:

On Thu, 31 May 2018, Michael Zangl wrote:

We currently have all snapshot plugin jars including
source/javadoc on the nexus server:


https://josm.openstreetmap.de/nexus/content/groups/public/org/openstreetmap/josm/plugins/




You can pull them from there if you need them for anything.

For local development, you could just check out and add the
source directory of the plugin to your favorite IDE, you
don't need a jar file for this.


You forget that the nexus server uses this build procedure. If
it is disabled files will be gone there as well.


Hi,

That is the first hint what the sources and javadoc JARs are used
for. Is there a description how the Nexus thing works? What targets
does it call? How does it know what files are to be kept and from
where to take them?

How about a new target like "dist-all" that can be used to generate
everything that one can dream of? That target is used by Nexus or by
whoever wants everything. The regular plugin developer will continue
to use "dist". "dist-all" will generate the JARs in the dist
directory, *-javadoc.jar and *-sources.jar are in the ignore list
already. No SVN update/commit for sources.jar and javadoc.jar.

Re: Publish plugin issue

[Vincent Privat]

Hello,
This involves unneeded work from us. As said before, please restore the
previous mechanism, which is being used for Nexus, and simply make sure
only the plugin jar is commited, this is the only change that is required.
Best regards,
Vincent

2018-06-01 11:07 GMT+02:00 Holger Mappt :

> On 2018-05-31 at 21:00 +0200 Dirk Stöcker wrote:
>
>> On Thu, 31 May 2018, Michael Zangl wrote:
>>
>> We currently have all snapshot plugin jars including source/javadoc on
>>> the nexus server:
>>>
>>> https://josm.openstreetmap.de/nexus/content/groups/public/or
>>> g/openstreetmap/josm/plugins/
>>>
>>> You can pull them from there if you need them for anything.
>>>
>>> For local development, you could just check out and add the source
>>> directory of the plugin to your favorite IDE, you don't need a jar file for
>>> this.
>>>
>>
>> You forget that the nexus server uses this build procedure. If it is
>> disabled files will be gone there as well.
>>
>
> Hi,
>
> That is the first hint what the sources and javadoc JARs are used for. Is
> there a description how the Nexus thing works? What targets does it call?
> How does it know what files are to be kept and from where to take them?
>
> How about a new target like "dist-all" that can be used to generate
> everything that one can dream of? That target is used by Nexus or by
> whoever wants everything. The regular plugin developer will continue to use
> "dist". "dist-all" will generate the JARs in the dist directory,
> *-javadoc.jar and *-sources.jar are in the ignore list already. No SVN
> update/commit for sources.jar and javadoc.jar.
>
> Regards,
> Holger
>
> PS: The shenron.openstreetmap.org mail server delays the emails, e.g.
> Dirks email was delayed by 8 hours. Does someone know why it does that? The
> messages show up in the mail archive immediately, but I need to wait until
> I get it to be able to reply.
>
>
>

Re: Publish plugin issue

[Holger Mappt]

On 2018-05-31 at 21:00 +0200 Dirk Stöcker wrote:

On Thu, 31 May 2018, Michael Zangl wrote:

We currently have all snapshot plugin jars including source/javadoc 
on the nexus server:


https://josm.openstreetmap.de/nexus/content/groups/public/org/openstreetmap/josm/plugins/ 



You can pull them from there if you need them for anything.

For local development, you could just check out and add the source 
directory of the plugin to your favorite IDE, you don't need a jar 
file for this.


You forget that the nexus server uses this build procedure. If it is 
disabled files will be gone there as well.


Hi,

That is the first hint what the sources and javadoc JARs are used for. 
Is there a description how the Nexus thing works? What targets does it 
call? How does it know what files are to be kept and from where to take 
them?


How about a new target like "dist-all" that can be used to generate 
everything that one can dream of? That target is used by Nexus or by 
whoever wants everything. The regular plugin developer will continue to 
use "dist". "dist-all" will generate the JARs in the dist directory, 
*-javadoc.jar and *-sources.jar are in the ignore list already. No SVN 
update/commit for sources.jar and javadoc.jar.


Regards,
Holger

PS: The shenron.openstreetmap.org mail server delays the emails, e.g. 
Dirks email was delayed by 8 hours. Does someone know why it does that? 
The messages show up in the mail archive immediately, but I need to wait 
until I get it to be able to reply.

Re: Publish plugin issue

[Florian Schäfer]

Yes, absolutely!

If these files are published (and I think they should be), the Nexus repository 
is the right place to do so.
AFAICS these files are even already published over there, see e.g. 
https://josm.openstreetmap.de/nexus/content/repositor
ies/snapshots/org/openstreetmap/josm/plugins/apache-commons/SNAPSHOT/

The source code repository should not be used for build artifacts, amongst 
other reasons it will drastically increase
the size of the repo. For now the main *.jar of the plugins will have to remain 
in the SVN repo, because as Michael
explained, the JOSM plugin updater depends on that and would require 
significant work to change that. But other build
artifacts should not be added to the SVN, that would be a step in the wrong 
direction.

Actually, thank you for bringing this topic up here! I'll change the defaults 
of the gradle-josm-plugin a bit for the
next release, so JOSM plugins built with Gradle will have JavaDocs and source 
code for required plugins in at least
Eclipse and IntelliJ Idea.
For the `tested` JOSM versions this was already possible, but not for required 
plugins, because I wasn't aware that
JavaDoc and sources were published to the Nexus repo.

Cheers,
Florian


Am Donnerstag, den 31.05.2018, 14:50 +0200 schrieb Michael Zangl:
> The idea of the quasi-standard files is to have them in a structure in 
> which IDEs can pull them in automatically.
> 
> We only have few plugins that use a build system that could make use of 
> such a functionality. And as far as I have seen, most of them use git 
> and are outside of the source tree anyways.
> 
> 
> This would only really make sense if we convert the plugins to not 
> depend on jar-Files but instead use some more modern dependency system 
> that supports dependency versioning. That way it would be easier to test 
> plugins that depend on each other in different version combinations and 
> it would be easier for us to reporduce plugin errors by not only loading 
> the plugin list of that user, but instead loading the exact plugin 
> versions the user used including the source tree to our IDE for debugging.
> 
> This would require many changes to JOSM and the way JOSM is built. We 
> are far away from this (e.g. see #8269).
> 
> 
> Michael
> 
> 
> On 31.05.2018 08:27, Dirk Stöcker wrote:
> > On Wed, 30 May 2018, Holger Mappt wrote:
> > 
> > > Build the files to do what with them?
> > 
> > Hmm. I think because these are a Quasi-Standard :-) Don't know.
> > 
> > > Would a nodist directory parallel to dist be an option if the JARs 
> > > are not to be uploaded to the repository?
> > 
> > They could be in the /dist. Would that be ok?
> > 
> > Ciao
> 
> 

Re: Publish plugin issue

[Dirk Stöcker]

On Thu, 31 May 2018, Michael Zangl wrote:

I'm not a fan of having distribution binary files in the source code 
repository or in any other repository that has to be at a specific place in 
the directory tree.


That may be the case, but it is the way it is and the task is not the 
reinvent the wheel, but to fix the trouble at hand.


We currently have all snapshot plugin jars including source/javadoc on the 
nexus server:


https://josm.openstreetmap.de/nexus/content/groups/public/org/openstreetmap/josm/plugins/

You can pull them from there if you need them for anything.

For local development, you could just check out and add the source directory 
of the plugin to your favorite IDE, you don't need a jar file for this.


You forget that the nexus server uses this build procedure. If it is 
disabled files will be gone there as well.


Ciao
--
http://www.dstoecker.eu/ (PGP key available)

Re: Publish plugin issue

[Michael Zangl]

The idea of the quasi-standard files is to have them in a structure in 
which IDEs can pull them in automatically.


We only have few plugins that use a build system that could make use of 
such a functionality. And as far as I have seen, most of them use git 
and are outside of the source tree anyways.



This would only really make sense if we convert the plugins to not 
depend on jar-Files but instead use some more modern dependency system 
that supports dependency versioning. That way it would be easier to test 
plugins that depend on each other in different version combinations and 
it would be easier for us to reporduce plugin errors by not only loading 
the plugin list of that user, but instead loading the exact plugin 
versions the user used including the source tree to our IDE for debugging.


This would require many changes to JOSM and the way JOSM is built. We 
are far away from this (e.g. see #8269).



Michael


On 31.05.2018 08:27, Dirk Stöcker wrote:

On Wed, 30 May 2018, Holger Mappt wrote:


Build the files to do what with them?


Hmm. I think because these are a Quasi-Standard :-) Don't know.

Would a nodist directory parallel to dist be an option if the JARs 
are not to be uploaded to the repository?


They could be in the /dist. Would that be ok?

Ciao

Re: Publish plugin issue

[Michael Zangl]

Hi,

I'm not a fan of having distribution binary files in the source code 
repository or in any other repository that has to be at a specific place 
in the directory tree.


We currently have all snapshot plugin jars including source/javadoc on 
the nexus server:


https://josm.openstreetmap.de/nexus/content/groups/public/org/openstreetmap/josm/plugins/

You can pull them from there if you need them for anything.

For local development, you could just check out and add the source 
directory of the plugin to your favorite IDE, you don't need a jar file 
for this.


For CI, the way I would do it is to simply build the artifacts inside 
${plugin.build.dir} and add a target to publish them to a maven server. 
I would set the default publish URL to something like "$buildDir/maven" 
and make a parameter to overwrite it for the CI server. That way, we can 
easily test it locally without having to worry about directory layouts 
and the build server can still collect them somewhere centralized.


Michael




On 30.05.2018 20:07, Holger Mappt wrote:

On 2018-05-30 at 11:57 +0200 Dirk Stöcker wrote:

On Wed, 30 May 2018, Holger Mappt wrote:

I don't see how that can be done without conflicts. If the sources 
and javadoc JARs are generated but not svn added and svn committed 
then those JARs are SVN private files. Everyone who runs the 
according target will have those private files in her/his working 
copy dist directory. If someone svn adds and svn commits the JARs 
then the next svn update will show merge conflicts because the JARs 
are now in the repository and the working copy as private files and 
SVN doesn't know what to do.


A clean solution is to either add the sources and javadoc JARs to 
all targets and to create+commit them for all plugins in dist, or 
not to do that. The sources and javadoc JARs that were added in 
r34045 were deleted in the next revision, so my assumption is that 
we don't want those JARs in dist.


So what's the plan with sources and javadoc JARs?


Vincent wants these files to build, but they should not to be released.

Add an svn:ignore in build directory?

Ciao


Hi,

Build the files to do what with them? Would a nodist directory 
parallel to dist be an option if the JARs are not to be uploaded to 
the repository?


The conflict will occur if the JARs are released later on. An 
svn:ignore will not help in that case. It is better to have separate 
directories for released and not released files.


Regards,
Holger

Re: Publish plugin issue

[Dirk Stöcker]

On Wed, 30 May 2018, Holger Mappt wrote:


Build the files to do what with them?


Hmm. I think because these are a Quasi-Standard :-) Don't know.

Would a nodist directory parallel to 
dist be an option if the JARs are not to be uploaded to the repository?


They could be in the /dist. Would that be ok?

Ciao
--
http://www.dstoecker.eu/ (PGP key available)

Re: Publish plugin issue

[Holger Mappt]

On 2018-05-30 at 11:57 +0200 Dirk Stöcker wrote:

On Wed, 30 May 2018, Holger Mappt wrote:

I don't see how that can be done without conflicts. If the sources and 
javadoc JARs are generated but not svn added and svn committed then 
those JARs are SVN private files. Everyone who runs the according 
target will have those private files in her/his working copy dist 
directory. If someone svn adds and svn commits the JARs then the next 
svn update will show merge conflicts because the JARs are now in the 
repository and the working copy as private files and SVN doesn't know 
what to do.


A clean solution is to either add the sources and javadoc JARs to all 
targets and to create+commit them for all plugins in dist, or not to 
do that. The sources and javadoc JARs that were added in r34045 were 
deleted in the next revision, so my assumption is that we don't want 
those JARs in dist.


So what's the plan with sources and javadoc JARs?


Vincent wants these files to build, but they should not to be released.

Add an svn:ignore in build directory?

Ciao


Hi,

Build the files to do what with them? Would a nodist directory parallel 
to dist be an option if the JARs are not to be uploaded to the repository?


The conflict will occur if the JARs are released later on. An svn:ignore 
will not help in that case. It is better to have separate directories 
for released and not released files.


Regards,
Holger

Re: Publish plugin issue

[Dirk Stöcker]

On Wed, 30 May 2018, Holger Mappt wrote:

I don't see how that can be done without conflicts. If the sources and 
javadoc JARs are generated but not svn added and svn committed then those 
JARs are SVN private files. Everyone who runs the according target will have 
those private files in her/his working copy dist directory. If someone svn 
adds and svn commits the JARs then the next svn update will show merge 
conflicts because the JARs are now in the repository and the working copy as 
private files and SVN doesn't know what to do.


A clean solution is to either add the sources and javadoc JARs to all targets 
and to create+commit them for all plugins in dist, or not to do that. The 
sources and javadoc JARs that were added in r34045 were deleted in the next 
revision, so my assumption is that we don't want those JARs in dist.


So what's the plan with sources and javadoc JARs?


Vincent wants these files to build, but they should not to be released.

Add an svn:ignore in build directory?

Ciao
--
http://www.dstoecker.eu/ (PGP key available)

Re: Publish plugin issue

[Holger Mappt]

Hi Vincent,

I don't see how that can be done without conflicts. If the sources and 
javadoc JARs are generated but not svn added and svn committed then 
those JARs are SVN private files. Everyone who runs the according target 
will have those private files in her/his working copy dist directory. If 
someone svn adds and svn commits the JARs then the next svn update will 
show merge conflicts because the JARs are now in the repository and the 
working copy as private files and SVN doesn't know what to do.


A clean solution is to either add the sources and javadoc JARs to all 
targets and to create+commit them for all plugins in dist, or not to do 
that. The sources and javadoc JARs that were added in r34045 were 
deleted in the next revision, so my assumption is that we don't want 
those JARs in dist.


So what's the plan with sources and javadoc JARs?

Regards,
Holger


On 2018-05-30 at 01:36 +0200 Vincent Privat wrote:
Ah sorry I totally misunderstood your change. Please restore what I did, 
I thought you would only modify the "publish" target to ignore the files 
when committing to SVN, not delete the targets!


2018-05-29 22:03 GMT+02:00 Holger Mappt >:


Hi,

I implemented the two changes in r34224 and r34225. This undid most
of the changes to build-common.xml from r34045 where
plugin-sources.jar and plugin-javadoc.jar were added.

Marián, it should work for you now.

Regards,
Holger


On 2018-05-27 at 12:18 +0200 Vincent Privat wrote:

No objections:)

Le sam. 26 mai 2018 à 22:54, Holger Mappt
mailto:holgerosm-hi6y0cq0...@public.gmane.org>> a écrit :

Hi Marián,

There are two problems and I can confirm your issue.

Problem one is "ant update-current" which expands
../dist/${plugin.jar}
to
../dist/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar
instead of ../dist/pointInfo.jar. The ../dist/ must be
removed in the
target, the path to dist is part of ${plugin.jar} already.

Problem two is that "ant commit-dist" tries to commit
pointInfo-javadoc.jar and pointInfo-sources.jar. I think
they should not
be committed. They are in the ignore list (svn pl -v
../../dist) and I
don't see that other plugins have them in dist. SVN fails to
commit the
two files because they are not "svn add"ed.

I assume you are the only one who uses the publish target.
Otherwise all
others would see the same problem.

Who else uses "ant publish"? If there are no objections I
will make
these two changes to build-common.xml:
* Remove ../dist/ from update-current
* Do not update/publish/commit plugin.sources.jar and
plugin.javadoc.jar

Regards,
Holger

Re: Publish plugin issue

[Vincent Privat]

Ah sorry I totally misunderstood your change. Please restore what I did, I
thought you would only modify the "publish" target to ignore the files when
committing to SVN, not delete the targets!

2018-05-29 22:03 GMT+02:00 Holger Mappt :

> Hi,
>
> I implemented the two changes in r34224 and r34225. This undid most of the
> changes to build-common.xml from r34045 where plugin-sources.jar and
> plugin-javadoc.jar were added.
>
> Marián, it should work for you now.
>
> Regards,
> Holger
>
>
> On 2018-05-27 at 12:18 +0200 Vincent Privat wrote:
>
>> No objections:)
>>
>> Le sam. 26 mai 2018 à 22:54, Holger Mappt > gmane.org> a écrit :
>>
>> Hi Marián,
>>>
>>> There are two problems and I can confirm your issue.
>>>
>>> Problem one is "ant update-current" which expands ../dist/${plugin.jar}
>>> to ../dist/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar
>>> instead of ../dist/pointInfo.jar. The ../dist/ must be removed in the
>>> target, the path to dist is part of ${plugin.jar} already.
>>>
>>> Problem two is that "ant commit-dist" tries to commit
>>> pointInfo-javadoc.jar and pointInfo-sources.jar. I think they should not
>>> be committed. They are in the ignore list (svn pl -v ../../dist) and I
>>> don't see that other plugins have them in dist. SVN fails to commit the
>>> two files because they are not "svn add"ed.
>>>
>>> I assume you are the only one who uses the publish target. Otherwise all
>>> others would see the same problem.
>>>
>>> Who else uses "ant publish"? If there are no objections I will make
>>> these two changes to build-common.xml:
>>> * Remove ../dist/ from update-current
>>> * Do not update/publish/commit plugin.sources.jar and plugin.javadoc.jar
>>>
>>> Regards,
>>> Holger
>>>
>>
>
>

Re: Publish plugin issue

[Holger Mappt]

Hi,

I implemented the two changes in r34224 and r34225. This undid most of 
the changes to build-common.xml from r34045 where plugin-sources.jar and 
plugin-javadoc.jar were added.


Marián, it should work for you now.

Regards,
Holger


On 2018-05-27 at 12:18 +0200 Vincent Privat wrote:

No objections:)

Le sam. 26 mai 2018 à 22:54, Holger Mappt 
 a écrit :


Hi Marián,

There are two problems and I can confirm your issue.

Problem one is "ant update-current" which expands ../dist/${plugin.jar}
to ../dist/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar
instead of ../dist/pointInfo.jar. The ../dist/ must be removed in the
target, the path to dist is part of ${plugin.jar} already.

Problem two is that "ant commit-dist" tries to commit
pointInfo-javadoc.jar and pointInfo-sources.jar. I think they should not
be committed. They are in the ignore list (svn pl -v ../../dist) and I
don't see that other plugins have them in dist. SVN fails to commit the
two files because they are not "svn add"ed.

I assume you are the only one who uses the publish target. Otherwise all
others would see the same problem.

Who else uses "ant publish"? If there are no objections I will make
these two changes to build-common.xml:
* Remove ../dist/ from update-current
* Do not update/publish/commit plugin.sources.jar and plugin.javadoc.jar

Regards,
Holger

Re: Publish plugin issue

[Vincent Privat]

No objections:)

Le sam. 26 mai 2018 à 22:54, Holger Mappt  a écrit :

> Hi Marián,
>
> There are two problems and I can confirm your issue.
>
> Problem one is "ant update-current" which expands ../dist/${plugin.jar}
> to ../dist/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar
> instead of ../dist/pointInfo.jar. The ../dist/ must be removed in the
> target, the path to dist is part of ${plugin.jar} already.
>
> Problem two is that "ant commit-dist" tries to commit
> pointInfo-javadoc.jar and pointInfo-sources.jar. I think they should not
> be committed. They are in the ignore list (svn pl -v ../../dist) and I
> don't see that other plugins have them in dist. SVN fails to commit the
> two files because they are not "svn add"ed.
>
> I assume you are the only one who uses the publish target. Otherwise all
> others would see the same problem.
>
> Who else uses "ant publish"? If there are no objections I will make
> these two changes to build-common.xml:
> * Remove ../dist/ from update-current
> * Do not update/publish/commit plugin.sources.jar and plugin.javadoc.jar
>
> Regards,
> Holger
>
>
> On 2018-05-23 at 22:31 +0200 Marián Kyral wrote:
> > Hi,
> > sorry for the late reply.
> >
> > Dne 17.5.2018 v 22:03 Holger Mappt napsal(a):
> >> Hi Marián,
> >>
> >> Looks like you managed to publish the PointInfo plugin in the meantime
> >> (r34195).
> > Yes, I did it manually by committing the binary with proper commit
> message.
> >
> >> An SVN status with ! is never good. I assume there was a newer version
> >> in the repo that was not fetched because you had a modified
> >> dist/pointInfo.jar. Run svn status with option -u (to see what updates
> >> are in the repository), delete your modified pointInfo.jar, svn update
> >> dist, publish.
> > And this is strange. I deleted the binary and restored them from repo.
> > Then I run "ant publish", it deleted binary in "dist" folder, compile
> > it, created the "*-source.jar" and "*-javadoc.jar" files and svn commit
> > fails on messages I've sent.
> >
> >
> > *Just tested now ant the result is the same. Folders are clean*
> >
> > [22:06:24 marian@worker pointInfo (master)]$ svn status -u
> > Status against revision:  34216
> > [22:10:39 marian@worker pointInfo (master)]$ svn status -u ../../dist
> > Status against revision:  34216
> >
> > *But:*
> >
> > [22:10:55 marian@worker pointInfo (master)]$ ant publish
> > Picked up _JAVA_OPTIONS: -Dawt.useSystemAAFontSettings=on
> > -Dswing.aatext=true
> > Buildfile:
> > /home/marian/projekty/josm/josm_plugins/plugins/pointInfo/build.xml
> >
> > ensure-svn-present:
> >
> > core-info:
> >   [echo] Building against core revision 13823.
> >   [echo] Plugin-Mainversion is set to 12666.
> > [delete] Deleting:
> > /home/marian/projekty/josm/josm_plugins/plugins/pointInfo/core.info.xml
> >
> > commit-current:
> >   [echo] Commiting the plugin source with message 'PointInfo: Adds a
> > link to photo metadata in Catastro module. Patch by Javier Sánchez
> > Portero.' ...
> >
> > update-current:
> >   [echo] Updating plugin source ...
> >   [echo] Updating
> > /home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar ...
> >   [exec] Result: 1
> >
> > [...]
> >
> > commit-dist:
> >   [echo]
> >   [echo] * Properties of published
> > /home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar *
> >   [echo] Commit message: 'PointInfo: Adds a link to photo
> > metadata in Catastro module. Patch by Javier Sánchez Portero.'
> >   [echo] Plugin-Mainversion: 12666
> >   [echo] JOSM build version: 13823
> >   [echo] Plugin-Version: 34216
> >   [echo] * / Properties of published
> > /home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar *
> >   [echo]
> >   [echo] Now commiting
> > /home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar ...
> >   [echo]
> >   [exec] Result: 1
> >
> > publish:
> >
> > BUILD SUCCESSFUL
> > Total time: 11 seconds
> >
> >
> > *The svn.log*
> >
> > [22:15:06 marian@worker pointInfo (master)]$ cat svn.log
> > [...]
> >
> > Updating '.':
> > At revision 34216.
> > Skipped
> > '../dist/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar'svn:
> > E155007: None of the targets are working copies
> >
> > Skipped
> >
> '../dist/home/marian/projekty/josm/josm_plugins/dist/pointInfo-javadoc.jar'
> > Skipped
> >
> '../dist/home/marian/projekty/josm/josm_plugins/dist/pointInfo-sources.jar'
> > svn: E29: Commit failed (details follow):
> > svn: E29:
> > '/home/marian/projekty/josm/josm_plugins/dist/pointInfo-sources.jar' is
> > not under version control
> >
> > *And current status:*
> >
> > [22:15:10 marian@worker pointInfo (master)]$ svn status -u
> > ?svn.log
> > Status against revision:  34216
> > [22:23:10 marian@worker pointInfo (master)]$ svn status -u ../../dist
> > M34216   ../../dist/pointInfo.jar
> > Status against 

Re: Publish plugin issue

[Holger Mappt]

Hi Marián,

There are two problems and I can confirm your issue.

Problem one is "ant update-current" which expands ../dist/${plugin.jar} 
to ../dist/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar 
instead of ../dist/pointInfo.jar. The ../dist/ must be removed in the 
target, the path to dist is part of ${plugin.jar} already.


Problem two is that "ant commit-dist" tries to commit 
pointInfo-javadoc.jar and pointInfo-sources.jar. I think they should not 
be committed. They are in the ignore list (svn pl -v ../../dist) and I 
don't see that other plugins have them in dist. SVN fails to commit the 
two files because they are not "svn add"ed.


I assume you are the only one who uses the publish target. Otherwise all 
others would see the same problem.


Who else uses "ant publish"? If there are no objections I will make 
these two changes to build-common.xml:

* Remove ../dist/ from update-current
* Do not update/publish/commit plugin.sources.jar and plugin.javadoc.jar

Regards,
Holger


On 2018-05-23 at 22:31 +0200 Marián Kyral wrote:

Hi,
sorry for the late reply.

Dne 17.5.2018 v 22:03 Holger Mappt napsal(a):

Hi Marián,

Looks like you managed to publish the PointInfo plugin in the meantime
(r34195).

Yes, I did it manually by committing the binary with proper commit message.


An SVN status with ! is never good. I assume there was a newer version
in the repo that was not fetched because you had a modified
dist/pointInfo.jar. Run svn status with option -u (to see what updates
are in the repository), delete your modified pointInfo.jar, svn update
dist, publish.

And this is strange. I deleted the binary and restored them from repo.
Then I run "ant publish", it deleted binary in "dist" folder, compile
it, created the "*-source.jar" and "*-javadoc.jar" files and svn commit
fails on messages I've sent.


*Just tested now ant the result is the same. Folders are clean*

[22:06:24 marian@worker pointInfo (master)]$ svn status -u
Status against revision:  34216
[22:10:39 marian@worker pointInfo (master)]$ svn status -u ../../dist
Status against revision:  34216

*But:*

[22:10:55 marian@worker pointInfo (master)]$ ant publish
Picked up _JAVA_OPTIONS: -Dawt.useSystemAAFontSettings=on
-Dswing.aatext=true
Buildfile:
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/build.xml

ensure-svn-present:

core-info:
  [echo] Building against core revision 13823.
  [echo] Plugin-Mainversion is set to 12666.
    [delete] Deleting:
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/core.info.xml

commit-current:
  [echo] Commiting the plugin source with message 'PointInfo: Adds a
link to photo metadata in Catastro module. Patch by Javier Sánchez
Portero.' ...

update-current:
  [echo] Updating plugin source ...
  [echo] Updating
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar ...
  [exec] Result: 1

[...]

commit-dist:
  [echo]
  [echo] * Properties of published
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar *
  [echo] Commit message    : 'PointInfo: Adds a link to photo
metadata in Catastro module. Patch by Javier Sánchez Portero.'
  [echo] Plugin-Mainversion: 12666
  [echo] JOSM build version: 13823
  [echo] Plugin-Version    : 34216
  [echo] * / Properties of published
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar *
  [echo]
  [echo] Now commiting
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar ...
  [echo]
  [exec] Result: 1

publish:

BUILD SUCCESSFUL
Total time: 11 seconds


*The svn.log*

[22:15:06 marian@worker pointInfo (master)]$ cat svn.log
[...]

Updating '.':
At revision 34216.
Skipped
'../dist/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar'svn:
E155007: None of the targets are working copies

Skipped
'../dist/home/marian/projekty/josm/josm_plugins/dist/pointInfo-javadoc.jar'
Skipped
'../dist/home/marian/projekty/josm/josm_plugins/dist/pointInfo-sources.jar'
svn: E29: Commit failed (details follow):
svn: E29:
'/home/marian/projekty/josm/josm_plugins/dist/pointInfo-sources.jar' is
not under version control

*And current status:*

[22:15:10 marian@worker pointInfo (master)]$ svn status -u
?    svn.log
Status against revision:  34216
[22:23:10 marian@worker pointInfo (master)]$ svn status -u ../../dist
M    34216   ../../dist/pointInfo.jar
Status against revision:  34216
[22:23:15 marian@worker pointInfo (master)]$

Maybe, could you try?

Thanks,
Marián



Regards,
Holger


On 2018-05-17 at 12:42 +0200 Marián Kyral wrote:

Hi,
It is a long time ago when I published last version of pointInfo plugin.
Now I want to publish updated version, but it does not work :-(


I've commited changes in code:


r34168 | mkyral | 2018-04-24 07:48:05 +0200 (Út, 24 dub 2018) | 5 lines

PointInfo: Add Spanish Cadastre Web Services module.

Re: Publish plugin issue

[Marián Kyral]

Hi,
sorry for the late reply.

Dne 17.5.2018 v 22:03 Holger Mappt napsal(a):
> Hi Marián,
>
> Looks like you managed to publish the PointInfo plugin in the meantime
> (r34195). 
Yes, I did it manually by committing the binary with proper commit message.

> An SVN status with ! is never good. I assume there was a newer version
> in the repo that was not fetched because you had a modified
> dist/pointInfo.jar. Run svn status with option -u (to see what updates
> are in the repository), delete your modified pointInfo.jar, svn update
> dist, publish.
And this is strange. I deleted the binary and restored them from repo.
Then I run "ant publish", it deleted binary in "dist" folder, compile
it, created the "*-source.jar" and "*-javadoc.jar" files and svn commit
fails on messages I've sent.


*Just tested now ant the result is the same. Folders are clean*

[22:06:24 marian@worker pointInfo (master)]$ svn status -u
Status against revision:  34216
[22:10:39 marian@worker pointInfo (master)]$ svn status -u ../../dist
Status against revision:  34216

*But:*

[22:10:55 marian@worker pointInfo (master)]$ ant publish
Picked up _JAVA_OPTIONS: -Dawt.useSystemAAFontSettings=on
-Dswing.aatext=true
Buildfile:
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/build.xml

ensure-svn-present:

core-info:
 [echo] Building against core revision 13823.
 [echo] Plugin-Mainversion is set to 12666.
   [delete] Deleting:
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/core.info.xml

commit-current:
 [echo] Commiting the plugin source with message 'PointInfo: Adds a
link to photo metadata in Catastro module. Patch by Javier Sánchez
Portero.' ...

update-current:
 [echo] Updating plugin source ...
 [echo] Updating
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar ...
 [exec] Result: 1

clean:
   [delete] Deleting:
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar

init:
    [mkdir] Created dir:
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/build

pre-compile:

compile:
 [echo] compiling sources for
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar ...
    [javac] Compiling 15 source files to
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/build

javadoc:
  [javadoc] Generating Javadoc
  [javadoc] Javadoc execution
  [javadoc] Picked up _JAVA_OPTIONS: -Dawt.useSystemAAFontSettings=on
-Dswing.aatext=true
  [javadoc] Loading source files for package
org.openstreetmap.josm.plugins.pointinfo...
  [javadoc] Loading source files for package
org.openstreetmap.josm.plugins.pointinfo.catastro...
  [javadoc] Loading source files for package
org.openstreetmap.josm.plugins.pointinfo.ruian...
  [javadoc] Constructing Javadoc information...
  [javadoc] Creating destination directory:
"/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/javadoc/"
  [javadoc] Standard Doclet version 1.8.0_172
  [javadoc] Building tree for all the packages and classes...
  [javadoc] Building index for all the packages and classes...
  [javadoc] Building index for all classes...

init-svn-revision-xml:

init-git-svn-revision-xml:

init-git-revision-xml:

init-revision-fallback:

revision:
   [delete] Deleting:
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/REVISION.XML

dist:
 [echo] creating pointInfo.jar ...

setup-dist:

setup-dist-default:
 [copy] Copying 15 files to
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/build/images
 [copy] Copying 36 files to
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/build/data
 [copy] Copying 2 files to
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/build

check-manifest-attribute:

add-manifest-attribute:

check-manifest-attribute:

add-manifest-attribute:

check-manifest-attribute:

add-manifest-attribute:

check-manifest-attribute:

add-manifest-attribute:

check-manifest-attribute:

add-manifest-attribute:

check-manifest-attribute:

add-manifest-attribute:

additional-manifest:
  [jar] Building jar:
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar
  [jar] Building jar:
/home/marian/projekty/josm/josm_plugins/dist/pointInfo-sources.jar
  [jar] Building jar:
/home/marian/projekty/josm/josm_plugins/dist/pointInfo-javadoc.jar
   [delete] Deleting:
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/MANIFEST

post-dist:

commit-dist:
 [echo]
 [echo] * Properties of published
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar *
 [echo] Commit message    : 'PointInfo: Adds a link to photo
metadata in Catastro module. Patch by Javier Sánchez Portero.'
 [echo] Plugin-Mainversion: 12666
 [echo] JOSM build version: 13823
 [echo] Plugin-Version    : 34216
 [echo] * / Properties of published
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar *
 [echo]
 [echo] Now commiting
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar ...
 [echo]
 [exec] 

Re: Publish plugin issue

[Holger Mappt]

Hi Marián,

Looks like you managed to publish the PointInfo plugin in the meantime 
(r34195). An SVN status with ! is never good. I assume there was a newer 
version in the repo that was not fetched because you had a modified 
dist/pointInfo.jar. Run svn status with option -u (to see what updates 
are in the repository), delete your modified pointInfo.jar, svn update 
dist, publish.


Regards,
Holger


On 2018-05-17 at 12:42 +0200 Marián Kyral wrote:

Hi,
It is a long time ago when I published last version of pointInfo plugin.
Now I want to publish updated version, but it does not work :-(


I've commited changes in code:


r34168 | mkyral | 2018-04-24 07:48:05 +0200 (Út, 24 dub 2018) | 5 lines

PointInfo: Add Spanish Cadastre Web Services module.

Patch by Javier Sánchez Portero.


Then I want to publish updated binary:


$ cd /home/marian/projekty/josm/josm_plugins/dist/
$ svn status
! pointInfo.jar
$ svn update
Updating '.':
Restored 'pointInfo.jar'
At revision 34194.

Publish plugin issue

[Marián Kyral]

Hi,
It is a long time when I published new version of pointInfo plugin.
Now I want to publish updated version, but it does not work :-(


I've commited changes in code:


r34168 | mkyral | 2018-04-24 07:48:05 +0200 (Út, 24 dub 2018) | 5 lines

PointInfo: Add Spanish Cadastre Web Services module.

Patch by Javier Sánchez Portero.


Then I want to publish updated binary:


$ cd /home/marian/projekty/josm/josm_plugins/dist/
$ svn status
!   pointInfo.jar
$ svn update
Updating '.':
Restored 'pointInfo.jar'
At revision 34194.

$ cd -
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo

$ ant publish
Picked up _JAVA_OPTIONS: -Dawt.useSystemAAFontSettings=on 
-Djava.net.preferIPv4Stack=true
Buildfile: 
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/build.xml


ensure-svn-present:

core-info:
 [echo] Building against core revision 13780.
 [echo] Plugin-Mainversion is set to 12666.
   [delete] Deleting: 
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/core.info.xml


commit-current:
 [echo] Commiting the plugin source with message 'PointInfo: Add 
Spanish Cadastre Web Services module. Patch by Javier Sánchez Portero.' 
...


update-current:
 [echo] Updating plugin source ...
 [echo] Updating 
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar ...

 [exec] Result: 1

clean:
   [delete] Deleting: 
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar


init:
[mkdir] Created dir: 
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/build


pre-compile:

compile:
 [echo] compiling sources for 
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar ...
[javac] Compiling 15 source files to 
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/build


javadoc:
  [javadoc] Generating Javadoc
  [javadoc] Javadoc execution
  [javadoc] Picked up _JAVA_OPTIONS: -Dawt.useSystemAAFontSettings=on 
-Djava.net.preferIPv4Stack=true
  [javadoc] Loading source files for package 
org.openstreetmap.josm.plugins.pointinfo...
  [javadoc] Loading source files for package 
org.openstreetmap.josm.plugins.pointinfo.catastro...
  [javadoc] Loading source files for package 
org.openstreetmap.josm.plugins.pointinfo.ruian...

  [javadoc] Constructing Javadoc information...
  [javadoc] Creating destination directory: 
"/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/javadoc/"

  [javadoc] Standard Doclet version 1.8.0_172
  [javadoc] Building tree for all the packages and classes...
  [javadoc] Building index for all the packages and classes...
  [javadoc] Building index for all classes...

init-svn-revision-xml:

init-git-svn-revision-xml:

init-git-revision-xml:

init-revision-fallback:

revision:
   [delete] Deleting: 
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/REVISION.XML


dist:
 [echo] creating pointInfo.jar ...

setup-dist:

setup-dist-default:
 [copy] Copying 15 files to 
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/build/images
 [copy] Copying 35 files to 
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/build/data
 [copy] Copying 2 files to 
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/build


check-manifest-attribute:

add-manifest-attribute:

check-manifest-attribute:

add-manifest-attribute:

check-manifest-attribute:

add-manifest-attribute:

check-manifest-attribute:

add-manifest-attribute:

check-manifest-attribute:

add-manifest-attribute:

check-manifest-attribute:

add-manifest-attribute:

additional-manifest:
  [jar] Building jar: 
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar
  [jar] Building jar: 
/home/marian/projekty/josm/josm_plugins/dist/pointInfo-sources.jar
  [jar] Building jar: 
/home/marian/projekty/josm/josm_plugins/dist/pointInfo-javadoc.jar
   [delete] Deleting: 
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/MANIFEST


post-dist:

commit-dist:
 [echo]
 [echo] * Properties of published 
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar *
 [echo] Commit message: 'PointInfo: Add Spanish Cadastre Web 
Services module. Patch by Javier Sánchez Portero.'

 [echo] Plugin-Mainversion: 12666
 [echo] JOSM build version: 13780
 [echo] Plugin-Version: 34181
 [echo] * / Properties of published 
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar *

 [echo]
 [echo] Now commiting 
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar ...

 [echo]
 [exec] Result: 1

publish:

BUILD SUCCESSFUL
Total time: 11 seconds



*Even there is "BUILD SUCCESSFUL" is message, I can see two messages 
"[exec] Result: 1" in log with these details in svn.log*