Преглед изворни кода

Merge fab046c60293fc24ba3c5ef9790e48afebc8a092 into 0398a33fe29ba56aa3525b435a830d270322df8e

Trevor Menagh пре 7 година
родитељ
комит
1544561d1e
2 измењених фајлова са 68 додато и 0 уклоњено
  1. 34
    0
      complete/pom.xml
  2. 34
    0
      initial/pom.xml

+ 34
- 0
complete/pom.xml Прегледај датотеку

@@ -7,6 +7,31 @@
7 7
     <artifactId>gs-rest-service</artifactId>
8 8
     <version>0.1.0</version>
9 9
 
10
+    <profiles>
11
+        <profile>
12
+            <id>standard-jdk</id>
13
+            <activation>
14
+                <file>
15
+                    <exists>${java.home}/../lib/tools.jar</exists>
16
+                </file>
17
+            </activation>
18
+            <properties>
19
+                <tools-jar>${java.home}/../lib/tools.jar</tools-jar>
20
+            </properties>
21
+        </profile>
22
+        <profile>
23
+            <id>apple-jdk</id>
24
+            <activation>
25
+                <file>
26
+                    <exists>${java.home}/../Classes/classes.jar</exists>
27
+                </file>
28
+            </activation>
29
+            <properties>
30
+                <tools-jar>${java.home}/../Classes/classes.jar</tools-jar>
31
+            </properties>
32
+        </profile>
33
+    </profiles>
34
+
10 35
     <parent>
11 36
         <groupId>org.springframework.boot</groupId>
12 37
         <artifactId>spring-boot-starter-parent</artifactId>
@@ -40,6 +65,15 @@
40 65
             <plugin>
41 66
                 <groupId>org.springframework.boot</groupId>
42 67
                 <artifactId>spring-boot-maven-plugin</artifactId>
68
+                <dependencies>
69
+                    <dependency>
70
+                        <groupId>com.sun</groupId>
71
+                        <artifactId>tools</artifactId>
72
+                        <version>1.6</version>
73
+                        <scope>system</scope>
74
+                        <systemPath>${tools-jar}</systemPath>
75
+                    </dependency>
76
+                </dependencies>
43 77
             </plugin>
44 78
         </plugins>
45 79
     </build>

+ 34
- 0
initial/pom.xml Прегледај датотеку

@@ -7,6 +7,31 @@
7 7
     <artifactId>gs-rest-service</artifactId>
8 8
     <version>0.1.0</version>
9 9
 
10
+    <profiles>
11
+        <profile>
12
+            <id>standard-jdk</id>
13
+            <activation>
14
+                <file>
15
+                    <exists>${java.home}/../lib/tools.jar</exists>
16
+                </file>
17
+            </activation>
18
+            <properties>
19
+                <tools-jar>${java.home}/../lib/tools.jar</tools-jar>
20
+            </properties>
21
+        </profile>
22
+        <profile>
23
+            <id>apple-jdk</id>
24
+            <activation>
25
+                <file>
26
+                    <exists>${java.home}/../Classes/classes.jar</exists>
27
+                </file>
28
+            </activation>
29
+            <properties>
30
+                <tools-jar>${java.home}/../Classes/classes.jar</tools-jar>
31
+            </properties>
32
+        </profile>
33
+    </profiles>
34
+
10 35
     <parent>
11 36
         <groupId>org.springframework.boot</groupId>
12 37
         <artifactId>spring-boot-starter-parent</artifactId>
@@ -40,6 +65,15 @@
40 65
             <plugin>
41 66
                 <groupId>org.springframework.boot</groupId>
42 67
                 <artifactId>spring-boot-maven-plugin</artifactId>
68
+                <dependencies>
69
+                    <dependency>
70
+                        <groupId>com.sun</groupId>
71
+                        <artifactId>tools</artifactId>
72
+                        <version>1.6</version>
73
+                        <scope>system</scope>
74
+                        <systemPath>${tools-jar}</systemPath>
75
+                    </dependency>
76
+                </dependencies>
43 77
             </plugin>
44 78
         </plugins>
45 79
     </build>