Repository: camel Updated Branches: refs/heads/master 572f6e84f -> 70a9f29b5
Checkstyle uphrade problems - Move to root so there is no src folder in a pom project Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/70a9f29b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/70a9f29b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/70a9f29b Branch: refs/heads/master Commit: 70a9f29b5523e5be239580483fc39fcdeb6cfd82 Parents: 572f6e8 Author: Claus Ibsen <[email protected]> Authored: Mon May 8 12:27:24 2017 +0200 Committer: Claus Ibsen <[email protected]> Committed: Mon May 8 12:27:24 2017 +0200 ---------------------------------------------------------------------- .../camel-spring-boot-generator-bom/pom.xml | 2 +- .../src/main/resources/target-template-pom.xml | 54 -------------------- .../target-template-pom.xml | 54 ++++++++++++++++++++ 3 files changed, 55 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/70a9f29b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml index 2eaa82c..9e64460 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml @@ -279,7 +279,7 @@ </excludes> </dependencies> - <sourcePom>${basedir}/src/main/resources/target-template-pom.xml</sourcePom> + <sourcePom>${basedir}/target-template-pom.xml</sourcePom> <targetPom>${basedir}/../camel-spring-boot-dependencies/pom.xml</targetPom> </configuration> http://git-wip-us.apache.org/repos/asf/camel/blob/70a9f29b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml deleted file mode 100644 index 555e203..0000000 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?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/xsd/maven-4.0.0.xsd";> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <artifactId>camel-spring-boot-dm</artifactId> - <groupId>org.apache.camel</groupId> - <version>${project.version}</version> - </parent> - - <artifactId>camel-spring-boot-dependencies</artifactId> - <packaging>pom</packaging> - <name>Camel :: Platforms :: Spring-Boot :: Dependency Management :: BOM</name> - <description>Camel Spring-Boot BOM</description> - - <dependencyManagement> - <dependencies> - <!-- To be filled in --> - </dependencies> - </dependencyManagement> - - <!-- Force the reactor build order --> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-generator-bom</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>provided</scope> - </dependency> - </dependencies> - -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/70a9f29b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/target-template-pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/target-template-pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/target-template-pom.xml new file mode 100644 index 0000000..555e203 --- /dev/null +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/target-template-pom.xml @@ -0,0 +1,54 @@ +<?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/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <artifactId>camel-spring-boot-dm</artifactId> + <groupId>org.apache.camel</groupId> + <version>${project.version}</version> + </parent> + + <artifactId>camel-spring-boot-dependencies</artifactId> + <packaging>pom</packaging> + <name>Camel :: Platforms :: Spring-Boot :: Dependency Management :: BOM</name> + <description>Camel Spring-Boot BOM</description> + + <dependencyManagement> + <dependencies> + <!-- To be filled in --> + </dependencies> + </dependencyManagement> + + <!-- Force the reactor build order --> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-boot-generator-bom</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>provided</scope> + </dependency> + </dependencies> + +</project> \ No newline at end of file
