You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2015/12/02 21:25:35 UTC
[2/2] servicemix git commit: SM-2753: Use maven properties like
`${project.build.outputDirectory}` instead of `target/classes` (closes #34)
SM-2753: Use maven properties like `${project.build.outputDirectory}` instead of `target/classes` (closes #34)
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/8101f949
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/8101f949
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/8101f949
Branch: refs/heads/master
Commit: 8101f949b7754cb7513b12a1f956dda661f021ea
Parents: 49d0643
Author: Cedric Thiebault <ce...@crossing-tech.com>
Authored: Thu Nov 26 10:49:23 2015 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Wed Dec 2 21:22:49 2015 +0100
----------------------------------------------------------------------
activemq/activemq-service/pom.xml | 2 +-
assembly/pom.xml | 34 ++++++++++----------
assembly/src/main/descriptors/unix-bin.xml | 12 +++----
assembly/src/main/descriptors/unix-src.xml | 4 +--
assembly/src/main/resources/common-bin.xml | 2 +-
assembly/src/main/resources/common-unix-bin.xml | 20 ++++++------
.../src/main/resources/examples-unix-bin.xml | 4 +--
drools/pom.xml | 2 +-
examples/cxf/cxf-ws-addressing/pom.xml | 2 +-
tooling/archetypes/pom.xml | 2 +-
10 files changed, 42 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8101f949/activemq/activemq-service/pom.xml
----------------------------------------------------------------------
diff --git a/activemq/activemq-service/pom.xml b/activemq/activemq-service/pom.xml
index 1d4733a..e0def5b 100644
--- a/activemq/activemq-service/pom.xml
+++ b/activemq/activemq-service/pom.xml
@@ -67,7 +67,7 @@
<configuration>
<artifacts>
<artifact>
- <file>target/classes/org.apache.servicemix.activemq.service.cfg</file>
+ <file>${project.build.outputDirectory}/org.apache.servicemix.activemq.service.cfg</file>
<type>cfg</type>
<classifier>activemq.service</classifier>
</artifact>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8101f949/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 030c3a9..5cfe5aa 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -150,9 +150,9 @@
<descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.servicemix.drools/features/${version}/xml/features</descriptor>
- <descriptor>file:${basedir}/target/classes/internal.xml</descriptor>
- <descriptor>file:${basedir}/target/classes/features.xml</descriptor>
- <descriptor>file:${basedir}/target/classes/examples.xml</descriptor>
+ <descriptor>file:${project.build.outputDirectory}/internal.xml</descriptor>
+ <descriptor>file:${project.build.outputDirectory}/features.xml</descriptor>
+ <descriptor>file:${project.build.outputDirectory}/examples.xml</descriptor>
</descriptors>
<features>
<feature>joda-time</feature>
@@ -178,7 +178,7 @@
<feature>kie-camel</feature>
</features>
<includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
- <repository>target/features-repo</repository>
+ <repository>${project.build.directory}/features-repo</repository>
</configuration>
<inherited>false</inherited>
</execution>
@@ -202,10 +202,10 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>target/features-repo</outputDirectory>
+ <outputDirectory>${project.build.directory}/features-repo</outputDirectory>
<resources>
<resource>
- <directory>target/dependencies/unix/apache-karaf-${karaf.version}/system</directory>
+ <directory>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/system</directory>
</resource>
</resources>
</configuration>
@@ -228,7 +228,7 @@
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<type>tar.gz</type>
- <outputDirectory>target/dependencies/unix</outputDirectory>
+ <outputDirectory>${project.build.directory}/dependencies/unix</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
@@ -245,7 +245,7 @@
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<type>zip</type>
- <outputDirectory>target/dependencies/win</outputDirectory>
+ <outputDirectory>${project.build.directory}/dependencies/win</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
@@ -265,9 +265,9 @@
<configuration>
<target name="enable-obr">
<echo message="Updating etc/startup.properties in assembly" />
- <concat destfile="target/dependencies/unix/apache-karaf-${karaf.version}/etc/startup.properties" append="true">
+ <concat destfile="${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/etc/startup.properties" append="true">
<string value="${line.separator}" />
- <fileset file="target/classes/startup-obr.properties" />
+ <fileset file="${project.build.outputDirectory}/startup-obr.properties" />
</concat>
</target>
</configuration>
@@ -281,12 +281,12 @@
<configuration>
<target name="increase-perm-mem">
<echo message="Updating bin/setenv in unix assembly" />
- <concat destfile="target/dependencies/unix/apache-karaf-${karaf.version}/bin/setenv" append="true" eol="unix">
- <fileset file="target/classes/setenv-unix" />
+ <concat destfile="${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/bin/setenv" append="true" eol="unix">
+ <fileset file="${project.build.outputDirectory}/setenv-unix" />
</concat>
<echo message="Updating bin/setenv.bat in windows assembly" />
- <concat destfile="target/dependencies/win/apache-karaf-${karaf.version}/bin/setenv.bat" append="true" eol="dos">
- <fileset file="target/classes/setenv-win" />
+ <concat destfile="${project.build.directory}/dependencies/win/apache-karaf-${karaf.version}/bin/setenv.bat" append="true" eol="dos">
+ <fileset file="${project.build.outputDirectory}/setenv-win" />
</concat>
</target>
</configuration>
@@ -307,17 +307,17 @@
<configuration>
<artifacts>
<artifact>
- <file>target/classes/internal.xml</file>
+ <file>${project.build.outputDirectory}/internal.xml</file>
<type>xml</type>
<classifier>internal</classifier>
</artifact>
<artifact>
- <file>target/classes/features.xml</file>
+ <file>${project.build.outputDirectory}/features.xml</file>
<type>xml</type>
<classifier>features</classifier>
</artifact>
<artifact>
- <file>target/classes/examples.xml</file>
+ <file>${project.build.outputDirectory}/examples.xml</file>
<type>xml</type>
<classifier>examples</classifier>
</artifact>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8101f949/assembly/src/main/descriptors/unix-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/unix-bin.xml b/assembly/src/main/descriptors/unix-bin.xml
index 9e46fe3..9648852 100644
--- a/assembly/src/main/descriptors/unix-bin.xml
+++ b/assembly/src/main/descriptors/unix-bin.xml
@@ -23,15 +23,15 @@
</formats>
<componentDescriptors>
- <componentDescriptor>target/classes/common-bin.xml</componentDescriptor>
- <componentDescriptor>target/classes/common-unix-bin.xml</componentDescriptor>
- <componentDescriptor>target/classes/examples-unix-bin.xml</componentDescriptor>
+ <componentDescriptor>${project.build.outputDirectory}/common-bin.xml</componentDescriptor>
+ <componentDescriptor>${project.build.outputDirectory}/common-unix-bin.xml</componentDescriptor>
+ <componentDescriptor>${project.build.outputDirectory}/examples-unix-bin.xml</componentDescriptor>
</componentDescriptors>
<files>
<file>
<!-- Install the internal features descriptor into the system repository -->
- <source>${basedir}/target/classes/internal.xml</source>
+ <source>${project.build.outputDirectory}/internal.xml</source>
<outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
<destName>${artifactId}-${version}-internal.xml</destName>
<fileMode>0644</fileMode>
@@ -39,7 +39,7 @@
</file>
<file>
<!-- Install the features descriptor into the system repository -->
- <source>${basedir}/target/classes/features.xml</source>
+ <source>${project.build.outputDirectory}/features.xml</source>
<outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
<destName>${artifactId}-${version}-features.xml</destName>
<fileMode>0644</fileMode>
@@ -47,7 +47,7 @@
</file>
<file>
<!-- Install the example features descriptor into the system repository -->
- <source>${basedir}/target/classes/examples.xml</source>
+ <source>${project.build.outputDirectory}/examples.xml</source>
<outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
<destName>${artifactId}-${version}-examples.xml</destName>
<fileMode>0644</fileMode>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8101f949/assembly/src/main/descriptors/unix-src.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/unix-src.xml b/assembly/src/main/descriptors/unix-src.xml
index 5ea35c3..b6b507a 100644
--- a/assembly/src/main/descriptors/unix-src.xml
+++ b/assembly/src/main/descriptors/unix-src.xml
@@ -106,14 +106,14 @@
</fileSets>
<files>
<file>
- <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <source>${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE</source>
<outputDirectory>/</outputDirectory>
<destName>LICENSE</destName>
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
<file>
- <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source>
<outputDirectory>/</outputDirectory>
<destName>NOTICE</destName>
<fileMode>0644</fileMode>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8101f949/assembly/src/main/resources/common-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/common-bin.xml b/assembly/src/main/resources/common-bin.xml
index 14a2868..5c549f8 100644
--- a/assembly/src/main/resources/common-bin.xml
+++ b/assembly/src/main/resources/common-bin.xml
@@ -19,7 +19,7 @@
<fileSets>
<fileSet>
<outputDirectory>system</outputDirectory>
- <directory>target/features-repo</directory>
+ <directory>${project.build.directory}/features-repo</directory>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8101f949/assembly/src/main/resources/common-unix-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/common-unix-bin.xml b/assembly/src/main/resources/common-unix-bin.xml
index a1fe05b..4c41195 100644
--- a/assembly/src/main/resources/common-unix-bin.xml
+++ b/assembly/src/main/resources/common-unix-bin.xml
@@ -19,7 +19,7 @@
<fileSets>
<!-- Cherry-pick files from the expanded Karaf distribution -->
<fileSet>
- <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
+ <directory>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>**/demos/**</exclude>
@@ -46,7 +46,7 @@
<!-- Copy over bin/* scripts separately to get the correct file mode -->
<fileSet>
- <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
+ <directory>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>bin/*</include>
@@ -55,7 +55,7 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>target/dependencies/win/apache-karaf-${karaf.version}</directory>
+ <directory>${project.build.directory}/dependencies/win/apache-karaf-${karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>bin/*</include>
@@ -78,7 +78,7 @@
<!-- Copy over everything that needs to get unix line endings -->
<fileSet>
- <directory>target/classes/etc</directory>
+ <directory>${project.build.outputDirectory}/etc</directory>
<outputDirectory>/etc/</outputDirectory>
<lineEnding>unix</lineEnding>
<fileMode>0644</fileMode>
@@ -86,7 +86,7 @@
</fileSet>
<fileSet>
- <directory>target/classes/licenses</directory>
+ <directory>${project.build.outputDirectory}/licenses</directory>
<outputDirectory>/licenses/</outputDirectory>
<lineEnding>unix</lineEnding>
<fileMode>0644</fileMode>
@@ -95,7 +95,7 @@
<!-- Copy over filtered resources -->
<fileSet>
- <directory>target/classes/etc</directory>
+ <directory>${project.build.outputDirectory}/etc</directory>
<outputDirectory>/etc/</outputDirectory>
<includes>
<include>*.*</include>
@@ -108,28 +108,28 @@
<files>
<file>
- <source>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</source>
+ <source>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</source>
<outputDirectory>/bin/</outputDirectory>
<destName>servicemix</destName>
<fileMode>0755</fileMode>
<lineEnding>unix</lineEnding>
</file>
<file>
- <source>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}/bin/karaf.bat</source>
+ <source>${project.build.directory}/dependencies/win/apache-karaf-${karaf.version}/bin/karaf.bat</source>
<outputDirectory>/bin/</outputDirectory>
<destName>servicemix.bat</destName>
<fileMode>0755</fileMode>
<lineEnding>dos</lineEnding>
</file>
<file>
- <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <source>${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE</source>
<outputDirectory>/</outputDirectory>
<destName>LICENSE</destName>
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
<file>
- <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source>
<outputDirectory>/</outputDirectory>
<destName>NOTICE</destName>
<fileMode>0644</fileMode>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8101f949/assembly/src/main/resources/examples-unix-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/examples-unix-bin.xml b/assembly/src/main/resources/examples-unix-bin.xml
index 642c1da..0d80191 100644
--- a/assembly/src/main/resources/examples-unix-bin.xml
+++ b/assembly/src/main/resources/examples-unix-bin.xml
@@ -19,7 +19,7 @@
<fileSets>
<!-- Copy over karaf demo to examples folder -->
<fileSet>
- <directory>target/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
+ <directory>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
<outputDirectory>/examples/karaf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -83,7 +83,7 @@
<files>
<file>
- <source>${basedir}/target/classes/pom.xml</source>
+ <source>${project.build.outputDirectory}/pom.xml</source>
<outputDirectory>/examples/</outputDirectory>
<filtered>true</filtered>
<fileMode>0644</fileMode>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8101f949/drools/pom.xml
----------------------------------------------------------------------
diff --git a/drools/pom.xml b/drools/pom.xml
index 44bb520..68f6a4a 100644
--- a/drools/pom.xml
+++ b/drools/pom.xml
@@ -67,7 +67,7 @@
<configuration>
<artifacts>
<artifact>
- <file>target/classes/features.xml</file>
+ <file>${project.build.outputDirectory}/features.xml</file>
<type>xml</type>
<classifier>features</classifier>
</artifact>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8101f949/examples/cxf/cxf-ws-addressing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-addressing/pom.xml b/examples/cxf/cxf-ws-addressing/pom.xml
index d52410f..f0aed45 100644
--- a/examples/cxf/cxf-ws-addressing/pom.xml
+++ b/examples/cxf/cxf-ws-addressing/pom.xml
@@ -62,7 +62,7 @@
<id>generate-test-sources</id>
<phase>generate-sources</phase>
<configuration>
- <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
+ <sourceRoot>${project.build.directory}/generated/src/main/java</sourceRoot>
<wsdlOptions>
<wsdlOption>
<wsdl>${basedir}/src/main/resources/wsdl/hello_world_addr.wsdl</wsdl>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8101f949/tooling/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/pom.xml b/tooling/archetypes/pom.xml
index 057327b..c905328 100644
--- a/tooling/archetypes/pom.xml
+++ b/tooling/archetypes/pom.xml
@@ -64,7 +64,7 @@
<version>3.2.1</version>
<configuration>
<inputDirectory>${basedir}/src/main/resources</inputDirectory>
- <outputDirectory>${basedir}/target/classes</outputDirectory>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
<filters>
<!--
Don't like these bits.. archetypes should not be tied to specific