[jruby-dev] jruby.org and github discrepancies

[Hirotsugu Asari]

The master git repo on jruby.org and the github mirror had diverged in the last day or so.

jruby.org:
$ git log --oneline | head -20
06b8107 * Issue #1034 Disable invokedynamic for Java 7
e90ed41 Update to use jruby.org instead of github.com
0ce7ea9 Post processing task to generate stuff not done by maven
3e73971 Extra ignore from extra file turded into install dir
e79b4e5 Remove merge fail stuff
3dab1a2 Ignore some maven temporary files which are part of releasing
1f9ac5e fix some error in building.md
89eb78f more fixes from my temp test for releasing jruby
d0d8408 well put that gem installation in place again
5525aa5 Revert "temp groupId"
30e9d42 [maven-release-plugin] rollback the release of 1.7.5
99cec72 [maven-release-plugin] prepare for next development iteration
f4ce2aa [maven-release-plugin] prepare release 1.7.5
4fac865 Revert "try explicit tag for release" - no the desired effect
f27f234 [maven-release-plugin] prepare for next development iteration
ae34a87 [maven-release-plugin] prepare release 1.7.5.dev
dec814c try explicit tag for release
147baec get the osgi config more robust
fa09cc5 fix version of IT from jruby-complete
00328fa temp groupId

Github:
$ git log --oneline | head -20
445b6fd [maven-release-plugin] rollback the release of 1.7.5
051fdc3 [maven-release-plugin] prepare for next development iteration
f073174 [maven-release-plugin] prepare release 1.7.5
0ce7ea9 Post processing task to generate stuff not done by maven
3e73971 Extra ignore from extra file turded into install dir
e79b4e5 Remove merge fail stuff
3dab1a2 Ignore some maven temporary files which are part of releasing
1f9ac5e fix some error in building.md
89eb78f more fixes from my temp test for releasing jruby
d0d8408 well put that gem installation in place again
5525aa5 Revert "temp groupId"
30e9d42 [maven-release-plugin] rollback the release of 1.7.5
99cec72 [maven-release-plugin] prepare for next development iteration
f4ce2aa [maven-release-plugin] prepare release 1.7.5
4fac865 Revert "try explicit tag for release" - no the desired effect
f27f234 [maven-release-plugin] prepare for next development iteration
ae34a87 [maven-release-plugin] prepare release 1.7.5.dev
dec814c try explicit tag for release
147baec get the osgi config more robust
fa09cc5 fix version of IT from jruby-complete

It appears to me that "[maven-release-plugin]" commits were pushed to Github twice for whatever reason. Do we have any idea how this happened, and how we can prevent this from happening in the future?

I merged the branches and pushed to jruby.org, so that the mirror is once again in sync with jruby.org.

Hiro

[christian]

it happened yesterday that when Tom and I tried to get the release done.
the main pom.xml had the github repo configured (that happened some weeks
ago). at the end of the day we realized that mistake but by then we pushed
a few tags and code changes via the maven-release-plugin to the github repo.

that is fixed now with commit e90ed41dca9e731cdb210a17bcc30d0f9e8ff112

so it will not happen again ;)

thanx for syncing the repos !!!

regards,
christian

Post by Hirotsugu Asari
The master git repo on jruby.org and the github mirror had diverged in the last day or so.
$ git log --oneline | head -20
06b8107 * Issue #1034 Disable invokedynamic for Java 7
e90ed41 Update to use jruby.org instead of github.com
0ce7ea9 Post processing task to generate stuff not done by maven
3e73971 Extra ignore from extra file turded into install dir
e79b4e5 Remove merge fail stuff
3dab1a2 Ignore some maven temporary files which are part of releasing
1f9ac5e fix some error in building.md
89eb78f more fixes from my temp test for releasing jruby
d0d8408 well put that gem installation in place again
5525aa5 Revert "temp groupId"
30e9d42 [maven-release-plugin] rollback the release of 1.7.5
99cec72 [maven-release-plugin] prepare for next development iteration
f4ce2aa [maven-release-plugin] prepare release 1.7.5
4fac865 Revert "try explicit tag for release" - no the desired effect
f27f234 [maven-release-plugin] prepare for next development iteration
ae34a87 [maven-release-plugin] prepare release 1.7.5.dev
dec814c try explicit tag for release
147baec get the osgi config more robust
fa09cc5 fix version of IT from jruby-complete
00328fa temp groupId
$ git log --oneline | head -20
445b6fd [maven-release-plugin] rollback the release of 1.7.5
051fdc3 [maven-release-plugin] prepare for next development iteration
f073174 [maven-release-plugin] prepare release 1.7.5
0ce7ea9 Post processing task to generate stuff not done by maven
3e73971 Extra ignore from extra file turded into install dir
e79b4e5 Remove merge fail stuff
3dab1a2 Ignore some maven temporary files which are part of releasing
1f9ac5e fix some error in building.md
89eb78f more fixes from my temp test for releasing jruby
d0d8408 well put that gem installation in place again
5525aa5 Revert "temp groupId"
30e9d42 [maven-release-plugin] rollback the release of 1.7.5
99cec72 [maven-release-plugin] prepare for next development iteration
f4ce2aa [maven-release-plugin] prepare release 1.7.5
4fac865 Revert "try explicit tag for release" - no the desired effect
f27f234 [maven-release-plugin] prepare for next development iteration
ae34a87 [maven-release-plugin] prepare release 1.7.5.dev
dec814c try explicit tag for release
147baec get the osgi config more robust
fa09cc5 fix version of IT from jruby-complete
It appears to me that "[maven-release-plugin]" commits were pushed to
Github twice for whatever reason. Do we have any idea how this happened,
and how we can prevent this from happening in the future?
I merged the branches and pushed to jruby.org, so that the mirror is once
again in sync with jruby.org.
Hiro

[Hirotsugu Asari]

One thing to note is that 1.7.5 is tagged at 445b6fd, and does not contain 06b8107, so that InvokeDynamic is enabled by default on 7u40.

$ jruby -v
jruby 1.7.5.dev (1.9.3p392) 2013-09-21 445b6fd on Java HotSpot(TM) 64-Bit Server VM 1.7.0_40-b43 +indy [darwin-x86_64]

$ jruby -v
jruby 1.7.5.dev (1.9.3p392) 2013-09-21 6b420d7 on Java HotSpot(TM) 64-Bit Server VM 1.7.0_40-b43 [darwin-x86_64]

it happened yesterday that when Tom and I tried to get the release done. the main pom.xml had the github repo configured (that happened some weeks ago). at the end of the day we realized that mistake but by then we pushed a few tags and code changes via the maven-release-plugin to the github repo.
that is fixed now with commit e90ed41dca9e731cdb210a17bcc30d0f9e8ff112
so it will not happen again ;)
thanx for syncing the repos !!!
regards,
christian
The master git repo on jruby.org and the github mirror had diverged in the last day or so.
$ git log --oneline | head -20
06b8107 * Issue #1034 Disable invokedynamic for Java 7
e90ed41 Update to use jruby.org instead of github.com
0ce7ea9 Post processing task to generate stuff not done by maven
3e73971 Extra ignore from extra file turded into install dir
e79b4e5 Remove merge fail stuff
3dab1a2 Ignore some maven temporary files which are part of releasing
1f9ac5e fix some error in building.md
89eb78f more fixes from my temp test for releasing jruby
d0d8408 well put that gem installation in place again
5525aa5 Revert "temp groupId"
30e9d42 [maven-release-plugin] rollback the release of 1.7.5
99cec72 [maven-release-plugin] prepare for next development iteration
f4ce2aa [maven-release-plugin] prepare release 1.7.5
4fac865 Revert "try explicit tag for release" - no the desired effect
f27f234 [maven-release-plugin] prepare for next development iteration
ae34a87 [maven-release-plugin] prepare release 1.7.5.dev
dec814c try explicit tag for release
147baec get the osgi config more robust
fa09cc5 fix version of IT from jruby-complete
00328fa temp groupId
$ git log --oneline | head -20
445b6fd [maven-release-plugin] rollback the release of 1.7.5
051fdc3 [maven-release-plugin] prepare for next development iteration
f073174 [maven-release-plugin] prepare release 1.7.5
0ce7ea9 Post processing task to generate stuff not done by maven
3e73971 Extra ignore from extra file turded into install dir
e79b4e5 Remove merge fail stuff
3dab1a2 Ignore some maven temporary files which are part of releasing
1f9ac5e fix some error in building.md
89eb78f more fixes from my temp test for releasing jruby
d0d8408 well put that gem installation in place again
5525aa5 Revert "temp groupId"
30e9d42 [maven-release-plugin] rollback the release of 1.7.5
99cec72 [maven-release-plugin] prepare for next development iteration
f4ce2aa [maven-release-plugin] prepare release 1.7.5
4fac865 Revert "try explicit tag for release" - no the desired effect
f27f234 [maven-release-plugin] prepare for next development iteration
ae34a87 [maven-release-plugin] prepare release 1.7.5.dev
dec814c try explicit tag for release
147baec get the osgi config more robust
fa09cc5 fix version of IT from jruby-complete
It appears to me that "[maven-release-plugin]" commits were pushed to Github twice for whatever reason. Do we have any idea how this happened, and how we can prevent this from happening in the future?
I merged the branches and pushed to jruby.org, so that the mirror is once again in sync with jruby.org.
Hiro