Author: jbonofre
Date: Wed Sep 19 19:06:45 2012
New Revision: 1387707
URL: http://svn.apache.org/viewvc?rev=1387707&view=rev
Log:
Use same Maven XSD in all POM
Modified:
karaf/trunk/archetypes/command/src/main/resources/archetype-resources/pom.xml
karaf/trunk/demos/command/pom.xml
karaf/trunk/manual/pom.xml
karaf/trunk/manual/src/main/webapp/developers-guide/extending-console.conf
karaf/trunk/tooling/exam/container/pom.xml
karaf/trunk/tooling/exam/options/pom.xml
karaf/trunk/tooling/exam/pom.xml
karaf/trunk/tooling/karaf-maven-plugin/src/it/test-aggregate-features/pom.xml
karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/pom.xml
karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml
karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml
Modified:
karaf/trunk/archetypes/command/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/archetypes/command/src/main/resources/archetype-resources/pom.xml?rev=1387707&r1=1387706&r2=1387707&view=diff
==============================================================================
---
karaf/trunk/archetypes/command/src/main/resources/archetype-resources/pom.xml
(original)
+++
karaf/trunk/archetypes/command/src/main/resources/archetype-resources/pom.xml
Wed Sep 19 19:06:45 2012
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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";>
+<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";>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: karaf/trunk/demos/command/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/demos/command/pom.xml?rev=1387707&r1=1387706&r2=1387707&view=diff
==============================================================================
--- karaf/trunk/demos/command/pom.xml (original)
+++ karaf/trunk/demos/command/pom.xml Wed Sep 19 19:06:45 2012
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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";>
+<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";>
<!--
Modified: karaf/trunk/manual/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/manual/pom.xml?rev=1387707&r1=1387706&r2=1387707&view=diff
==============================================================================
--- karaf/trunk/manual/pom.xml (original)
+++ karaf/trunk/manual/pom.xml Wed Sep 19 19:06:45 2012
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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";>
+<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";>
<!--
Modified:
karaf/trunk/manual/src/main/webapp/developers-guide/extending-console.conf
URL:
http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/developers-guide/extending-console.conf?rev=1387707&r1=1387706&r2=1387707&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/developers-guide/extending-console.conf
(original)
+++ karaf/trunk/manual/src/main/webapp/developers-guide/extending-console.conf
Wed Sep 19 19:06:45 2012
@@ -44,7 +44,7 @@ h3. Manual creation
Alternatively, you can simply create the directory {{shell-sample-commands}}
and create the {{pom.xml}} file inside it:
{pygmentize:xml}
-<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";>
+<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";>
<modelVersion>4.0.0</modelVersion>
Modified: karaf/trunk/tooling/exam/container/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/pom.xml?rev=1387707&r1=1387706&r2=1387707&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/pom.xml (original)
+++ karaf/trunk/tooling/exam/container/pom.xml Wed Sep 19 19:06:45 2012
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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";>
+<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";>
<!--
Modified: karaf/trunk/tooling/exam/options/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/pom.xml?rev=1387707&r1=1387706&r2=1387707&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/pom.xml (original)
+++ karaf/trunk/tooling/exam/options/pom.xml Wed Sep 19 19:06:45 2012
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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";>
+<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";>
<!--
Modified: karaf/trunk/tooling/exam/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/pom.xml?rev=1387707&r1=1387706&r2=1387707&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/pom.xml (original)
+++ karaf/trunk/tooling/exam/pom.xml Wed Sep 19 19:06:45 2012
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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";>
+<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";>
<!--
Modified:
karaf/trunk/tooling/karaf-maven-plugin/src/it/test-aggregate-features/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-aggregate-features/pom.xml?rev=1387707&r1=1387706&r2=1387707&view=diff
==============================================================================
---
karaf/trunk/tooling/karaf-maven-plugin/src/it/test-aggregate-features/pom.xml
(original)
+++
karaf/trunk/tooling/karaf-maven-plugin/src/it/test-aggregate-features/pom.xml
Wed Sep 19 19:06:45 2012
@@ -1,26 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<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";>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY 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";>
- <!-- invalid model version to make build fail -->
<modelVersion>4.0.0</modelVersion>
<groupId>test</groupId>
@@ -66,4 +64,5 @@
</plugin>
</plugins>
</build>
+
</project>
\ No newline at end of file
Modified:
karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/pom.xml?rev=1387707&r1=1387706&r2=1387707&view=diff
==============================================================================
---
karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/pom.xml
(original)
+++
karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/pom.xml
Wed Sep 19 19:06:45 2012
@@ -1,26 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<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";>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY 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";>
- <!-- invalid model version to make build fail -->
<modelVersion>4.0.0</modelVersion>
<groupId>test</groupId>
<artifactId>test-check-dependencies-failure</artifactId>
@@ -64,4 +62,5 @@
</plugin>
</plugins>
</build>
+
</project>
\ No newline at end of file
Modified:
karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml?rev=1387707&r1=1387706&r2=1387707&view=diff
==============================================================================
---
karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml
(original)
+++
karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml
Wed Sep 19 19:06:45 2012
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
+<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";>
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ 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";>
- <!-- invalid model version to make build fail -->
<modelVersion>4.0.0</modelVersion>
+
<groupId>test</groupId>
<artifactId>test-check-dependencies</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -63,4 +63,5 @@
</plugin>
</plugins>
</build>
+
</project>
\ No newline at end of file
Modified: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml?rev=1387707&r1=1387706&r2=1387707&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml
(original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml Wed
Sep 19 19:06:45 2012
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ 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";>
- <!-- invalid model version to make build fail -->
+<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";>
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
<modelVersion>4.0.0</modelVersion>
+
<groupId>test</groupId>
<artifactId>test-recursive</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -62,4 +63,5 @@
</plugin>
</plugins>
</build>
+
</project>
\ No newline at end of file
