-
Notifications
You must be signed in to change notification settings - Fork 657
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
KARAF-1977 Upgrade trunk to osgi 4.3.1 to fix jdk 7 issues
git-svn-id: https://svn.apache.org/repos/asf/karaf/trunk@1411678 13f79535-47bb-0310-9956-ffa450edef68
- Loading branch information
1 parent
02e0b8c
commit 356b580
Showing
3 changed files
with
215 additions
and
215 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -1,88 +1,88 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | <?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"> | <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 | Licensed to the Apache Software Foundation (ASF) under one or more | ||
| contributor license agreements. See the NOTICE file distributed with | contributor license agreements. See the NOTICE file distributed with | ||
| this work for additional information regarding copyright ownership. | this work for additional information regarding copyright ownership. | ||
| The ASF licenses this file to You under the Apache License, Version 2.0 | 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 not use this file except in compliance with | ||
| the License. You may obtain a copy of the License at | the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | See the License for the specific language governing permissions and | ||
| limitations under the License. | limitations under the License. | ||
| --> | --> | ||
|
|
|
||
| <modelVersion>4.0.0</modelVersion> | <modelVersion>4.0.0</modelVersion> | ||
|
|
|
||
| <parent> | <parent> | ||
| <groupId>org.apache.karaf</groupId> | <groupId>org.apache.karaf</groupId> | ||
| <artifactId>archetypes</artifactId> | <artifactId>archetypes</artifactId> | ||
| <version>3.0.0-SNAPSHOT</version> | <version>3.0.0-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | <relativePath>../pom.xml</relativePath> | ||
| </parent> | </parent> | ||
|
|
|
||
| <groupId>org.apache.karaf.archetypes</groupId> | <groupId>org.apache.karaf.archetypes</groupId> | ||
| <artifactId>karaf-feature-archetype</artifactId> | <artifactId>karaf-feature-archetype</artifactId> | ||
| <packaging>maven-archetype</packaging> | <packaging>maven-archetype</packaging> | ||
| <name>Apache Karaf :: Archetypes :: Feature Archetype</name> | <name>Apache Karaf :: Archetypes :: Feature Archetype</name> | ||
| <description>This archetype sets up an empty karaf features project.</description> | <description>This archetype sets up an empty karaf features project.</description> | ||
|
|
|
||
| <properties> | <properties> | ||
| <archetype.version>2.2</archetype.version> | <archetype.version>2.2</archetype.version> | ||
| </properties> | </properties> | ||
|
|
|
||
| <build> | <build> | ||
| <resources> | <resources> | ||
| <resource> | <resource> | ||
| <directory>${project.basedir}/src/main/resources</directory> | <directory>${project.basedir}/src/main/resources</directory> | ||
| <filtering>true</filtering> | <filtering>true</filtering> | ||
| <includes> | <includes> | ||
| <include>**/*</include> | <include>**/*</include> | ||
| </includes> | </includes> | ||
| </resource> | </resource> | ||
| </resources> | </resources> | ||
|
|
|
||
| <extensions> | <extensions> | ||
| <extension> | <extension> | ||
| <groupId>org.apache.maven.archetype</groupId> | <groupId>org.apache.maven.archetype</groupId> | ||
| <artifactId>archetype-packaging</artifactId> | <artifactId>archetype-packaging</artifactId> | ||
| <version>${archetype.version}</version> | <version>${archetype.version}</version> | ||
| </extension> | </extension> | ||
| </extensions> | </extensions> | ||
|
|
|
||
| <plugins> | <plugins> | ||
| <plugin> | <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-resources-plugin</artifactId> | <artifactId>maven-resources-plugin</artifactId> | ||
| <configuration> | <configuration> | ||
| <delimiters> | <delimiters> | ||
| <delimiter>^*^</delimiter> | <delimiter>^*^</delimiter> | ||
| </delimiters> | </delimiters> | ||
| <useDefaultDelimiters>false</useDefaultDelimiters> | <useDefaultDelimiters>false</useDefaultDelimiters> | ||
| </configuration> | </configuration> | ||
| </plugin> | </plugin> | ||
| <plugin> | <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-archetype-plugin</artifactId> | <artifactId>maven-archetype-plugin</artifactId> | ||
| </plugin> | </plugin> | ||
| </plugins> | </plugins> | ||
|
|
|
||
| <pluginManagement> | <pluginManagement> | ||
| <plugins> | <plugins> | ||
| <plugin> | <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-archetype-plugin</artifactId> | <artifactId>maven-archetype-plugin</artifactId> | ||
| <version>${archetype.version}</version> | <version>${archetype.version}</version> | ||
| </plugin> | </plugin> | ||
| </plugins> | </plugins> | ||
| </pluginManagement> | </pluginManagement> | ||
| </build> | </build> | ||
|
|
|
||
| </project> | </project> | ||
128 changes: 64 additions & 64 deletions
128
archetypes/feature/src/main/resources/archetype-resources/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -1,64 +1,64 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | <?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"> | <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 | Licensed to the Apache Software Foundation (ASF) under one or more | ||
| contributor license agreements. See the NOTICE file distributed with | contributor license agreements. See the NOTICE file distributed with | ||
| this work for additional information regarding copyright ownership. | this work for additional information regarding copyright ownership. | ||
| The ASF licenses this file to You under the Apache License, Version 2.0 | 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 not use this file except in compliance with | ||
| the License. You may obtain a copy of the License at | the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | See the License for the specific language governing permissions and | ||
| limitations under the License. | limitations under the License. | ||
| --> | --> | ||
|
|
|
||
| <modelVersion>4.0.0</modelVersion> | <modelVersion>4.0.0</modelVersion> | ||
|
|
|
||
| <groupId>${groupId}</groupId> | <groupId>${groupId}</groupId> | ||
| <artifactId>${artifactId}</artifactId> | <artifactId>${artifactId}</artifactId> | ||
| <version>${version}</version> | <version>${version}</version> | ||
| <packaging>feature</packaging> | <packaging>feature</packaging> | ||
|
|
|
||
| <name>${artifactId}-feature</name> | <name>${artifactId}-feature</name> | ||
| <description>${artifactId} details</description> | <description>${artifactId} details</description> | ||
|
|
|
||
| <dependencies> | <dependencies> | ||
| <!-- add the artifact that should be in the feature in the dependencies set --> | <!-- add the artifact that should be in the feature in the dependencies set --> | ||
| </dependencies> | </dependencies> | ||
|
|
|
||
| <build> | <build> | ||
| <pluginManagement> | <pluginManagement> | ||
| <plugins> | <plugins> | ||
| <plugin> | <plugin> | ||
| <groupId>org.apache.karaf.tooling</groupId> | <groupId>org.apache.karaf.tooling</groupId> | ||
| <artifactId>karaf-maven-plugin</artifactId> | <artifactId>karaf-maven-plugin</artifactId> | ||
| <version>^project.version^</version> | <version>^project.version^</version> | ||
| <extensions>true</extensions> | <extensions>true</extensions> | ||
| </plugin> | </plugin> | ||
| </plugins> | </plugins> | ||
| </pluginManagement> | </pluginManagement> | ||
| <plugins> | <plugins> | ||
| <plugin> | <plugin> | ||
| <groupId>org.apache.karaf.tooling</groupId> | <groupId>org.apache.karaf.tooling</groupId> | ||
| <artifactId>karaf-maven-plugin</artifactId> | <artifactId>karaf-maven-plugin</artifactId> | ||
|
|
|
||
| <configuration> | <configuration> | ||
| <startLevel>50</startLevel> | <startLevel>50</startLevel> | ||
| <aggregateFeatures>true</aggregateFeatures> | <aggregateFeatures>true</aggregateFeatures> | ||
| <resolver>(obr)</resolver> | <resolver>(obr)</resolver> | ||
| <checkDependencyChange>true</checkDependencyChange> | <checkDependencyChange>true</checkDependencyChange> | ||
| <failOnDependencyChange>false</failOnDependencyChange> | <failOnDependencyChange>false</failOnDependencyChange> | ||
| <logDependencyChanges>true</logDependencyChanges> | <logDependencyChanges>true</logDependencyChanges> | ||
| <overwriteChangedDependencies>true</overwriteChangedDependencies> | <overwriteChangedDependencies>true</overwriteChangedDependencies> | ||
| </configuration> | </configuration> | ||
| </plugin> | </plugin> | ||
| </plugins> | </plugins> | ||
| </build> | </build> | ||
|
|
|
||
| </project> | </project> | ||
Oops, something went wrong.