Issue faktorips#21 - prepare conversion to plain maven projects

laeubi · Mar 16, 2022 · 495a033 · 495a033
1 parent 6a60d03
commit 495a033
Show file tree

Hide file tree

Showing 74 changed files with 112 additions and 353 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,8 @@
+# maven
 target/
 
+org.faktorips.valuetypes/.*
+
 # files generated (temporary) by the tycho maven builds
 .polyglot.*
 .META-INF_*

diff --git a/org.faktorips.aggregator/plugins/pom.xml b/org.faktorips.aggregator/plugins/pom.xml
@@ -45,7 +45,15 @@
         <module>../../org.faktorips.runtime.groovy</module>
         <module>../../org.faktorips.testsupport</module>
         <module>../../org.faktorips.util</module>
-        <module>../../org.faktorips.valuetypes</module>
         <module>../../org.faktorips.valuetypes.joda</module>
     </modules>
+
+    <dependencies>
+    <dependency>
+        <groupId>org.faktorips</groupId>
+        <artifactId>org.faktorips.valuetypes</artifactId>
+        <version>${project.version}</version>
+    </dependency>
+
+    </dependencies>
 </project>
diff --git a/org.faktorips.aggregator/pom.xml b/org.faktorips.aggregator/pom.xml
@@ -23,6 +23,7 @@
     <!-- These are all modules that are included in the Faktor-IPS build -->
 
     <modules>
+        <module>../org.faktorips.valuetypes</module>
         <module>targets</module>
         <module>plugins</module>
         <module>features</module>

diff --git a/org.faktorips.aggregator/tests/pom.xml b/org.faktorips.aggregator/tests/pom.xml
@@ -37,7 +37,6 @@
         <module>../../org.faktorips.runtime.groovy.test</module>
         <module>../../org.faktorips.testextensions</module>
         <module>../../org.faktorips.util.test</module>
-        <module>../../org.faktorips.valuetypes.test</module>
         <module>../../org.faktorips.valuetypes.joda.test</module>
     </modules>
 

diff --git a/org.faktorips.valuetypes/.classpath b/org.faktorips.valuetypes/.classpath
diff --git a/org.faktorips.valuetypes/.gitignore b/org.faktorips.valuetypes/.gitignore
diff --git a/org.faktorips.valuetypes/.project b/org.faktorips.valuetypes/.project
diff --git a/org.faktorips.valuetypes/.settings/org.eclipse.core.resources.prefs b/org.faktorips.valuetypes/.settings/org.eclipse.core.resources.prefs
diff --git a/org.faktorips.valuetypes/.settings/org.eclipse.core.runtime.prefs b/org.faktorips.valuetypes/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.faktorips.valuetypes/.settings/org.eclipse.jdt.launching.prefs b/org.faktorips.valuetypes/.settings/org.eclipse.jdt.launching.prefs
diff --git a/org.faktorips.valuetypes/.settings/org.eclipse.jdt.ui.prefs b/org.faktorips.valuetypes/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.faktorips.valuetypes/.settings/org.eclipse.pde.prefs b/org.faktorips.valuetypes/.settings/org.eclipse.pde.prefs
diff --git a/org.faktorips.valuetypes/.settings/org.moreunit.prefs b/org.faktorips.valuetypes/.settings/org.moreunit.prefs
diff --git a/org.faktorips.valuetypes/META-INF/MANIFEST.MF b/org.faktorips.valuetypes/META-INF/MANIFEST.MF
diff --git a/...ktorips.valuetypes/nexus/api-changes.json → org.faktorips.valuetypes/api-changes.json b/...ktorips.valuetypes/nexus/api-changes.json → org.faktorips.valuetypes/api-changes.json
diff --git a/org.faktorips.valuetypes/build.properties b/org.faktorips.valuetypes/build.properties