diff --git a/pom.xml b/pom.xml
index 510e30dd59..73ec6057d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -421,6 +421,51 @@
       </build>
       
     </profile>
+    
+    <profile>
+      <id>JDK7</id>
+      <activation>
+        <jdk>1.7</jdk>
+      </activation>
+      <properties>
+        <jdk.classifier>-jdk7</jdk.classifier>
+      </properties>
+    </profile>
+  
+    <profile>
+      <id>APIviz</id>
+      <activation>
+        <property>
+          <name>sonia.apiviz</name>
+          <value>true</value>
+        </property>
+      </activation>
+
+      <build>
+        <plugins>
+        
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.8.1</version>
+            <configuration>
+              <doclet>org.jboss.apiviz.APIviz</doclet>
+              <docletArtifact>
+                <groupId>org.jboss.apiviz</groupId>
+                <artifactId>apiviz${jdk.classifier}</artifactId>
+                <version>1.3.1.GA</version>
+              </docletArtifact>
+              <additionalparam>
+                -sourceclasspath ${project.build.outputDirectory}
+                -nopackagediagram
+              </additionalparam>
+            </configuration>
+          </plugin>
+        
+        </plugins>
+      </build>
+
+    </profile>
 
   </profiles>
   
@@ -455,6 +500,7 @@
     <project.build.javaLevel>1.6</project.build.javaLevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <netbeans.hint.license>SCM-BSD</netbeans.hint.license>
+    <jdk.classifier></jdk.classifier>
   </properties>
 
 </project>
\ No newline at end of file
diff --git a/scm-core/pom.xml b/scm-core/pom.xml
index 23f0086797..fa1296d182 100644
--- a/scm-core/pom.xml
+++ b/scm-core/pom.xml
@@ -88,43 +88,4 @@
 
   </dependencies>
   
-  <profiles>
-  
-    <profile>
-      <id>APIviz</id>
-      <activation>
-        <property>
-          <name>sonia.apiviz</name>
-          <value>true</value>
-        </property>
-      </activation>
-
-      <build>
-        <plugins>
-        
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.8.1</version>
-            <configuration>
-              <doclet>org.jboss.apiviz.APIviz</doclet>
-              <docletArtifact>
-                <groupId>org.jboss.apiviz</groupId>
-                <artifactId>apiviz</artifactId>
-                <version>1.3.1.GA</version>
-              </docletArtifact>
-              <additionalparam>
-                -sourceclasspath ${project.build.outputDirectory}
-                -nopackagediagram
-              </additionalparam>
-            </configuration>
-          </plugin>
-        
-        </plugins>
-      </build>
-
-    </profile>
-  
-  </profiles>
-
 </project>