mirror of
https://github.com/querydsl/querydsl.git
synced 2026-06-13 21:01:01 +08:00
Merge pull request #826 from balazs-zsoldos/i816
Replacing spring-bundlor with maven-bundle-plugin
This commit is contained in:
Timo Westkämper
commit
6daeefea22
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -141,8 +141,8 @@
|
||||
</plugin>
|
||||
-->
|
||||
<plugin>
|
||||
<groupId>com.springsource.bundlor</groupId>
|
||||
<artifactId>com.springsource.bundlor.maven</artifactId>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
@ -232,4 +232,4 @@
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
Bundle-SymbolicName: com.mysema.querydsl.apt
|
||||
Bundle-Name: Querydsl APT
|
||||
Bundle-Vendor: Mysema
|
||||
Bundle-ManifestVersion: 2
|
||||
Import-Template:
|
||||
com.mysema.codegen.*;version="${codegen.version}",
|
||||
com.mysema.commons.lang.*;version="${mysema.lang.version}",
|
||||
com.mysema.query.*;version="${project.version}",
|
||||
com.mysema.util.*;version="${project.version}",
|
||||
javax.annotation.*;version="0",
|
||||
javax.inject.*;version="0",
|
||||
javax.lang.model.*;version="0",
|
||||
javax.tools.*;version="0",
|
||||
net.sf.cglib.proxy.*;version="${cglib.version}",
|
||||
com.google.common.*;version="${guava.version}"
|
||||
Excluded-Imports:
|
||||
javax.persistence.*;version="[2.0.0,2.1.0)",
|
||||
javax.jdo.*;version="[2.0.0,3.0.0)",
|
||||
org.springframework.roo.*;version="1.2.3",
|
||||
org.mongodb.morphia.annotations.*;version="0.99"
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -54,8 +54,8 @@
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.springsource.bundlor</groupId>
|
||||
<artifactId>com.springsource.bundlor.maven</artifactId>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
@ -83,4 +83,4 @@
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
Bundle-SymbolicName: com.mysema.querydsl.codegen
|
||||
Bundle-Name: Querydsl Codegen
|
||||
Bundle-Vendor: Mysema
|
||||
Bundle-ManifestVersion: 2
|
||||
Import-Template:
|
||||
com.mysema.codegen.*;version="${codegen.version}";resolution:=optional,
|
||||
com.mysema.commons.lang.*;version="${mysema.lang.version}",
|
||||
com.mysema.query.*;version="${project.version}",
|
||||
com.mysema.util.*;version="${project.version}",
|
||||
javax.annotation.*;version="0",
|
||||
javax.inject.*;version="0",
|
||||
net.sf.cglib.proxy.*;version="${cglib.version}",
|
||||
com.google.common.*;version="${guava.version}"
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
<artifactId>querydsl-apt</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<!-- alias dependencies -->
|
||||
<!-- alias dependencies -->
|
||||
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
@ -59,13 +59,13 @@
|
||||
<version>${project.version}</version>
|
||||
<scope>test</scope>
|
||||
<type>test-jar</type>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>cglib</groupId>
|
||||
<artifactId>cglib</artifactId>
|
||||
<version>${cglib.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>cglib</groupId>
|
||||
<artifactId>cglib</artifactId>
|
||||
<version>${cglib.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
@ -80,8 +80,8 @@
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.springsource.bundlor</groupId>
|
||||
<artifactId>com.springsource.bundlor.maven</artifactId>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>com.mysema.maven</groupId>
|
||||
@ -103,4 +103,4 @@
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
Bundle-SymbolicName: com.mysema.querydsl.collections
|
||||
Bundle-Name: Querydsl Collections
|
||||
Bundle-Vendor: Mysema
|
||||
Bundle-ManifestVersion: 2
|
||||
Import-Template:
|
||||
com.mysema.codegen.*;version="${codegen.version}",
|
||||
com.mysema.commons.lang.*;version="${mysema.lang.version}",
|
||||
com.mysema.query.*;version="${project.version}",
|
||||
com.mysema.util.*;version="${project.version}",
|
||||
javax.annotation.*;version="0",
|
||||
javax.tools.*;version="1";resolution:=optional,
|
||||
org.eclipse.jdt.*;version="3.7.2",
|
||||
com.google.common.*;version="${guava.version}",
|
||||
org.hamcrest.*;version="1.3";resolution:=optional
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
<dependency>
|
||||
<groupId>cglib</groupId>
|
||||
<artifactId>cglib</artifactId>
|
||||
<version>${cglib.version}</version>
|
||||
<version>${cglib.version}</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
@ -78,8 +78,8 @@
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.springsource.bundlor</groupId>
|
||||
<artifactId>com.springsource.bundlor.maven</artifactId>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>com.infradna.tool</groupId>
|
||||
@ -141,4 +141,4 @@
|
||||
<properties>
|
||||
<bridge-method.version>1.11</bridge-method.version>
|
||||
</properties>
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
Bundle-SymbolicName: com.mysema.querydsl.core
|
||||
Bundle-Name: Querydsl Core
|
||||
Bundle-Vendor: Mysema
|
||||
Bundle-ManifestVersion: 2
|
||||
Excluded-Imports: com.infradna.tool.bridge_method_injector
|
||||
Import-Template:
|
||||
com.mysema.commons.lang.*;version="${mysema.lang.version}",
|
||||
javax.annotation.*;version="0",
|
||||
net.sf.cglib.proxy.*;version="${cglib.version}";resolution:=optional,
|
||||
com.google.common.*;version="${guava.version}"
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -27,6 +27,11 @@
|
||||
<hibernate.validator.version>4.3.0.Final</hibernate.validator.version>
|
||||
<hibernate.search.version>4.2.0.Final</hibernate.search.version>
|
||||
<lucene.version>3.6.2</lucene.version>
|
||||
<osgi.import.package>
|
||||
org.apache.lucene.*;version="[3.6,4)",
|
||||
org.hibernate.*;version="[4,5)",
|
||||
${osgi.import.package.root}
|
||||
</osgi.import.package>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
@ -119,8 +124,8 @@
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.springsource.bundlor</groupId>
|
||||
<artifactId>com.springsource.bundlor.maven</artifactId>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
@ -138,4 +143,4 @@
|
||||
</build>
|
||||
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
Bundle-SymbolicName: com.mysema.querydsl.hibernate-search
|
||||
Bundle-Name: Querydsl Hibernate Search
|
||||
Bundle-Vendor: Mysema
|
||||
Bundle-ManifestVersion: 2
|
||||
Import-Template:
|
||||
com.mysema.commons.lang.*;version="${mysema.lang.version}",
|
||||
com.mysema.query.*;version="${project.version}",
|
||||
org.apache.lucene.*;version="[3.0.0,3.1.0)",
|
||||
org.hibernate.*;version="[3.0.0,4.0.0)",
|
||||
org.slf4j.*;version="${slf4j.version}"
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -130,8 +130,8 @@
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.springsource.bundlor</groupId>
|
||||
<artifactId>com.springsource.bundlor.maven</artifactId>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
@ -289,4 +289,4 @@
|
||||
</pluginRepository>
|
||||
</pluginRepositories>
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
Bundle-SymbolicName: com.mysema.querydsl.jdo
|
||||
Bundle-Name: Querydsl JDO
|
||||
Bundle-Vendor: Mysema
|
||||
Bundle-ManifestVersion: 2
|
||||
Import-Template:
|
||||
com.mysema.commons.lang.*;version="${mysema.lang.version}",
|
||||
com.mysema.query.*;version="${project.version}",
|
||||
javax.annotation.*;version="0",
|
||||
javax.inject.*;version="0",
|
||||
javax.jdo.*;version="[2.0.0,4.0.0)",
|
||||
com.google.common.*;version="${guava.version}",
|
||||
org.slf4j.*;version="${slf4j.version}"
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -117,10 +117,10 @@
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.springsource.bundlor</groupId>
|
||||
<artifactId>com.springsource.bundlor.maven</artifactId>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
Bundle-SymbolicName: com.mysema.querydsl.jpa.codegen
|
||||
Bundle-Name: Querydsl JPA Codegen
|
||||
Bundle-Vendor: Mysema
|
||||
Bundle-ManifestVersion: 2
|
||||
Import-Template:
|
||||
com.mysema.codegen.*;version="${codegen.version}",
|
||||
com.mysema.commons.lang.*;version="${mysema.lang.version}",
|
||||
com.mysema.query.*;version="${project.version}",
|
||||
com.mysema.util.*;version="${project.version}",
|
||||
javax.annotation.*;version="0",
|
||||
javax.inject.*;version="0",
|
||||
javax.persistence.*;version="[2.0.0,2.1.0)",
|
||||
javax.xml.stream.*;version="0",
|
||||
org.hibernate.*;version="${hibernate.version}",
|
||||
org.slf4j.*;version="${slf4j.version}",
|
||||
com.google.common.*;version="${guava.version}"
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -26,6 +26,7 @@
|
||||
<hibernate.version>4.3.5.Final</hibernate.version>
|
||||
<hibernate.validator.version>4.3.1.Final</hibernate.validator.version>
|
||||
<eclipselink.version>2.5.1</eclipselink.version>
|
||||
<osgi.import.package>javax.persistence.*;version="[1.1,3)",${osgi.import.package.root}</osgi.import.package>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
@ -43,19 +44,19 @@
|
||||
<artifactId>asm</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
<scope>provided</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hibernate</groupId>
|
||||
<artifactId>hibernate-entitymanager</artifactId>
|
||||
<version>${hibernate.version}</version>
|
||||
<scope>provided</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hibernate</groupId>
|
||||
<artifactId>hibernate-validator</artifactId>
|
||||
<version>${hibernate.validator.version}</version>
|
||||
<scope>provided</scope>
|
||||
<optional>true</optional>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.slf4j</groupId>
|
||||
@ -101,17 +102,17 @@
|
||||
</dependency>
|
||||
|
||||
<!-- test -->
|
||||
<dependency>
|
||||
<groupId>cglib</groupId>
|
||||
<artifactId>cglib</artifactId>
|
||||
<version>${cglib.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cglib</groupId>
|
||||
<artifactId>cglib</artifactId>
|
||||
<version>${cglib.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.persistence</groupId>
|
||||
<artifactId>eclipselink</artifactId>
|
||||
<version>${eclipselink.version}</version>
|
||||
<scope>provided</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
@ -215,8 +216,8 @@
|
||||
<plugins>
|
||||
|
||||
<plugin>
|
||||
<groupId>com.springsource.bundlor</groupId>
|
||||
<artifactId>com.springsource.bundlor.maven</artifactId>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
@ -361,4 +362,4 @@
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
Bundle-SymbolicName: com.mysema.querydsl.jpa
|
||||
Bundle-Name: Querydsl JPA
|
||||
Bundle-Vendor: Mysema
|
||||
Bundle-ManifestVersion: 2
|
||||
Import-Template:
|
||||
com.mysema.commons.lang.*;version="${mysema.lang.version}",
|
||||
com.mysema.query.sql.*;version="${project.version}";resolution:=optional,
|
||||
com.mysema.query.*;version="${project.version}",
|
||||
com.mysema.util.*;version="${project.version}",
|
||||
javax.annotation.*;version="0",
|
||||
javax.inject.*;version="0",
|
||||
javax.persistence.*;version="[1.1.0,2.1.0]",
|
||||
javax.xml.stream.*;version="0",
|
||||
org.hibernate.*;version="${hibernate.version}";resolution:=optional,
|
||||
org.eclipse.persistence.*;version="2.4.0";resolution:=optional,
|
||||
org.slf4j.*;version="${slf4j.version}",
|
||||
com.google.common.*;version="${guava.version}"
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -24,6 +24,10 @@
|
||||
|
||||
<properties>
|
||||
<lucene.version>3.6.2</lucene.version>
|
||||
<osgi.import.package>
|
||||
org.apache.lucene.*;version="[3.6,4)",
|
||||
${osgi.import.package.root}
|
||||
</osgi.import.package>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
@ -54,12 +58,12 @@
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- test -->
|
||||
<dependency>
|
||||
<groupId>cglib</groupId>
|
||||
<artifactId>cglib</artifactId>
|
||||
<version>${cglib.version}</version>
|
||||
<scope>test</scope>
|
||||
<!-- test -->
|
||||
<dependency>
|
||||
<groupId>cglib</groupId>
|
||||
<artifactId>cglib</artifactId>
|
||||
<version>${cglib.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.mysema.querydsl</groupId>
|
||||
@ -86,8 +90,8 @@
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.springsource.bundlor</groupId>
|
||||
<artifactId>com.springsource.bundlor.maven</artifactId>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
@ -109,4 +113,4 @@
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
Bundle-SymbolicName: com.mysema.querydsl.lucene
|
||||
Bundle-Name: Querydsl Lucene
|
||||
Bundle-Vendor: Mysema
|
||||
Bundle-ManifestVersion: 2
|
||||
Import-Template:
|
||||
com.mysema.commons.lang.*;version="${mysema.lang.version}",
|
||||
com.mysema.query.*;version="${project.version}",
|
||||
javax.annotation.*;version="0",
|
||||
com.google.common.*;version="${guava.version}",
|
||||
org.apache.lucene.*;version="[3.0.0,3.1.0)",
|
||||
org.slf4j.*;version="${slf4j.version}"
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -24,6 +24,10 @@
|
||||
|
||||
<properties>
|
||||
<lucene.version>4.2.1</lucene.version>
|
||||
<osgi.import.package>
|
||||
org.apache.lucene.*;version="[4,5)",
|
||||
${osgi.import.package.root}
|
||||
</osgi.import.package>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
@ -92,8 +96,8 @@
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.springsource.bundlor</groupId>
|
||||
<artifactId>com.springsource.bundlor.maven</artifactId>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
@ -115,4 +119,4 @@
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
Bundle-SymbolicName: com.mysema.querydsl.lucene
|
||||
Bundle-Name: Querydsl Lucene
|
||||
Bundle-Vendor: Mysema
|
||||
Bundle-ManifestVersion: 2
|
||||
Import-Template:
|
||||
com.mysema.commons.lang.*;version="${mysema.lang.version}",
|
||||
com.mysema.query.*;version="${project.version}",
|
||||
javax.annotation.*;version="0",
|
||||
com.google.common.*;version="${guava.version}",
|
||||
org.apache.lucene.*;version="[4.0.0,5.0.0)",
|
||||
org.slf4j.*;version="${slf4j.version}"
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -18,6 +18,12 @@
|
||||
<properties>
|
||||
<mongodb.version>2.10.0</mongodb.version>
|
||||
<morphia.version>0.105</morphia.version>
|
||||
<osgi.import.package>
|
||||
com.mongodb;version="0.0.0",
|
||||
org.mongodb.morphia.*;version="0.105",
|
||||
org.bson.*;version="0.0.0",
|
||||
${osgi.import.package.root}
|
||||
</osgi.import.package>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
@ -74,8 +80,8 @@
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.springsource.bundlor</groupId>
|
||||
<artifactId>com.springsource.bundlor.maven</artifactId>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
@ -148,4 +154,4 @@
|
||||
</build>
|
||||
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
Bundle-SymbolicName: com.mysema.querydsl.mongodb
|
||||
Bundle-Name: Querydsl Mongodb
|
||||
Bundle-Vendor: Mysema
|
||||
Bundle-ManifestVersion: 2
|
||||
Import-Template:
|
||||
com.mongodb.*;version="0",
|
||||
org.mongodb.morphia.*;version="${morphia.version}";resolution:=optional,
|
||||
com.mysema.commons.lang.*;version="${mysema.lang.version}",
|
||||
com.mysema.query.apt;version="${project.version}";resolution:=optional,
|
||||
com.mysema.query.*;version="${project.version}",
|
||||
javax.annotation.*;version="0";resolution:=optional,
|
||||
javax.lang.model.*;version="0",
|
||||
javax.tools.*;version="0",
|
||||
com.google.common.*;version="${guava.version}",
|
||||
org.bson.*;version="0"
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
@ -44,6 +44,13 @@
|
||||
<cglib.version>2.2.2</cglib.version>
|
||||
<findbugs.version>1.3.2</findbugs.version>
|
||||
<slf4j.version>1.6.1</slf4j.version>
|
||||
|
||||
<!-- Import-Package definitions for maven-bundle-plugin -->
|
||||
<osgi.import.package.root>
|
||||
com.google.common.*;version=${@},
|
||||
*
|
||||
</osgi.import.package.root>
|
||||
<osgi.import.package>${osgi.import.package.root}</osgi.import.package>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
@ -162,20 +169,26 @@
|
||||
<version>2.16</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>com.springsource.bundlor</groupId>
|
||||
<artifactId>com.springsource.bundlor.maven</artifactId>
|
||||
<version>1.0.0.RELEASE</version>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
<version>2.4.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>bundlor</id>
|
||||
<id>bundle-manifest</id>
|
||||
<phase>process-classes</phase>
|
||||
<goals>
|
||||
<goal>bundlor</goal>
|
||||
<goal>manifest</goal>
|
||||
</goals>
|
||||
<inherited>true</inherited>
|
||||
<configuration>
|
||||
<instructions>
|
||||
<Import-Package>
|
||||
${osgi.import.package}
|
||||
</Import-Package>
|
||||
</instructions>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<failOnWarnings>true</failOnWarnings>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
@ -559,4 +572,4 @@
|
||||
</plugins>
|
||||
</reporting>
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -40,8 +40,8 @@
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.springsource.bundlor</groupId>
|
||||
<artifactId>com.springsource.bundlor.maven</artifactId>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
@ -72,4 +72,4 @@
|
||||
<properties>
|
||||
<bridge-method.version>1.11</bridge-method.version>
|
||||
</properties>
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
Bundle-SymbolicName: com.mysema.querydsl.core
|
||||
Bundle-Name: Querydsl Spatial
|
||||
Bundle-Vendor: Mysema
|
||||
Bundle-ManifestVersion: 2
|
||||
Import-Template:
|
||||
javax.annotation.*;version="0",
|
||||
org.geolatte.geom.*;version="0.11",
|
||||
com.mysema.query.*;version="${project.version}",
|
||||
com.google.common.*;version="${guava.version}"
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -139,8 +139,8 @@
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.springsource.bundlor</groupId>
|
||||
<artifactId>com.springsource.bundlor.maven</artifactId>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
@ -219,4 +219,4 @@
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
Bundle-SymbolicName: com.mysema.querydsl.sql.codegen
|
||||
Bundle-Name: Querydsl SQL Codegen
|
||||
Bundle-Vendor: Mysema
|
||||
Bundle-ManifestVersion: 2
|
||||
Import-Template:
|
||||
com.mysema.codegen.*;version="${codegen.version}",
|
||||
com.mysema.commons.lang.*;version="${mysema.lang.version}",
|
||||
com.mysema.query.*;version="${project.version}",
|
||||
com.mysema.util.*;version="${project.version}",
|
||||
javax.annotation.*;version="0",
|
||||
javax.inject.*;version="0",
|
||||
javax.validation.*;version="1.0.0",
|
||||
com.google.common.*;version="${guava.version}",
|
||||
org.apache.tools.ant.*;version="${ant.version}",
|
||||
org.joda.time.*;version="1.6",
|
||||
org.geolatte.*;version="0.11",
|
||||
org.slf4j.*;version="${slf4j.version}"
|
||||
|
||||
@ -17,6 +17,10 @@
|
||||
|
||||
<properties>
|
||||
<bridge-method.version>1.11</bridge-method.version>
|
||||
<osgi.import.package>
|
||||
org.joda.time.*;version="[1.6,3)",
|
||||
${osgi.import.package.root}
|
||||
</osgi.import.package>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
@ -35,7 +39,7 @@
|
||||
<groupId>com.vividsolutions</groupId>
|
||||
<artifactId>jts</artifactId>
|
||||
<version>1.10</version>
|
||||
<scope>provided</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>joda-time</groupId>
|
||||
@ -66,12 +70,12 @@
|
||||
|
||||
<!-- test -->
|
||||
<dependency>
|
||||
<groupId>cglib</groupId>
|
||||
<artifactId>cglib</artifactId>
|
||||
<version>${cglib.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cglib</groupId>
|
||||
<artifactId>cglib</artifactId>
|
||||
<version>${cglib.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hsqldb</groupId>
|
||||
<artifactId>hsqldb</artifactId>
|
||||
<version>${hsqldb.version}</version>
|
||||
@ -217,8 +221,8 @@
|
||||
</dependencies>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>com.springsource.bundlor</groupId>
|
||||
<artifactId>com.springsource.bundlor.maven</artifactId>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
Bundle-SymbolicName: com.mysema.querydsl.sql
|
||||
Bundle-Name: Querydsl SQL
|
||||
Bundle-Vendor: Mysema
|
||||
Bundle-ManifestVersion: 2
|
||||
Excluded-Imports: com.infradna.tool.bridge_method_injector, org.postgis, org.geolatte.*, oracle.*, com.vividsolutions.jts.*
|
||||
Import-Template:
|
||||
com.mysema.commons.lang.*;version="${mysema.lang.version}",
|
||||
com.mysema.query.*;version="${project.version}",
|
||||
com.mysema.util.*;version="${project.version}",
|
||||
javax.annotation.*;version="0",
|
||||
javax.inject.*;version="0",
|
||||
javax.sql.*;version="0",
|
||||
javax.validation.*;version="1.0.0",
|
||||
com.google.common.*;version="${guava.version}",
|
||||
org.joda.time.*;version="1.6",
|
||||
org.slf4j.*;version="${slf4j.version}"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user