Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Conversation

@mathieuboniface
Copy link
Contributor

See #358

  • Maven groupids have been updated
  • Package names have been updated
  • Maven and eclipse builds are both successful
  • Unit tests are OK.

@pyricau
Copy link
Contributor

pyricau commented Oct 31, 2012

Thanks. We should release 2.7 first though :)

@pyricau
Copy link
Contributor

pyricau commented Oct 31, 2012

You're going to earn a lot of "+" and "-" on the contributors graph with this ;)

Conflicts:
	AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/MethodProcessor.java
Conflicts:
	AndroidAnnotations/androidannotations-api/pom.xml
	AndroidAnnotations/androidannotations-bundle/pom.xml
	AndroidAnnotations/androidannotations-with-codemodel/pom.xml
	AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java
	AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/RestProcessor.java
	AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeActivity.java
	AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeImplementation.java
	AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/ebean/SomeInterface.java
	AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/ActivityInManifest.java
	AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/ActivityNotInManifest.java
	AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/ActivitySubclassInManifest.java
	AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/manifest/SomeClass.java
	AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/ProcessorAssert.java
	AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/EBeanTest.java
	AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestErrorsTest.java
	AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/manifest/AndroidManifestFinderTest.java
	AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/AAProcessorTestHelper.java
	AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ClassFinder.java
	AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ProcessorTestHelper.java
	AndroidAnnotations/functional-test-1-5-tests/pom.xml
	AndroidAnnotations/functional-test-1-5/pom.xml
@mathieuboniface
Copy link
Contributor Author

Ok, ready to be merged :)

@pyricau pyricau merged commit 70367c1 into develop Nov 6, 2012
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants