killbill-memoizeit

Update to IntelliJ 2017 1.1, prompted for these changes ??

4/14/2017 7:27:58 PM

stephane brossier

Commit: 1fd0eb4

Tree: d4782c7

Parents: d5cf0bd

Changes

.idea/.name 1(+0 -1)

.idea/codeStyleSettings.xml 62(+0 -62)

.idea/compiler.xml 16(+0 -16)

.idea/copyright/apache.xml 9(+0 -9)

.idea/copyright/profiles_settings.xml 3(+0 -3)

.idea/dictionaries/pierre.xml 16(+0 -16)

.idea/encodings.xml 5(+2 -3)

.idea/inspectionProfiles/profiles_settings.xml 7(+0 -7)

.idea/inspectionProfiles/Project_Default.xml 48(+0 -48)

.idea/libraries/Maven__org_apache_felix_org_apache_felix_configadmin_1_6_0.xml 14(+0 -14)

.idea/misc.xml 8(+2 -6)

.idea/modules.xml 32(+32 -0)

.idea/scopes/scope_settings.xml 5(+0 -5)

.idea/uiDesigner.xml 125(+0 -125)

.idea/vcs.xml 3(+1 -2)

Details

.idea/compiler.xml 16(+0 -16)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index d6c37f8..a55366d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -16,7 +16,6 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="currency" />
         <module name="killbill-account" />
         <module name="killbill-beatrix" />
         <module name="killbill-catalog" />
@@ -37,7 +36,6 @@
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
-      <module name="currency" target="1.6" />
       <module name="killbill" target="1.6" />
       <module name="killbill-account" target="1.6" />
       <module name="killbill-beatrix" target="1.6" />
@@ -48,25 +46,11 @@
       <module name="killbill-invoice" target="1.6" />
       <module name="killbill-jaxrs" target="1.6" />
       <module name="killbill-junction" target="1.6" />
-      <module name="killbill-osgi" target="1.6" />
-      <module name="killbill-osgi-all-bundles" target="1.6" />
-      <module name="killbill-osgi-bundles" target="1.6" />
-      <module name="killbill-osgi-bundles-defaultbundles" target="1.6" />
-      <module name="killbill-osgi-bundles-jruby" target="1.6" />
-      <module name="killbill-osgi-bundles-lib-killbill" target="1.6" />
-      <module name="killbill-osgi-bundles-lib-slf4j-osgi" target="1.6" />
-      <module name="killbill-osgi-bundles-logger" target="1.6" />
-      <module name="killbill-osgi-bundles-test-beatrix" target="1.6" />
-      <module name="killbill-osgi-bundles-test-payment" target="1.6" />
-      <module name="killbill-osgi-bundles-webconsolebranding" target="1.6" />
-      <module name="killbill-osgi-lib-bundles" target="1.6" />
-      <module name="killbill-osgi-test-bundles" target="1.6" />
       <module name="killbill-overdue" target="1.6" />
       <module name="killbill-payment" target="1.6" />
       <module name="killbill-profiles" target="1.6" />
       <module name="killbill-profiles-killbill" target="1.6" />
       <module name="killbill-profiles-killpay" target="1.6" />
-      <module name="killbill-server" target="1.6" />
       <module name="killbill-subscription" target="1.6" />
       <module name="killbill-tenant" target="1.6" />
       <module name="killbill-usage" target="1.6" />

.idea/encodings.xml 5(+2 -3)

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index d0e8896..366a39f 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" defaultCharsetForPropertiesFiles="UTF-8">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/account" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/api" charset="UTF-8" />
@@ -22,5 +22,4 @@
     <file url="file://$PROJECT_DIR$/util" charset="UTF-8" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file

.idea/misc.xml 8(+2 -6)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8a80acb..4989967 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
@@ -10,8 +7,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
-</project>
-
+</project>
\ No newline at end of file

.idea/modules.xml 32(+32 -0)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 560d78f..bca5bb6 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/util/target/generated-sources/generated-sources.iml" filepath="$PROJECT_DIR$/util/target/generated-sources/generated-sources.iml" />
       <module fileurl="file://$PROJECT_DIR$/killbill.iml" filepath="$PROJECT_DIR$/killbill.iml" />
       <module fileurl="file://$PROJECT_DIR$/account/killbill-account.iml" filepath="$PROJECT_DIR$/account/killbill-account.iml" />
       <module fileurl="file://$PROJECT_DIR$/beatrix/killbill-beatrix.iml" filepath="$PROJECT_DIR$/beatrix/killbill-beatrix.iml" />
@@ -21,6 +22,37 @@
       <module fileurl="file://$PROJECT_DIR$/tenant/killbill-tenant.iml" filepath="$PROJECT_DIR$/tenant/killbill-tenant.iml" />
       <module fileurl="file://$PROJECT_DIR$/usage/killbill-usage.iml" filepath="$PROJECT_DIR$/usage/killbill-usage.iml" />
       <module fileurl="file://$PROJECT_DIR$/util/killbill-util.iml" filepath="$PROJECT_DIR$/util/killbill-util.iml" />
+      <module fileurl="file://$PROJECT_DIR$/api/src/main/main.iml" filepath="$PROJECT_DIR$/api/src/main/main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/tenant/src/main/main1.iml" filepath="$PROJECT_DIR$/tenant/src/main/main1.iml" />
+      <module fileurl="file://$PROJECT_DIR$/invoice/src/main/main10.iml" filepath="$PROJECT_DIR$/invoice/src/main/main10.iml" />
+      <module fileurl="file://$PROJECT_DIR$/catalog/src/main/main11.iml" filepath="$PROJECT_DIR$/catalog/src/main/main11.iml" />
+      <module fileurl="file://$PROJECT_DIR$/overdue/src/main/main12.iml" filepath="$PROJECT_DIR$/overdue/src/main/main12.iml" />
+      <module fileurl="file://$PROJECT_DIR$/currency/src/main/main13.iml" filepath="$PROJECT_DIR$/currency/src/main/main13.iml" />
+      <module fileurl="file://$PROJECT_DIR$/util/src/main/main14.iml" filepath="$PROJECT_DIR$/util/src/main/main14.iml" />
+      <module fileurl="file://$PROJECT_DIR$/payment/src/main/main15.iml" filepath="$PROJECT_DIR$/payment/src/main/main15.iml" />
+      <module fileurl="file://$PROJECT_DIR$/profiles/killpay/src/main/main16.iml" filepath="$PROJECT_DIR$/profiles/killpay/src/main/main16.iml" />
+      <module fileurl="file://$PROJECT_DIR$/beatrix/src/main/main2.iml" filepath="$PROJECT_DIR$/beatrix/src/main/main2.iml" />
+      <module fileurl="file://$PROJECT_DIR$/junction/src/main/main3.iml" filepath="$PROJECT_DIR$/junction/src/main/main3.iml" />
+      <module fileurl="file://$PROJECT_DIR$/profiles/killbill/src/main/main4.iml" filepath="$PROJECT_DIR$/profiles/killbill/src/main/main4.iml" />
+      <module fileurl="file://$PROJECT_DIR$/subscription/src/main/main5.iml" filepath="$PROJECT_DIR$/subscription/src/main/main5.iml" />
+      <module fileurl="file://$PROJECT_DIR$/entitlement/src/main/main6.iml" filepath="$PROJECT_DIR$/entitlement/src/main/main6.iml" />
+      <module fileurl="file://$PROJECT_DIR$/usage/src/main/main7.iml" filepath="$PROJECT_DIR$/usage/src/main/main7.iml" />
+      <module fileurl="file://$PROJECT_DIR$/jaxrs/src/main/main8.iml" filepath="$PROJECT_DIR$/jaxrs/src/main/main8.iml" />
+      <module fileurl="file://$PROJECT_DIR$/account/src/main/main9.iml" filepath="$PROJECT_DIR$/account/src/main/main9.iml" />
+      <module fileurl="file://$PROJECT_DIR$/invoice/src/test/test.iml" filepath="$PROJECT_DIR$/invoice/src/test/test.iml" />
+      <module fileurl="file://$PROJECT_DIR$/payment/src/test/test1.iml" filepath="$PROJECT_DIR$/payment/src/test/test1.iml" />
+      <module fileurl="file://$PROJECT_DIR$/entitlement/src/test/test10.iml" filepath="$PROJECT_DIR$/entitlement/src/test/test10.iml" />
+      <module fileurl="file://$PROJECT_DIR$/usage/src/test/test11.iml" filepath="$PROJECT_DIR$/usage/src/test/test11.iml" />
+      <module fileurl="file://$PROJECT_DIR$/profiles/killbill/src/test/test12.iml" filepath="$PROJECT_DIR$/profiles/killbill/src/test/test12.iml" />
+      <module fileurl="file://$PROJECT_DIR$/junction/src/test/test13.iml" filepath="$PROJECT_DIR$/junction/src/test/test13.iml" />
+      <module fileurl="file://$PROJECT_DIR$/beatrix/src/test/test2.iml" filepath="$PROJECT_DIR$/beatrix/src/test/test2.iml" />
+      <module fileurl="file://$PROJECT_DIR$/overdue/src/test/test3.iml" filepath="$PROJECT_DIR$/overdue/src/test/test3.iml" />
+      <module fileurl="file://$PROJECT_DIR$/jaxrs/src/test/test4.iml" filepath="$PROJECT_DIR$/jaxrs/src/test/test4.iml" />
+      <module fileurl="file://$PROJECT_DIR$/account/src/test/test5.iml" filepath="$PROJECT_DIR$/account/src/test/test5.iml" />
+      <module fileurl="file://$PROJECT_DIR$/tenant/src/test/test6.iml" filepath="$PROJECT_DIR$/tenant/src/test/test6.iml" />
+      <module fileurl="file://$PROJECT_DIR$/util/src/test/test7.iml" filepath="$PROJECT_DIR$/util/src/test/test7.iml" />
+      <module fileurl="file://$PROJECT_DIR$/subscription/src/test/test8.iml" filepath="$PROJECT_DIR$/subscription/src/test/test8.iml" />
+      <module fileurl="file://$PROJECT_DIR$/catalog/src/test/test9.iml" filepath="$PROJECT_DIR$/catalog/src/test/test9.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file

.idea/vcs.xml 3(+1 -2)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file