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

JBIDE-24246 new fuse multiple... #951

Merged
merged 3 commits into from
May 3, 2017
Merged

Conversation

nickboldt
Copy link
Member

JBIDE-24246 new fuse multiple target

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

switch to including features
more missing features/plugins
fix attach-artifacts and rename the TP zip

Signed-off-by: nickboldt <nboldt@redhat.com>
@apupier
Copy link
Member

apupier commented May 2, 2017

the build error is

21:50:36 [ERROR] Cannot resolve project dependencies:
21:50:36 [ERROR]   Software being installed: org.fusesource.ide.camel.validation.tests.integration 9.2.0.qualifier
21:50:36 [ERROR]   Missing requirement: org.fusesource.ide.project 9.2.0.qualifier requires 'bundle org.sonatype.tycho.m2e 0.9.0' but it could not be found
21:50:36 [ERROR]   Cannot satisfy dependency: org.fusesource.ide.camel.validation.tests.integration 9.2.0.qualifier depends on: bundle org.fusesource.ide.projecttemplates 9.2.0
21:50:36 [ERROR]   Cannot satisfy dependency: org.fusesource.ide.projecttemplates 9.2.0.qualifier depends on: bundle org.fusesource.ide.project 9.2.0
21:50:36 [ERROR] 
21:50:36 [ERROR] See http://wiki.eclipse.org/Tycho/Dependency_Resolution_Troubleshooting for help.
21:50:36 [ERROR] Cannot resolve dependencies of MavenProject: org.fusesource.ide.core:org.fusesource.ide.camel.validation.tests.integration:9.2.0-SNAPSHOT @ /home/jenkins/workspace/Fuse-Tooling-pullrequest/core/tests/org.fusesource.ide.camel.validation.tests.integration/pom.xml: See log for details -> [Help 1]

I suspect that the 10.x branch is not up-to-date

Signed-off-by: nickboldt <nboldt@redhat.com>
Signed-off-by: nickboldt <nboldt@redhat.com>
@nickboldt
Copy link
Member Author

retest this please

@@ -48,6 +48,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

<jbtis.version>4.5.0.AM1-SNAPSHOT</jbtis.version>
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't see why we need that any longer.

Copy link
Member Author

Choose a reason for hiding this comment

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

The addition of this new .target file does not mean it's being USED. That will happen in a second PR. I just wanted you to test out the .target file and verify it works for you as expected, before we figure out how to use it inside your build.'

Copy link
Contributor

Choose a reason for hiding this comment

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

I am talking about that addition of the jbtis.version property. This property doesn't seem to be used anywhere or am I wrong?

Copy link
Member Author

Choose a reason for hiding this comment

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

Looks like 2/3 of verifications passed, with just some test failure in org.fusesource.ide.projecttemplates.tests.integration and org.fusesource.ide.jmx.camel.tests.integration ... see https://dev-platform-jenkins.rhev-ci-vms.eng.rdu2.redhat.com/job/jbosstools-fuse-Pull-Request/31/console

Copy link
Member Author

Choose a reason for hiding this comment

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

You still need it because
https://github.com/jbosstools/jbosstools-fuse/blob/master/targetplatform/pom.xml#L61
needs it.

Once that TP is no longer used, we can remove all reference to jbtis.

@lhein
Copy link
Contributor

lhein commented May 3, 2017

ah, gotcha

@lhein lhein merged commit 5f1b180 into jbosstools:10.x May 3, 2017
lhein added a commit that referenced this pull request May 16, 2017
* 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
lhein added a commit that referenced this pull request May 23, 2017
* 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

* rebase 10.x branch with latest master used in 9.2.0.CR3 (#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 (#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

* Update the help files for 9.2.0.Final
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
nickboldt added a commit to nickboldt/jbosstools-fuse that referenced this pull request Jun 13, 2017
* 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>
apupier pushed a commit to apupier/jbosstools-fuse that referenced this pull request Jun 27, 2017
* 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>
apupier pushed a commit that referenced this pull request Jul 12, 2017
* 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
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.

3 participants