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

ISPN-4177 Upgrade to WildFly 8.1.0.Final #2579

Closed

Conversation

tristantarrant
Copy link
Member

https://issues.jboss.org/browse/ISPN-4177

Big Effing Commit

  • Upgrade our server base to WildFly 8.1.0.RC2
  • Rebase our REST service on Undertow
  • New build strategy that uses the wildfly-dist package as a base instead of keeping a copy of all the upstream build machinery
  • Rename server/integration/integration to server/integration/endpoint: the cacophony was driving me spare

@Sanne
Copy link
Member

Sanne commented May 27, 2014

ALL IN ONE COMMIT?

Now I understand the jokes on IRC this morning :-)
I'm not merging this!

@Sanne
Copy link
Member

Sanne commented May 27, 2014

More seriously: there is some practical value in making sure that git actually is able to recognize when you're moving files. If you do, you're not just making review far easier but also future merges, bisects and rebases will work flawlessly rather than producing a huge red conflict.

@galderz
Copy link
Member

galderz commented May 28, 2014

@tristantarrant CI failed with:

[17:11:35][org.infinispan.server:infinispan-server-jgroups] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.16:test (default-test) on project infinispan-server-jgroups: Illegal parallel='false'

@tristantarrant
Copy link
Member Author

@Sanne actually git locally does mark all the files as moved, so I don't know if it's github getting it wrong. The actual payload of this PR is quite small, with lots of noise. Here is the breakdown

  • removed build/src/main/resources (which contained the original AS7 files)
  • modified build/pom.xml and build/build.xml to use download and unpack wildfly-dist-x.y.z.zip from maven
  • renamed build/src/main/resources-ispn to build/src/main/resources
  • removed our clone of the security subsystem (which we used to have to patch, but not anymore)
  • patched our subsystems to remove the use of deprecated APIs
  • changed the REST endpoint to use Undertow instead of Catalina (probably the largest change)

@tristantarrant
Copy link
Member Author

@galderz fixed

@tristantarrant
Copy link
Member Author

@mgencur I have made some minor adjustments to the integration testsuite but I'm not sure I've done everything that is needed. Note the upgrade of a bunch of subsystem schemas.

@mgencur
Copy link
Contributor

mgencur commented May 28, 2014

The server test suite needs several changes and I'm working on it:

  • I need to upgrade and release new version of infinispan-arquillian-container (some changes required so that it works with wildfly - e.g. a different jmx protocol again)
  • change arquillian.xml to use the new management port (9990 instead of 9999)
  • changes to various tests which explicitly set the management port for wildfly
  • I also get this https://gist.github.com/mgencur/f254613ffca08698b34e when running tests for remote queries - needs more investigation

@mgencur
Copy link
Contributor

mgencur commented May 28, 2014

So the exception I was getting is caused by the fact that ISPN server now pulls in org/hibernate/hql/lucene/hibernate-hql-lucene-1.0.0.Alpha6.jar - this is wrong, it should be 1.0.0.CR1

@Sanne
Copy link
Member

Sanne commented May 28, 2014

@tristantarrant Right, github UI is not as smart as a local git inspection, still in such scenarios I think a sequence of specific commits is easier to handle (and maintain and understand).

@mgencur from that exception it looks like it's using the old hql-lucene parser, you need 1.0.0.CR1

@tristantarrant
Copy link
Member Author

We were still "importing" infinispan-bom instead of infinispan-parent (which inherits from bom) thus wildfly-parent (which we are also importing) was overriding the hql parser version. Fixed

@mgencur
Copy link
Contributor

mgencur commented May 29, 2014

Here's the commit that fixes the server test suite. You can add it to this PR: mgencur@a31d04e

I released a new version of Infinispan Arquillian project (1.2.0.Alpha1) and updated server test suite to use it.

@mgencur
Copy link
Contributor

mgencur commented May 29, 2014

One more problem with dependencies: LevelDB cache store depends on org.iq80.leveldb:leveldb:jar:0.5 but the server (after the rebase) contains version 0.6. So currently the test for LevelDB fails.

@tristantarrant
Copy link
Member Author

Pulled in @mgencur 's test fixes and removed the spurious leveldb dep from server/integration/versions/pom.xml

@galderz
Copy link
Member

galderz commented Jun 2, 2014

@tristantarrant CI run on Friday, shows the error I mentioned above, but for a different project:

[11:31:31][org.infinispan.server:infinispan-server-infinispan] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.16:test (default-test) on project infinispan-server-infinispan: Illegal parallel='false'

@galderz
Copy link
Member

galderz commented Jun 2, 2014

Also needs rebasing

@tristantarrant
Copy link
Member Author

Rebased and fixed the parallel parameter

@tristantarrant tristantarrant changed the title ISPN-4177 Upgrade to WildFly 8.1.0.CR2 ISPN-4177 Upgrade to WildFly 8.1.0.Final Jun 3, 2014
@tristantarrant
Copy link
Member Author

Oh, and WildFly 8.1.0.Final is out

@galderz
Copy link
Member

galderz commented Jun 9, 2014

Rebasing needed...

@galderz
Copy link
Member

galderz commented Jun 10, 2014

Also, the last build did not succeed, failed with:

[org.infinispan.server:infinispan-server-build] Failed to execute goal org.apache.maven.plugins:maven-antrun-plugin:1.7:run (build-dist-dir) on project infinispan-server-build: An Ant BuildException has occured: The following error occurred while executing this line:
/mnt/ebs/TeamCity/buildAgent/work/c8db63ad778e4d73/server/integration/build/build.xml:186: The following error occurred while executing this line:
/mnt/ebs/TeamCity/buildAgent/work/c8db63ad778e4d73/server/integration/build/lib.xml:53: /mnt/ebs/TeamCity/buildAgent/work/c8db63ad778e4d73/server/integration/build/src/main/resources/modules/system/layers/base/org/infinispan/objectfilter/main does not exist.
around Ant part ...<ant antfile="build.xml" inheritRefs="true">... @ 4:47 in /mnt/ebs/TeamCity/buildAgent/work/c8db63ad778e4d73/server/integration/build/target/antrun/build-main.xml

@tristantarrant
Copy link
Member Author

Rebased

@galderz
Copy link
Member

galderz commented Jun 11, 2014

Integrated, thanks @tristantarrant :)

@galderz galderz closed this Jun 11, 2014
@tristantarrant tristantarrant deleted the ISPN-4177/wf8 branch October 30, 2014 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants