update license

dbe72295 · Jesper Fyhr Knudsen · b08ac1b1 · dbe72295 · dbe72295 · dbe72295
Commit dbe72295 authored 9 years ago by Jesper Fyhr Knudsen
--- a/octopus-java/.idea/compiler.xml
+++ b/octopus-java/.idea/compiler.xml
@@ -17,47 +17,17 @@
      <profile default="true" name="Default" enabled="false">
        <processorPath useClasspath="true" />
      </profile>
-      <profile default="false" name="Annotation profile for octopus-daemon" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-        <module name="octopus-daemon" />
-      </profile>
-      <profile default="false" name="Annotation profile for octopus-agent" enabled="true">
+      <profile default="false" name="Maven default annotation processors profile" enabled="true">
        <sourceOutputDir name="target/generated-sources/annotations" />
        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
        <outputRelativeToContentRoot value="true" />
        <processorPath useClasspath="true" />
        <module name="octopus-agent" />
-      </profile>
-      <profile default="false" name="Annotation profile for octopus-server" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-        <module name="octopus-server" />
-      </profile>
-      <profile default="false" name="Annotation profile for octopus-integrationtests" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-        <module name="octopus-integrationtests" />
-      </profile>
-      <profile default="false" name="Annotation profile for octopus-cli" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
        <module name="octopus-cli" />
-      </profile>
-      <profile default="false" name="Annotation profile for octopus-commons" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
        <module name="octopus-commons" />
+        <module name="octopus-daemon" />
+        <module name="octopus-integrationtests" />
+        <module name="octopus-server" />
      </profile>
    </annotationProcessing>
    <bytecodeTargetLevel target="1.7">

--- a/octopus-java/.idea/modules.xml
+++ b/octopus-java/.idea/modules.xml
@@ -4,18 +4,25 @@
    <modules>
      <module fileurl="file://$PROJECT_DIR$/octopus-agent/octopus-agent.iml" filepath="$PROJECT_DIR$/octopus-agent/octopus-agent.iml" />
      <module fileurl="file://$PROJECT_DIR$/octopus-agent/octopus-agent.iml" filepath="$PROJECT_DIR$/octopus-agent/octopus-agent.iml" />
+      <module fileurl="file://$PROJECT_DIR$/octopus-agent/octopus-agent.iml" filepath="$PROJECT_DIR$/octopus-agent/octopus-agent.iml" />
+      <module fileurl="file://$PROJECT_DIR$/octopus-cli/octopus-cli.iml" filepath="$PROJECT_DIR$/octopus-cli/octopus-cli.iml" />
      <module fileurl="file://$PROJECT_DIR$/octopus-cli/octopus-cli.iml" filepath="$PROJECT_DIR$/octopus-cli/octopus-cli.iml" />
      <module fileurl="file://$PROJECT_DIR$/octopus-cli/octopus-cli.iml" filepath="$PROJECT_DIR$/octopus-cli/octopus-cli.iml" />
      <module fileurl="file://$PROJECT_DIR$/octopus-commons/octopus-commons.iml" filepath="$PROJECT_DIR$/octopus-commons/octopus-commons.iml" />
      <module fileurl="file://$PROJECT_DIR$/octopus-commons/octopus-commons.iml" filepath="$PROJECT_DIR$/octopus-commons/octopus-commons.iml" />
+      <module fileurl="file://$PROJECT_DIR$/octopus-commons/octopus-commons.iml" filepath="$PROJECT_DIR$/octopus-commons/octopus-commons.iml" />
+      <module fileurl="file://$PROJECT_DIR$/octopus-daemon/octopus-daemon.iml" filepath="$PROJECT_DIR$/octopus-daemon/octopus-daemon.iml" />
      <module fileurl="file://$PROJECT_DIR$/octopus-daemon/octopus-daemon.iml" filepath="$PROJECT_DIR$/octopus-daemon/octopus-daemon.iml" />
      <module fileurl="file://$PROJECT_DIR$/octopus-daemon/octopus-daemon.iml" filepath="$PROJECT_DIR$/octopus-daemon/octopus-daemon.iml" />
      <module fileurl="file://$PROJECT_DIR$/octopus-integrationtests/octopus-integrationtests.iml" filepath="$PROJECT_DIR$/octopus-integrationtests/octopus-integrationtests.iml" />
      <module fileurl="file://$PROJECT_DIR$/octopus-integrationtests/octopus-integrationtests.iml" filepath="$PROJECT_DIR$/octopus-integrationtests/octopus-integrationtests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/octopus-integrationtests/octopus-integrationtests.iml" filepath="$PROJECT_DIR$/octopus-integrationtests/octopus-integrationtests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/octopus-server/octopus-server.iml" filepath="$PROJECT_DIR$/octopus-server/octopus-server.iml" />
      <module fileurl="file://$PROJECT_DIR$/octopus-server/octopus-server.iml" filepath="$PROJECT_DIR$/octopus-server/octopus-server.iml" />
      <module fileurl="file://$PROJECT_DIR$/octopus-server/octopus-server.iml" filepath="$PROJECT_DIR$/octopus-server/octopus-server.iml" />
      <module fileurl="file://$PROJECT_DIR$/parent-project.iml" filepath="$PROJECT_DIR$/parent-project.iml" />
      <module fileurl="file://$PROJECT_DIR$/parent-project.iml" filepath="$PROJECT_DIR$/parent-project.iml" />
+      <module fileurl="file://$PROJECT_DIR$/parent-project.iml" filepath="$PROJECT_DIR$/parent-project.iml" />
    </modules>
  </component>
 </project>
\ No newline at end of file
--- a/octopus-java/.idea/workspace.xml
+++ b/octopus-java/.idea/workspace.xml
--- a/octopus-java/LICENSE.txt
+++ b/octopus-java/LICENSE.txt
@@ -186,7 +186,7 @@
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

-   Copyright 2014 Chaos ApS
+   Copyright 2016 Chaos ApS

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.