trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [1/2] trafodion git commit: [TRAFODION-3246] add slf4j in jdbc
Date Mon, 17 Dec 2018 21:48:50 GMT
Repository: trafodion
Updated Branches:
  refs/heads/master 6bc8a9208 -> 7e94e7908


[TRAFODION-3246] add slf4j in jdbc


Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/17c28c61
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/17c28c61
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/17c28c61

Branch: refs/heads/master
Commit: 17c28c615b7b2d2549348e64c0d243250cd3711b
Parents: 889631a
Author: Aven <shengchen.ma@esgyn.cn>
Authored: Thu Dec 13 16:06:18 2018 +0800
Committer: Aven <shengchen.ma@esgyn.cn>
Committed: Thu Dec 13 16:06:18 2018 +0800

----------------------------------------------------------------------
 core/conn/jdbcT4/pom.xml                | 48 +++++++++++++++++++++-------
 core/conn/jdbcT4/src/assembly/slf4j.xml | 38 ++++++++++++++++++++++
 licenses/lic-clients-bin                | 27 ++++++++++++++++
 3 files changed, 102 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafodion/blob/17c28c61/core/conn/jdbcT4/pom.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/pom.xml b/core/conn/jdbcT4/pom.xml
index 1750c42..3af7fa6 100644
--- a/core/conn/jdbcT4/pom.xml
+++ b/core/conn/jdbcT4/pom.xml
@@ -57,6 +57,10 @@
     <tag>HEAD</tag>
   </scm>
 
+  <properties>
+    <slf4j.version>1.7.21</slf4j.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -64,12 +68,22 @@
       <version>4.11</version>
       <scope>test</scope>
     </dependency>
-	<dependency>
-            <groupId>org.slf4j</groupId>
-	    <artifactId>slf4j-simple</artifactId>
-	    <version>1.7.21</version>
-	    <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -176,16 +190,28 @@
     <plugin>
       <artifactId>maven-assembly-plugin</artifactId>
       <version>2.5.3</version>
-      <configuration>
-          <descriptor>src/assembly/all.xml</descriptor>
-          <appendAssemblyId>false</appendAssemblyId>
-      </configuration>
+
       <executions>
         <execution>
           <id>create-archive</id>
           <phase>package</phase>
+          <configuration>
+            <descriptor>src/assembly/all.xml</descriptor>
+            <appendAssemblyId>false</appendAssemblyId>
+          </configuration>
+          <goals>
+            <goal>single</goal>
+          </goals>
+        </execution>
+
+        <execution>
+          <id>slf4j-archive</id>
+          <phase>package</phase>
+          <configuration>
+            <descriptor>src/assembly/slf4j.xml</descriptor>
+          </configuration>
           <goals>
-              <goal>single</goal>
+            <goal>single</goal>
           </goals>
         </execution>
       </executions>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/17c28c61/core/conn/jdbcT4/src/assembly/slf4j.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/assembly/slf4j.xml b/core/conn/jdbcT4/src/assembly/slf4j.xml
new file mode 100644
index 0000000..c4f4b67
--- /dev/null
+++ b/core/conn/jdbcT4/src/assembly/slf4j.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+
+<!--
+  @@@ 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 @@@
+-->
+  <id>with-slf4j</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <useProjectArtifact>true</useProjectArtifact>
+      <unpack>true</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/17c28c61/licenses/lic-clients-bin
----------------------------------------------------------------------
diff --git a/licenses/lic-clients-bin b/licenses/lic-clients-bin
index 72ed8a6..bed0fd1 100644
--- a/licenses/lic-clients-bin
+++ b/licenses/lic-clients-bin
@@ -32,3 +32,30 @@ MIT like license. (http://site.icu-project.org/)
   this Software without prior written authorization of the copyright holder.
 
 ===============================================================================
+The binary distribution of Apache Trafodion JDBC driver bundle
+SLF4J (Simple Logging Facade for Java) software which is available under the
+MIT/X11 License.  http://www.slf4j.org
+
+ Copyright (c) 2004-2013 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free  of charge, to any person obtaining
+ a  copy  of this  software  and  associated  documentation files  (the
+ "Software"), to  deal in  the Software without  restriction, including
+ without limitation  the rights to  use, copy, modify,  merge, publish,
+ distribute,  sublicense, and/or sell  copies of  the Software,  and to
+ permit persons to whom the Software  is furnished to do so, subject to
+ the following conditions:
+
+ The  above  copyright  notice  and  this permission  notice  shall  be
+ included in all copies or substantial portions of the Software.
+
+ THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+ EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+ MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+===============================================================================


Mime
View raw message