You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2016/12/22 02:08:39 UTC
[5/6] incubator-trafodion git commit: change back the copyright in
all .xml files
change back the copyright in all .xml files
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7155a0e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7155a0e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7155a0e5
Branch: refs/heads/master
Commit: 7155a0e5feeaebefee7174a5b7e5d2666398f41e
Parents: eb2dcd9
Author: mashengchen <ma...@gmail.com>
Authored: Wed Dec 21 07:44:07 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Wed Dec 21 07:44:07 2016 +0000
----------------------------------------------------------------------
core/conn/trafci/installer_pom.xml | 29 +++++++----
core/conn/trafci/pom.xml | 29 +++++++----
.../trafci/src/main/resources/install_jar.xml | 29 +++++++----
.../trafci/src/main/resources/install_tar.xml | 54 +++++++++-----------
4 files changed, 78 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7155a0e5/core/conn/trafci/installer_pom.xml
----------------------------------------------------------------------
diff --git a/core/conn/trafci/installer_pom.xml b/core/conn/trafci/installer_pom.xml
index 4c7ec62..7e4d289 100644
--- a/core/conn/trafci/installer_pom.xml
+++ b/core/conn/trafci/installer_pom.xml
@@ -1,14 +1,21 @@
-<!-- @@@ START COPYRIGHT @@@ 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.
- @@@ END COPYRIGHT @@@ -->
+<!--
+ @@@ START COPYRIGHT @@@
+ 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.
+ @@@ END COPYRIGHT @@@
+-->
<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>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7155a0e5/core/conn/trafci/pom.xml
----------------------------------------------------------------------
diff --git a/core/conn/trafci/pom.xml b/core/conn/trafci/pom.xml
index 7fb507c..f9bcbab 100644
--- a/core/conn/trafci/pom.xml
+++ b/core/conn/trafci/pom.xml
@@ -1,14 +1,21 @@
-<!-- @@@ START COPYRIGHT @@@ 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.
- @@@ END COPYRIGHT @@@ -->
+<!--
+ @@@ START COPYRIGHT @@@
+ 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.
+ @@@ END COPYRIGHT @@@
+-->
<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">
<repositories>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7155a0e5/core/conn/trafci/src/main/resources/install_jar.xml
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/main/resources/install_jar.xml b/core/conn/trafci/src/main/resources/install_jar.xml
index 13d8721..e7d772a 100644
--- a/core/conn/trafci/src/main/resources/install_jar.xml
+++ b/core/conn/trafci/src/main/resources/install_jar.xml
@@ -1,14 +1,21 @@
-<!-- @@@ START COPYRIGHT @@@ 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.
- @@@ END COPYRIGHT @@@ -->
+<!--
+ @@@ START COPYRIGHT @@@
+ 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.
+ @@@ END COPYRIGHT @@@
+-->
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7155a0e5/core/conn/trafci/src/main/resources/install_tar.xml
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/main/resources/install_tar.xml b/core/conn/trafci/src/main/resources/install_tar.xml
index 9424a1f..394ddbc 100644
--- a/core/conn/trafci/src/main/resources/install_tar.xml
+++ b/core/conn/trafci/src/main/resources/install_tar.xml
@@ -1,6 +1,5 @@
<!--
@@@ START COPYRIGHT @@@
-
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
@@ -8,44 +7,39 @@
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.
-
@@@ END COPYRIGHT @@@
-->
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>install_tar</id>
- <formats>
- <format>tar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${basedir}/utils/</directory>
- <outputDirectory>/</outputDirectory>
- <includes><include>README</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <includes><include>trafciInstaller.jar</include></includes>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
- <!-- <files>
- <file>
- <source>target/trafciInstaller.tar</source>
- <outputDirectory>/</outputDirectory>
- <destName>trafci.tar</destName>
- </file>
- </files> -->
-</assembly>
\ No newline at end of file
+ <id>install_tar</id>
+ <formats>
+ <format>tar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}/utils/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <includes>
+ <include>trafciInstaller.jar</include>
+ </includes>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <!-- <files> <file> <source>target/trafciInstaller.tar</source> <outputDirectory>/</outputDirectory>
+ <destName>trafci.tar</destName> </file> </files> -->
+</assembly>