Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move master branch to Oxygen / 10.0 #971

Merged
merged 7 commits into from
May 23, 2017
Merged

Move master branch to Oxygen / 10.0 #971

merged 7 commits into from
May 23, 2017

Conversation

lhein
Copy link
Contributor

@lhein lhein commented May 22, 2017

No description provided.

lhein and others added 7 commits April 26, 2017 17:38
* JBIDE-24246 new fuse multiple target
switch to including features
more missing features/plugins
fix attach-artifacts and rename the TP zip

Signed-off-by: nickboldt <nboldt@redhat.com>

* use jbtis.version = 4.5.0.AM1-SNAPSHOT in Oxygen-based 10.x branch

Signed-off-by: nickboldt <nboldt@redhat.com>

* use org.sonatype.tycho.m2e 0.8.1 instead of 0.9.0 in 10.x branch

Signed-off-by: nickboldt <nboldt@redhat.com>
* changed m2e tycho version to 0.8.1

* FUSETOOLS-2382 - switch version to 10.0.0
* changed m2e tycho version to 0.8.1

* FUSETOOLS-2318 - Make CamelDebugFacade Jolokia compliant

- add test to ensure it
- cast to Collections instead of HashSet

* upgrade JBTIS TP to 4.4.3.CR1

* FUSETOOLS-2377 - Provide support for 2.18.1-redhat-000015

- corresponds to FIS 2.0.0 patch release
- FIS images pointed in launch configuration has been updated too

* FUSETOOLS-2388 - workaround to play bleuprint test with Camel
2.18.1.redhat-000015

- exclude fileinstall as a workaround
- reactivate CBR test with 2.18 version

* FUSETOOLS-2387 - Upgrade TP to 4.4.3.CR2

* override the default surefire timeout (#953)

* updated launch config for Neon Linux (#960)

* FUSETOOLS-2374: Fix issues in JSONPage found by SonarQube (#935)

* Revert "FUSETOOLS-2374: Fix issues in JSONPage found by SonarQube (#935)" (#961)

This reverts commit e2698f1.

* FUSETOOLS-2398 - fix NPE when trying to access active shell from non-… (#962)

* FUSETOOLS-2398 - fix NPE when trying to access active shell from non-ui-thread

* removed unused import

* FUSETOOLS-2398 - fix for the invalidThreadAccess error (#963)

* FUSETOOLS-2398 - fix NPE when trying to access active shell from non-ui-thread

* removed unused import

* FUSETOOLS-2398 - invoking updateDeps in UI Thread now

* fixed sonartype issue

* fixed sonartype issue

* made update dep call async

* upgrade TP to 4.4.3.Final-SNAPSHOT (#964)

* reworked build to use JBT Oxygen (#943)

* JBIDE-24246 new fuse multiple... (#951)

* JBIDE-24246 new fuse multiple target
switch to including features
more missing features/plugins
fix attach-artifacts and rename the TP zip

Signed-off-by: nickboldt <nboldt@redhat.com>

* use jbtis.version = 4.5.0.AM1-SNAPSHOT in Oxygen-based 10.x branch

Signed-off-by: nickboldt <nboldt@redhat.com>

* use org.sonatype.tycho.m2e 0.8.1 instead of 0.9.0 in 10.x branch

Signed-off-by: nickboldt <nboldt@redhat.com>

* FUSETOOLS-2382 - set versions to 10.0.0 (#947)

* changed m2e tycho version to 0.8.1

* FUSETOOLS-2382 - switch version to 10.0.0

* fixed wrong reference version to parent pom

* fixed wrong version of latest fis bundle

* fixed double entries in pom repo section caused by bad rebase

* added missing deps to newest fis bundle
* master:
  Update the help files for 9.2.0.Final
  Revert "FUSEDOC-1929 remote Came Context debugging (#968)"
  FUSEDOC-1929 remote Came Context debugging (#968)
  update to JBTIS TP 4.4.3.Final (#967)
  upgrade TP to 4.4.3.Final-SNAPSHOT (#964)
  FUSETOOLS-2398 - fix for the invalidThreadAccess error (#963)
  FUSETOOLS-2398 - fix NPE when trying to access active shell from non-… (#962)
  Revert "FUSETOOLS-2374: Fix issues in JSONPage found by SonarQube (#935)" (#961)
  FUSETOOLS-2374: Fix issues in JSONPage found by SonarQube (#935)
  updated launch config for Neon Linux (#960)
  override the default surefire timeout (#953)
  FUSETOOLS-2387 - Upgrade TP to 4.4.3.CR2
  FUSETOOLS-2388 - workaround to play bleuprint test with Camel 2.18.1.redhat-000015
  FUSETOOLS-2377 - Provide support for 2.18.1-redhat-000015
  upgrade JBTIS TP to 4.4.3.CR1
  FUSETOOLS-2318 - Make CamelDebugFacade Jolokia compliant
  changed m2e tycho version to 0.8.1
* 10.x:
  Update the help files for 9.2.0.Final
  rebase 10.x branch with latest master used in 9.2.0.CR3 (#965)
  FUSETOOLS-2382 - set versions to 10.0.0 (#947)
  JBIDE-24246 new fuse multiple... (#951)
  reworked build to use JBT Oxygen (#943)
Copy link
Contributor

@bfitzpat bfitzpat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once we get a good PR build, +1

@lhein
Copy link
Contributor Author

lhein commented May 23, 2017

testPR

@lhein lhein merged commit 17d15a9 into jbosstools:master May 23, 2017
@lhein lhein removed the in progress label May 23, 2017
apupier pushed a commit to apupier/jbosstools-fuse that referenced this pull request May 24, 2017
* reworked build to use JBT Oxygen (jbosstools#943)

* JBIDE-24246 new fuse multiple... (jbosstools#951)

* JBIDE-24246 new fuse multiple target
switch to including features
more missing features/plugins
fix attach-artifacts and rename the TP zip

Signed-off-by: nickboldt <nboldt@redhat.com>

* use jbtis.version = 4.5.0.AM1-SNAPSHOT in Oxygen-based 10.x branch

Signed-off-by: nickboldt <nboldt@redhat.com>

* use org.sonatype.tycho.m2e 0.8.1 instead of 0.9.0 in 10.x branch

Signed-off-by: nickboldt <nboldt@redhat.com>

* FUSETOOLS-2382 - set versions to 10.0.0 (jbosstools#947)

* changed m2e tycho version to 0.8.1

* FUSETOOLS-2382 - switch version to 10.0.0

* rebase 10.x branch with latest master used in 9.2.0.CR3 (jbosstools#965)

* changed m2e tycho version to 0.8.1

* FUSETOOLS-2318 - Make CamelDebugFacade Jolokia compliant

- add test to ensure it
- cast to Collections instead of HashSet

* upgrade JBTIS TP to 4.4.3.CR1

* FUSETOOLS-2377 - Provide support for 2.18.1-redhat-000015

- corresponds to FIS 2.0.0 patch release
- FIS images pointed in launch configuration has been updated too

* FUSETOOLS-2388 - workaround to play bleuprint test with Camel
2.18.1.redhat-000015

- exclude fileinstall as a workaround
- reactivate CBR test with 2.18 version

* FUSETOOLS-2387 - Upgrade TP to 4.4.3.CR2

* override the default surefire timeout (jbosstools#953)

* updated launch config for Neon Linux (jbosstools#960)

* FUSETOOLS-2374: Fix issues in JSONPage found by SonarQube (jbosstools#935)

* Revert "FUSETOOLS-2374: Fix issues in JSONPage found by SonarQube (jbosstools#935)" (jbosstools#961)

This reverts commit e2698f1.

* FUSETOOLS-2398 - fix NPE when trying to access active shell from non-… (jbosstools#962)

* FUSETOOLS-2398 - fix NPE when trying to access active shell from non-ui-thread

* removed unused import

* FUSETOOLS-2398 - fix for the invalidThreadAccess error (jbosstools#963)

* FUSETOOLS-2398 - fix NPE when trying to access active shell from non-ui-thread

* removed unused import

* FUSETOOLS-2398 - invoking updateDeps in UI Thread now

* fixed sonartype issue

* fixed sonartype issue

* made update dep call async

* upgrade TP to 4.4.3.Final-SNAPSHOT (jbosstools#964)

* reworked build to use JBT Oxygen (jbosstools#943)

* JBIDE-24246 new fuse multiple... (jbosstools#951)

* JBIDE-24246 new fuse multiple target
switch to including features
more missing features/plugins
fix attach-artifacts and rename the TP zip

Signed-off-by: nickboldt <nboldt@redhat.com>

* use jbtis.version = 4.5.0.AM1-SNAPSHOT in Oxygen-based 10.x branch

Signed-off-by: nickboldt <nboldt@redhat.com>

* use org.sonatype.tycho.m2e 0.8.1 instead of 0.9.0 in 10.x branch

Signed-off-by: nickboldt <nboldt@redhat.com>

* FUSETOOLS-2382 - set versions to 10.0.0 (jbosstools#947)

* changed m2e tycho version to 0.8.1

* FUSETOOLS-2382 - switch version to 10.0.0

* fixed wrong reference version to parent pom

* fixed wrong version of latest fis bundle

* fixed double entries in pom repo section caused by bad rebase

* added missing deps to newest fis bundle

* Update the help files for 9.2.0.Final
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants