Skip to content
This repository was archived by the owner on Aug 22, 2025. It is now read-only.

Commit 41e8bbb

Browse files
author
stratiocommit
committed
Merge pull request #28 from Stratio/bugfix/addJar-with-correct-version
Fix jar versions problem
2 parents c425364 + af863e2 commit 41e8bbb

File tree

8 files changed

+330
-6
lines changed

8 files changed

+330
-6
lines changed

‎server/dependency-reduced-pom.xml‎

Lines changed: 42 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sqoop</artifactId>
55
<groupId>com.stratio.sqoop</groupId>
6-
<version>0.2.0-RC1</version>
6+
<version>0.2.0-RC2-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>org.apache.sqoop</groupId>
@@ -13,7 +13,42 @@
1313
<profile>
1414
<id>package</id>
1515
<build>
16+
<resources>
17+
<resource>
18+
<filtering>true</filtering>
19+
<directory>/home/eruiz/Proyectos/sqoop/server/src/main/config</directory>
20+
</resource>
21+
</resources>
1622
<plugins>
23+
<plugin>
24+
<artifactId>maven-resources-plugin</artifactId>
25+
<version>2.5</version>
26+
<executions>
27+
<execution>
28+
<id>default-testResources</id>
29+
<phase>process-test-resources</phase>
30+
<goals>
31+
<goal>testResources</goal>
32+
</goals>
33+
<configuration>
34+
<encoding>UTF-8</encoding>
35+
</configuration>
36+
</execution>
37+
<execution>
38+
<id>default-resources</id>
39+
<phase>process-resources</phase>
40+
<goals>
41+
<goal>resources</goal>
42+
</goals>
43+
<configuration>
44+
<encoding>UTF-8</encoding>
45+
</configuration>
46+
</execution>
47+
</executions>
48+
<configuration>
49+
<encoding>UTF-8</encoding>
50+
</configuration>
51+
</plugin>
1752
<plugin>
1853
<artifactId>maven-shade-plugin</artifactId>
1954
<version>2.3</version>
@@ -72,6 +107,7 @@
72107
</platforms>
73108
<configurationDirectory>config</configurationDirectory>
74109
<copyConfigurationDirectory>true</copyConfigurationDirectory>
110+
<filterConfigurationDirectory>true</filterConfigurationDirectory>
75111
<includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
76112
<assembleDirectory>target/appassembler</assembleDirectory>
77113
<extraJvmArguments>-Dsqoop.config.dir=/etc/sds/sqoop-server $SQOOP_OPTS</extraJvmArguments>
@@ -92,6 +128,7 @@
92128
</platforms>
93129
<configurationDirectory>config</configurationDirectory>
94130
<copyConfigurationDirectory>true</copyConfigurationDirectory>
131+
<filterConfigurationDirectory>true</filterConfigurationDirectory>
95132
<includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
96133
<assembleDirectory>target/appassembler</assembleDirectory>
97134
<extraJvmArguments>-Dsqoop.config.dir=/etc/sds/sqoop-server $SQOOP_OPTS</extraJvmArguments>
@@ -121,8 +158,8 @@
121158
<architecture>all</architecture>
122159
<assembly>
123160
<copyFile>
124-
<path>target/appassembler/repo/sqoop-server-0.2.0-RC1.jar</path>
125-
<toFile>/opt/sds/sqoop-server/repo/sqoop-server-0.2.0-RC1.jar</toFile>
161+
<path>target/appassembler/repo/sqoop-server-0.2.0-RC2-SNAPSHOT.jar</path>
162+
<toFile>/opt/sds/sqoop-server/repo/sqoop-server-0.2.0-RC2-SNAPSHOT.jar</toFile>
126163
</copyFile>
127164
<copyFile>
128165
<path>src/main/unix/files_and_dirs/etc/init.d/sqoop-server</path>
@@ -231,8 +268,8 @@
231268
<architecture>noarch</architecture>
232269
<assembly>
233270
<copyFile>
234-
<path>target/appassembler/repo/sqoop-server-0.2.0-RC1.jar</path>
235-
<toFile>/opt/sds/sqoop-server/repo/sqoop-server-0.2.0-RC1.jar</toFile>
271+
<path>target/appassembler/repo/sqoop-server-0.2.0-RC2-SNAPSHOT.jar</path>
272+
<toFile>/opt/sds/sqoop-server/repo/sqoop-server-0.2.0-RC2-SNAPSHOT.jar</toFile>
236273
</copyFile>
237274
<copyFile>
238275
<path>src/main/unix/files_and_dirs/etc/init.d/sqoop-server</path>

‎server/pom.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,24 @@ limitations under the License.
162162
<profile>
163163
<id>package</id>
164164
<build>
165+
166+
<resources>
167+
<resource>
168+
<directory>src/main/config</directory>
169+
<filtering>true</filtering>
170+
</resource>
171+
</resources>
172+
165173
<plugins>
174+
<plugin>
175+
<groupId>org.apache.maven.plugins</groupId>
176+
<artifactId>maven-resources-plugin</artifactId>
177+
<version>2.5</version>
178+
<configuration>
179+
<encoding>UTF-8</encoding>
180+
</configuration>
181+
</plugin>
182+
166183
<plugin>
167184
<groupId>org.apache.maven.plugins</groupId>
168185
<artifactId>maven-shade-plugin</artifactId>
@@ -225,6 +242,7 @@ limitations under the License.
225242
</platforms>
226243
<configurationDirectory>config</configurationDirectory>
227244
<copyConfigurationDirectory>true</copyConfigurationDirectory>
245+
<filterConfigurationDirectory>true</filterConfigurationDirectory>
228246
<includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
229247
<assembleDirectory>target/appassembler</assembleDirectory>
230248
<extraJvmArguments>-Dsqoop.config.dir=/etc/sds/sqoop-server $SQOOP_OPTS</extraJvmArguments>
@@ -271,6 +289,8 @@ limitations under the License.
271289
<dir>/etc/init.d</dir>
272290
<dir>/etc/default</dir>
273291
<dir>/var</dir>
292+
<dir>/var/run</dir>
293+
<dir>/var/log</dir>
274294
<dir>/opt</dir>
275295
<dir>/usr</dir>
276296
<dir>/bin</dir>
@@ -424,6 +444,7 @@ limitations under the License.
424444
</executions>
425445
</plugin>
426446
</plugins>
447+
427448
</build>
428449
</profile>
429450
</profiles>

‎server/src/main/config/spark-defaults.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ spark.master= local
22
#spark.master=spark://10.200.0.26:7077
33
#spark.driver.cores=2
44
spark.driver.memory=1g
5+
spark.jars=repo/sqoop-server-${project.version}.jar

‎server/src/main/resources/spark-defaults.conf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
spark.master= local
2+
#spark.master=spark://10.200.0.26:7077
3+
#spark.driver.cores=2
4+
spark.driver.memory=1g
5+
spark.jars=repo/sqoop-server-0.2.0-RC2-SNAPSHOT.jar

‎server/src/main/resources/sqoop.properties‎

Lines changed: 220 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,220 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The ASF licenses this file to You under the Apache License, Version 2.0
6+
# (the "License"); you may not use this file except in compliance with
7+
# the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
18+
#
19+
# Sqoop configuration file used by the built in configuration
20+
# provider: org.apache.sqoop.core.PropertiesConfigurationProvider.
21+
# This file must reside in the system configuration directory
22+
# which is specified by the system property "sqoop.config.dir"
23+
# and must be called sqoop.properties.
24+
#
25+
# NOTE: Tokens specified in this file that are marked by a
26+
# leading and trailing '@' characters should be replaced by
27+
# their appropriate values. For example, the token @LOGDIR@
28+
# should be replaced appropriately.
29+
#
30+
# The following tokens are used in this configuration file:
31+
#
32+
# LOGDIR
33+
# The absolute path to the directory where system genearated
34+
# log files will be kept.
35+
#
36+
# BASEDIR
37+
# The absolute path to the directory where Sqoop 2 is installed
38+
#
39+
40+
#
41+
# Logging Configuration
42+
# Any property that starts with the prefix
43+
# org.apache.sqoop.log4j is parsed out by the configuration
44+
# system and passed to the log4j subsystem. This allows you
45+
# to specify log4j configuration properties from within the
46+
# Sqoop configuration.
47+
#
48+
org.apache.sqoop.log4j.debug=false
49+
org.apache.sqoop.log4j.rootLogger=INFO, file
50+
org.apache.sqoop.log4j.category.org.apache.sqoop=INFO
51+
org.apache.sqoop.log4j.appender.file=org.apache.log4j.RollingFileAppender
52+
org.apache.sqoop.log4j.appender.file.File=/var/log/sds/sqoop-server/sqoop.log
53+
org.apache.sqoop.log4j.appender.file.MaxFileSize=25MB
54+
org.apache.sqoop.log4j.appender.file.MaxBackupIndex=5
55+
org.apache.sqoop.log4j.appender.file.layout=org.apache.log4j.PatternLayout
56+
org.apache.sqoop.log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %-5p [%l] %m%n
57+
# Audit logger for default configuration of FileAuditLogger
58+
org.apache.sqoop.log4j.logger.audit=INFO, audit
59+
org.apache.sqoop.log4j.appender.audit=org.apache.log4j.RollingFileAppender
60+
org.apache.sqoop.log4j.appender.audit.File=/var/log/sds/sqoop-server/audit.log
61+
org.apache.sqoop.log4j.appender.audit.MaxFileSize=25MB
62+
org.apache.sqoop.log4j.appender.audit.MaxBackupIndex=5
63+
org.apache.sqoop.log4j.appender.audit.layout=org.apache.log4j.PatternLayout
64+
org.apache.sqoop.log4j.appender.audit.layout.ConversionPattern=%d{ISO8601} %-5p [%l] %m%n
65+
66+
#
67+
# Audit Loggers Configuration
68+
# Multiple audit loggers could be given here. To specify an
69+
# audit logger, you should at least add org.apache.sqoop.
70+
# auditlogger.[LoggerName].class. You could also provide
71+
# more configuration options by using org.apache.sqoop.
72+
# auditlogger.[LoggerName] prefix, then all these options
73+
# are parsed to the logger class.
74+
#
75+
org.apache.sqoop.auditlogger.default.class=org.apache.sqoop.audit.FileAuditLogger
76+
org.apache.sqoop.auditlogger.default.logger=audit
77+
78+
#
79+
# Repository configuration
80+
# The Repository subsystem provides the special prefix which
81+
# is "org.apache.sqoop.repository.sysprop". Any property that
82+
# is specified with this prefix is parsed out and set as a
83+
# system property. For example, if the built in Derby repository
84+
# is being used, the sysprop prefixed properties can be used
85+
# to affect Derby configuration at startup time by setting
86+
# the appropriate system properties.
87+
#
88+
89+
# Repository provider
90+
org.apache.sqoop.repository.provider=org.apache.sqoop.repository.JdbcRepositoryProvider
91+
92+
# Repository upgrade
93+
# If set to true, it will not upgrade the sqoop respository schema, by default it will iniate the upgrade on server start-up
94+
org.apache.sqoop.repository.schema.immutable=false
95+
96+
# JDBC repository provider configuration
97+
org.apache.sqoop.repository.jdbc.handler=org.apache.sqoop.repository.derby.DerbyRepositoryHandler
98+
org.apache.sqoop.repository.jdbc.transaction.isolation=READ_COMMITTED
99+
org.apache.sqoop.repository.jdbc.maximum.connections=10
100+
org.apache.sqoop.repository.jdbc.url=jdbc:derby:/var/log/sds/sqoop-server/repository/db;create=true
101+
org.apache.sqoop.repository.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
102+
org.apache.sqoop.repository.jdbc.user=sa
103+
org.apache.sqoop.repository.jdbc.password=
104+
105+
# System properties for embedded Derby configuration
106+
org.apache.sqoop.repository.sysprop.derby.stream.error.file=/var/log/sds/sqoop-server/derbyrepo.log
107+
108+
#
109+
# Sqoop Connector configuration
110+
# If set to true will initiate Connectors config upgrade during server startup
111+
#
112+
org.apache.sqoop.connector.autoupgrade=false
113+
114+
#
115+
# Sqoop Driver configuration
116+
# If set to true will initiate the Driver config upgrade during server startup
117+
#
118+
org.apache.sqoop.driver.autoupgrade=false
119+
120+
# Sleeping period for reloading configuration file (once a minute)
121+
org.apache.sqoop.core.configuration.provider.properties.sleep=60000
122+
123+
#
124+
# Submission engine configuration
125+
#
126+
127+
# Submission engine class
128+
#org.apache.sqoop.submission.engine=org.apache.sqoop.submission.mapreduce.MapreduceSubmissionEngine
129+
org.apache.sqoop.submission.engine=org.apache.sqoop.submission.spark.SparkSubmissionEngine
130+
131+
# Number of milliseconds, submissions created before this limit will be removed, default is one day
132+
#org.apache.sqoop.submission.purge.threshold=
133+
134+
# Number of milliseconds for purge thread to sleep, by default one day
135+
#org.apache.sqoop.submission.purge.sleep=
136+
137+
# Number of milliseconds for update thread to sleep, by default 5 minutes
138+
#org.apache.sqoop.submission.update.sleep=
139+
140+
#
141+
# Configuration for Mapreduce submission engine (applicable if it's configured)
142+
#
143+
144+
# Hadoop configuration directory
145+
org.apache.sqoop.submission.engine.mapreduce.configuration.directory=/etc/hadoop/conf/
146+
147+
#
148+
# Execution engine configuration
149+
#
150+
#org.apache.sqoop.execution.engine=org.apache.sqoop.execution.mapreduce.MapreduceExecutionEngine
151+
org.apache.sqoop.execution.engine=org.apache.sqoop.execution.spark.SparkExecutionEngine
152+
153+
154+
# Yarn configuration directory for spark ( since spark can run on yarn)
155+
org.apache.sqoop.submission.engine.spark.configuration.directory=/etc/hadoop/conf
156+
#
157+
# Spark related configs
158+
#
159+
160+
#
161+
# Authentication configuration
162+
#
163+
#org.apache.sqoop.security.authentication.type=SIMPLE
164+
#org.apache.sqoop.security.authentication.handler=org.apache.sqoop.security.authentication.SimpleAuthenticationHandler
165+
#org.apache.sqoop.security.authentication.anonymous=true
166+
#org.apache.sqoop.security.authentication.type=KERBEROS
167+
#org.apache.sqoop.security.authentication.handler=org.apache.sqoop.security.authentication.KerberosAuthenticationHandler
168+
#org.apache.sqoop.security.authentication.kerberos.principal=sqoop/_HOST@NOVALOCAL
169+
#org.apache.sqoop.security.authentication.kerberos.keytab=/home/kerberos/sqoop.keytab
170+
#org.apache.sqoop.security.authentication.kerberos.http.principal=HTTP/_HOST@NOVALOCAL
171+
#org.apache.sqoop.security.authentication.kerberos.http.keytab=/home/kerberos/sqoop.keytab
172+
#org.apache.sqoop.security.authentication.enable.doAs=true
173+
#org.apache.sqoop.security.authentication.proxyuser.#USER#.users=*
174+
#org.apache.sqoop.security.authentication.proxyuser.#USER#.groups=*
175+
#org.apache.sqoop.security.authentication.proxyuser.#USER#.hosts=*
176+
177+
# Default user, default value is "sqoop.anonymous.user"
178+
#org.apache.sqoop.security.authentication.default.user=
179+
180+
#
181+
# Authorization configuration
182+
#
183+
#org.apache.sqoop.security.authorization.handler=org.apache.sqoop.security.authorization.DefaultAuthorizationHandler
184+
#org.apache.sqoop.security.authorization.access_controller=org.apache.sqoop.security.authorization.DefaultAuthorizationAccessController
185+
#org.apache.sqoop.security.authorization.validator=org.apache.sqoop.security.authorization.DefaultAuthorizationValidator
186+
#org.apache.sqoop.security.authorization.authentication_provider=org.apache.sqoop.security.authorization.DefaultAuthenticationProvider
187+
#org.apache.sqoop.security.authorization.server_name=SqoopServer1
188+
189+
# External connectors load path
190+
# "/path/to/external/connectors/": Add all the connector JARs in the specified folder
191+
#
192+
org.apache.sqoop.connector.external.loadpath=
193+
194+
# Sqoop application classpath
195+
# ":" separated list of jars to be included in sqoop.
196+
#
197+
org.apache.sqoop.classpath.extra=
198+
199+
# Sqoop extra classpath to be included with all jobs
200+
# ":" separated list of jars to be included in map job classpath.
201+
#
202+
org.apache.sqoop.classpath.job=
203+
204+
#
205+
# Jetty Server configuration
206+
#
207+
#org.apache.sqoop.jetty.thread.pool.worker.max=500
208+
#org.apache.sqoop.jetty.thread.pool.worker.min=5
209+
#org.apache.sqoop.jetty.thread.pool.worker.alive.time=60
210+
#org.apache.sqoop.jetty.port=12000
211+
212+
# Blacklisted Connectors
213+
# ":" separated list of connector names as specified in their
214+
# sqoopconnector.properties file
215+
org.apache.sqoop.connector.blacklist=
216+
217+
stratio.sqoop.version=${project.version}
218+
name=${name}
219+
version=${version}
220+
maven.compile.source=${maven.compile.source}

0 commit comments

Comments
 (0)