You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/11/04 11:14:59 UTC

[2/3] git commit: Completing preferred Maven XSD fix

Completing preferred Maven XSD fix


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3a73f5ab
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3a73f5ab
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3a73f5ab

Branch: refs/heads/master
Commit: 3a73f5ab9db36f12db389aaf128d78a87fbd6eda
Parents: f160740
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Nov 4 11:14:38 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Nov 4 11:14:38 2014 +0100

----------------------------------------------------------------------
 archetype/src/main/resources/meta-pom.xml                        | 4 +---
 .../main/java/org/apache/syncope/installer/files/ParentPom.java  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/3a73f5ab/archetype/src/main/resources/meta-pom.xml
----------------------------------------------------------------------
diff --git a/archetype/src/main/resources/meta-pom.xml b/archetype/src/main/resources/meta-pom.xml
index e148de3..692da02 100644
--- a/archetype/src/main/resources/meta-pom.xml
+++ b/archetype/src/main/resources/meta-pom.xml
@@ -16,12 +16,10 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-         http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/3a73f5ab/installer/src/main/java/org/apache/syncope/installer/files/ParentPom.java
----------------------------------------------------------------------
diff --git a/installer/src/main/java/org/apache/syncope/installer/files/ParentPom.java b/installer/src/main/java/org/apache/syncope/installer/files/ParentPom.java
index 513d93c..47b4503 100644
--- a/installer/src/main/java/org/apache/syncope/installer/files/ParentPom.java
+++ b/installer/src/main/java/org/apache/syncope/installer/files/ParentPom.java
@@ -36,7 +36,7 @@ public class ParentPom {
             + "\"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n"
             + "KIND, either express or implied.  See the License for the\n"
             + "specific language governing permissions and limitations\n" + "under the License.\n" + "\n"
-            + "--><project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0          http://maven.apache.org/maven-v4_0_0.xsd\">\n"
+            + "--><project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n"
             + "\n" + "  <modelVersion>4.0.0</modelVersion>\n" + "\n" + "  <parent>\n"
             + "    <groupId>org.apache.syncope</groupId>\n" + "    <artifactId>syncope</artifactId>\n"
             + "    <version xmlns=\"\">%s</version>\n" + "  </parent>\n" + "\n" + "  <properties>\n"