moparisthebest
/
JdbcMapper
mirror of https://github.com/moparisthebest/JdbcMapper
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix multiple artifact builds

This commit is contained in:
Travis Burtrum 2017-06-13 23:55:57 -04:00
parent fe2a6eec22
commit f9ac10c70f
5 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdbcmapper/pom.xml
View File

@ -9,15 +9,11 @@
<artifactId>jdbcmapper</artifactId> <artifactId>jdbcmapper</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<dependencies> <dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>querymapper</artifactId> <artifactId>querymapper</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<classifier>${jar.classifier}</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>

36
pom.xml
View File

@ -18,7 +18,8 @@
$Header:$ $Header:$
--> -->
<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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.sonatype.oss</groupId> <groupId>org.sonatype.oss</groupId>
@ -64,7 +65,7 @@
<localCheckout>true</localCheckout> <localCheckout>true</localCheckout>
<source.classifier>sources</source.classifier> <source.classifier>sources</source.classifier>
<javadoc.classifier>javadoc</javadoc.classifier> <javadoc.classifier>javadoc</javadoc.classifier>
<jar.classifier /> <jar.classifier/>
</properties> </properties>
<packaging>pom</packaging> <packaging>pom</packaging>
<dependencyManagement> <dependencyManagement>
@ -117,7 +118,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration> <configuration>
<excludes> <excludes>
<exclude>**/*.java</exclude> <exclude>**/*.java</exclude>
@ -127,15 +127,14 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<executions> <executions>
<execution> <execution>
<id>attach-sources</id> <id>attach-sources</id>
<phase>verify</phase> <phase>verify</phase>
<goals> <goals>
<goal>jar-no-fork</goal> <goal>jar-no-fork</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<excludes> <excludes>
@ -158,12 +157,23 @@
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version> <version>3.1</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<classifier>${jar.classifier}</classifier>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2</version> <version>2.2</version>
<configuration>
<classifier>${source.classifier}</classifier>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>

1
presto-sqlparser/pom.xml
View File

@ -13,6 +13,7 @@
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>jdbcmapper</artifactId> <artifactId>jdbcmapper</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<classifier>${jar.classifier}</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.facebook.presto</groupId> <groupId>com.facebook.presto</groupId>

2
querymapper/pom.xml
View File

@ -13,11 +13,13 @@
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>common</artifactId> <artifactId>common</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<classifier>${jar.classifier}</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>runtime-compiler</artifactId> <artifactId>runtime-compiler</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<classifier>${jar.classifier}</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>

2
revertJava6.sh Executable file
View File

@ -0,0 +1,2 @@
#!/bin/sh
find */src/{main,test}/java -type f -name '*.java' -print0 | xargs -0 sed -i -e 's@/\*IFJAVA8_START@//IFJAVA8_START@' -e 's@IFJAVA8_END\*/@//IFJAVA8_END@'