Author: gawor
Date: Wed Dec 23 23:49:48 2009
New Revision: 893657
URL: http://svn.apache.org/viewvc?rev=893657&view=rev
Log:
fix pom formatting. no tabs, 4 spaces
Modified:
incubator/aries/trunk/jmx/jmx-api/pom.xml
incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml
incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml
incubator/aries/trunk/jmx/jmx-bundle/pom.xml
incubator/aries/trunk/jmx/jmx-core/pom.xml
incubator/aries/trunk/jmx/jmx-itests/pom.xml
Modified: incubator/aries/trunk/jmx/jmx-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-api/pom.xml?rev=893657&r1=893656&r2=893657&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-api/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-api/pom.xml Wed Dec 23 23:49:48 2009
@@ -14,7 +14,8 @@
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";>
+<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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries.jmx</groupId>
@@ -28,7 +29,7 @@
<description>
This bundle contains the JMX 1.0.0 API
</description>
-
+
<build>
<plugins>
<plugin>
@@ -39,12 +40,12 @@
<instructions>
<Bundle-SymbolicName>${pom.groupId}.api</Bundle-SymbolicName>
<Export-Package>
-
org.osgi.jmx;version="1.0.0";uses:="javax.management.openmbean",
-
org.osgi.jmx.framework;version="1.5.0";uses:="org.osgi.jmx,javax.management.openmbean",
-
org.osgi.jmx.service.cm;version="1.3.0";uses:="javax.management.openmbean",
-
org.osgi.jmx.service.permissionadmin;version="1.2.0";uses:="org.osgi.jmx",
-
org.osgi.jmx.service.provisioning;version="1.2.0";uses:="javax.management.openmbean",
-
org.osgi.jmx.service.useradmin;version="1.1.0";uses:="org.osgi.jmx,javax.management.openmbean"
+
org.osgi.jmx;version="1.0.0";uses:="javax.management.openmbean",
+
org.osgi.jmx.framework;version="1.5.0";uses:="org.osgi.jmx,javax.management.openmbean",
+
org.osgi.jmx.service.cm;version="1.3.0";uses:="javax.management.openmbean",
+
org.osgi.jmx.service.permissionadmin;version="1.2.0";uses:="org.osgi.jmx",
+
org.osgi.jmx.service.provisioning;version="1.2.0";uses:="javax.management.openmbean",
+
org.osgi.jmx.service.useradmin;version="1.1.0";uses:="org.osgi.jmx,javax.management.openmbean"
</Export-Package>
<Import-Package>!org.osgi.jmx*,*</Import-Package>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
Modified: incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml?rev=893657&r1=893656&r2=893657&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml Wed Dec 23 23:49:48 2009
@@ -14,7 +14,8 @@
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";>
+<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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries.jmx</groupId>
@@ -28,7 +29,7 @@
<description>
This bundle contains the JMX Blueprint API
</description>
-
+
<build>
<plugins>
<plugin>
@@ -39,7 +40,7 @@
<instructions>
<Bundle-SymbolicName>${pom.groupId}.api</Bundle-SymbolicName>
<Export-Package>
- org.apache.aries.jmx.blueprint
+ org.apache.aries.jmx.blueprint
</Export-Package>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml?rev=893657&r1=893656&r2=893657&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml Wed Dec 23 23:49:48
2009
@@ -1,24 +1,23 @@
<!--
- 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";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
<version>1.0.0-incubating-SNAPSHOT</version>
@@ -30,40 +29,40 @@
<description>
This bundle contains the core implementation of the JMX Blueprint API
</description>
-
+
<dependencies>
<dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-blueprint-api</artifactId>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>aries-jmx-blueprint-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <version>2.5.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-legacy</artifactId>
- <version>2.5.1</version>
- <scope>test</scope>
- </dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <version>2.5.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-legacy</artifactId>
+ <version>2.5.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -75,9 +74,9 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.groupId}.core</Bundle-SymbolicName>
-
<Bundle-Activator>org.apache.aries.jmx.blueprint.impl.Activator</Bundle-Activator>
+
<Bundle-Activator>org.apache.aries.jmx.blueprint.impl.Activator</Bundle-Activator>
<Export-Package>
-
org.apache.aries.jmx.blueprint.impl.codec*;version=${project.version}
+
org.apache.aries.jmx.blueprint.impl.codec*;version=${project.version}
</Export-Package>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
@@ -86,5 +85,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
Modified: incubator/aries/trunk/jmx/jmx-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-bundle/pom.xml?rev=893657&r1=893656&r2=893657&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-bundle/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-bundle/pom.xml Wed Dec 23 23:49:48 2009
@@ -14,9 +14,10 @@
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";>
+<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";>
<modelVersion>4.0.0</modelVersion>
- <parent>
+ <parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
<version>1.0.0-incubating-SNAPSHOT</version>
@@ -32,23 +33,23 @@
<dependencies>
<dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-api</artifactId>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>aries-jmx-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-core</artifactId>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>aries-jmx-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -61,37 +62,39 @@
<instructions>
<Bundle-SymbolicName>${pom.groupId}</Bundle-SymbolicName>
<Import-Package>
- !org.apache.aries.jmx*,
-
org.osgi.framework;version="1.5.0",
-
org.osgi.service.packageadmin;version="1.2.0",
-
org.osgi.service.startlevel;version="1.1.0",
-
org.osgi.service.cm;version="1.3.0";resolution:="optional",
-
org.osgi.service.permissionadmin;version="1.2.0";resolution:="optional",
-
org.osgi.service.provisioning;version="1.2.0";resolution:="optional",
-
org.osgi.service.useradmin;version="1.1.0";resolution:="optional",
- org.osgi.util.tracker,
- org.osgi.service.log,
- javax.management,
-
javax.management.openmbean,
- *
+ !org.apache.aries.jmx*,
+ org.osgi.framework;version="1.5.0",
+ org.osgi.service.packageadmin;version="1.2.0",
+ org.osgi.service.startlevel;version="1.1.0",
+
org.osgi.service.cm;version="1.3.0";resolution:="optional",
+
org.osgi.service.permissionadmin;version="1.2.0";resolution:="optional",
+
org.osgi.service.provisioning;version="1.2.0";resolution:="optional",
+
org.osgi.service.useradmin;version="1.1.0";resolution:="optional",
+ org.osgi.util.tracker,
+ org.osgi.service.log,
+ javax.management,
+ javax.management.openmbean,
+ *
</Import-Package>
-
<Bundle-Activator>org.apache.aries.jmx.Activator</Bundle-Activator>
- <!-- Not currently exporting
from the standalone -->
+
<Bundle-Activator>org.apache.aries.jmx.Activator</Bundle-Activator>
+ <!-- Not currently exporting from the standalone -->
<Export-Package>
- !*
+ !*
</Export-Package>
<!-- include the right NOTICE with attribution to the
OSGi alliance -->
<Include-Resource>{maven-resources},META-INF/NOTICE=../NOTICE</Include-Resource>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
<_failok>true</_failok>
- </instructions>
+ </instructions>
<unpackBundle>true</unpackBundle>
</configuration>
</plugin>
- <!-- Use the shade plugin with the dependency plugin to unjar the
two jars (api & core)
- so that the associated sources and javadocs jars are complete.
- To build the main jar, the maven-bundle-plugin is used,
that's why everything is exluded -->
+ <!--
+ Use the shade plugin with the dependency plugin to unjar the
two jars (api & core)
+ so that the associated sources and javadocs jars are complete.
To build the main
+ jar, the maven-bundle-plugin is used, that's why everything is
exluded
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Modified: incubator/aries/trunk/jmx/jmx-core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-core/pom.xml?rev=893657&r1=893656&r2=893657&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-core/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-core/pom.xml Wed Dec 23 23:49:48 2009
@@ -1,24 +1,23 @@
<!--
- 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";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
<version>1.0.0-incubating-SNAPSHOT</version>
@@ -31,29 +30,29 @@
This bundle contains the core implementation
of the JMX Control specification
</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>aries-jmx-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
@@ -64,26 +63,26 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.groupId}.core</Bundle-SymbolicName>
-
<Bundle-Activator>org.apache.aries.jmx.Activator</Bundle-Activator>
+
<Bundle-Activator>org.apache.aries.jmx.Activator</Bundle-Activator>
<Import-Package>
- !org.apache.aries.jmx*,
-
org.osgi.framework;version="1.5.0",
-
org.osgi.service.cm;version="1.3.0";resolution:="optional",
-
org.osgi.service.permissionadmin;version="1.2.0";resolution:="optional",
-
org.osgi.service.provisioning;version="1.2.0";resolution:="optional",
-
org.osgi.service.useradmin;version="1.1.0";resolution:="optional",
- org.osgi.util.tracker,
-
org.osgi.jmx;version="1.0.0",
-
org.osgi.jmx.framework;version="1.5.0",
-
org.osgi.jmx.service.cm;version="1.3.0",
-
org.osgi.jmx.service.permissionadmin;version="1.2.0",
-
org.osgi.jmx.service.provisioning;version="1.2.0",
-
org.osgi.jmx.service.useradmin;version="1.1.0",
+ !org.apache.aries.jmx*,
+ org.osgi.framework;version="1.5.0",
+
org.osgi.service.cm;version="1.3.0";resolution:="optional",
+
org.osgi.service.permissionadmin;version="1.2.0";resolution:="optional",
+
org.osgi.service.provisioning;version="1.2.0";resolution:="optional",
+
org.osgi.service.useradmin;version="1.1.0";resolution:="optional",
+ org.osgi.util.tracker,
+ org.osgi.jmx;version="1.0.0",
+ org.osgi.jmx.framework;version="1.5.0",
+ org.osgi.jmx.service.cm;version="1.3.0",
+
org.osgi.jmx.service.permissionadmin;version="1.2.0",
+ org.osgi.jmx.service.provisioning;version="1.2.0",
+ org.osgi.jmx.service.useradmin;version="1.1.0",
*
</Import-Package>
- <!-- Not currently exporting
anything -->
+ <!-- Not currently exporting anything -->
<Export-Package>
-
org.apache.aries.jmx.codec;;version=${project.version}
+
org.apache.aries.jmx.codec;;version=${project.version}
</Export-Package>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
@@ -92,5 +91,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
Modified: incubator/aries/trunk/jmx/jmx-itests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/pom.xml?rev=893657&r1=893656&r2=893657&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-itests/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-itests/pom.xml Wed Dec 23 23:49:48 2009
@@ -1,75 +1,74 @@
-
- <!--
- 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";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>jmx</artifactId>
- <version>1.0.0-incubating-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx.itests</artifactId>
- <version>1.0.0-incubating-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Apache Aries JMX integration tests</name>
- <description>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>jmx</artifactId>
+ <version>1.0.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.itests</artifactId>
+ <version>1.0.0-incubating-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Apache Aries JMX integration tests</name>
+ <description>
Integration tests for the JMX component (using the standalone composite
jmx-bundle)
</description>
- <!--
- pluginRepositories> <pluginRepository> <id>ops4j.releases</id>
- <url>http://repository.ops4j.org/maven2</url> <snapshots>
- <enabled>false</enabled> </snapshots> </pluginRepository>
- </pluginRepositories
- -->
-
- <dependencies>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-blueprint-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-blueprint-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
+ <!--
+ pluginRepositories> <pluginRepository> <id>ops4j.releases</id>
+ <url>http://repository.ops4j.org/maven2</url> <snapshots>
<enabled>false</enabled>
+ </snapshots> </pluginRepository> </pluginRepositories
+ -->
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>aries-jmx-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>aries-jmx-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>aries-jmx-blueprint-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>aries-jmx-blueprint-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample</artifactId>
@@ -98,37 +97,35 @@
<artifactId>pax-logging-service</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-default</artifactId>
- <scope>test</scope>
- </dependency>
- <!--
- <dependency> <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-api</artifactId>
<version>1.4</version>
- </dependency> <dependency>
<groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-service</artifactId>
<version>1.4</version>
- </dependency>
- -->
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-default</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!--
+ <dependency> <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId> <version>1.4</version>
</dependency>
+ <dependency> <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
<version>1.4</version> </dependency>
+ -->
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-mvn</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
@@ -142,74 +139,73 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>maven-paxexam-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-config</id>
+ <goals>
+ <goal>generate-config</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <settings>
+ <platform>felix</platform>
+ <profiles>compendium</profiles>
+ </settings>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <excludes>
+ <exclude>**/*$*</exclude>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/Test*.java</include>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>maven-paxexam-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-config</id>
- <goals>
-
<goal>generate-config</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <settings>
- <platform>felix</platform>
- <profiles>compendium</profiles>
- </settings>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <excludes>
- <exclude>**/*$*</exclude>
-
<exclude>**/Abstract*.java</exclude>
- </excludes>
- <includes>
- <include>**/Test*.java</include>
- <include>**/*Test.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>ci-build-profile</id>
- <activation>
- <property>
- <name>maven.repo.local</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!--
- when the local
repo location has been specified, we need to pass
- on this
information to PAX mvn url
- -->
-
<argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>ci-build-profile</id>
+ <activation>
+ <property>
+ <name>maven.repo.local</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!--
+ when the local repo location has been
specified, we need to pass on
+ this information to PAX mvn url
+ -->
+
<argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
