Skip to content

Commit 396deb5

Browse files
olim7tolim7t
committed
Move bundle plugin configuration to individual modules.
1 parent 3c319c3 commit 396deb5

3 files changed

Lines changed: 69 additions & 35 deletions

File tree

‎driver-core/pom.xml‎

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,43 @@
112112
<filtering>true</filtering>
113113
</resource>
114114
</resources>
115+
<plugins>
116+
<plugin>
117+
<artifactId>maven-compiler-plugin</artifactId>
118+
<configuration>
119+
<compilerArgument>-Xlint:all</compilerArgument>
120+
<showWarnings>true</showWarnings>
121+
<showDeprecation>true</showDeprecation>
122+
</configuration>
123+
</plugin>
124+
<plugin>
125+
<groupId>org.apache.felix</groupId>
126+
<artifactId>maven-bundle-plugin</artifactId>
127+
<extensions>true</extensions>
128+
<version>2.4.0</version>
129+
<executions>
130+
<execution>
131+
<id>bundle-manifest</id>
132+
<phase>process-classes</phase>
133+
<goals>
134+
<goal>manifest</goal>
135+
</goals>
136+
</execution>
137+
</executions>
138+
<configuration>
139+
<instructions>
140+
<Bundle-SymbolicName>com.datastax.driver.core</Bundle-SymbolicName>
141+
<Bundle-Version>${project.version}</Bundle-Version>
142+
<_include>-osgi.bnd</_include>
143+
</instructions>
144+
<supportedProjectTypes>
145+
<supportedProjectType>jar</supportedProjectType>
146+
<supportedProjectType>bundle</supportedProjectType>
147+
<supportedProjectType>pom</supportedProjectType>
148+
</supportedProjectTypes>
149+
</configuration>
150+
</plugin>
151+
</plugins>
115152
</build>
116153

117154
<profiles>
@@ -141,14 +178,6 @@
141178
<!--<forkMode>never</forkMode>-->
142179
</configuration>
143180
</plugin>
144-
<plugin>
145-
<artifactId>maven-compiler-plugin</artifactId>
146-
<configuration>
147-
<compilerArgument>-Xlint:all</compilerArgument>
148-
<showWarnings>true</showWarnings>
149-
<showDeprecation>true</showDeprecation>
150-
</configuration>
151-
</plugin>
152181
<plugin>
153182
<artifactId>maven-shade-plugin</artifactId>
154183
<version>2.3</version>

‎driver-dse/pom.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,38 @@
3434
</dependency>
3535
</dependencies>
3636

37+
<build>
38+
<plugins>
39+
<plugin>
40+
<groupId>org.apache.felix</groupId>
41+
<artifactId>maven-bundle-plugin</artifactId>
42+
<extensions>true</extensions>
43+
<version>2.4.0</version>
44+
<executions>
45+
<execution>
46+
<id>bundle-manifest</id>
47+
<phase>process-classes</phase>
48+
<goals>
49+
<goal>manifest</goal>
50+
</goals>
51+
</execution>
52+
</executions>
53+
<configuration>
54+
<instructions>
55+
<Bundle-SymbolicName>com.datastax.driver.dse</Bundle-SymbolicName>
56+
<Bundle-Version>${project.version}</Bundle-Version>
57+
<_include>-osgi.bnd</_include>
58+
</instructions>
59+
<supportedProjectTypes>
60+
<supportedProjectType>jar</supportedProjectType>
61+
<supportedProjectType>bundle</supportedProjectType>
62+
<supportedProjectType>pom</supportedProjectType>
63+
</supportedProjectTypes>
64+
</configuration>
65+
</plugin>
66+
</plugins>
67+
</build>
68+
3769
<licenses>
3870
<license>
3971
<name>Apache 2</name>

‎pom.xml‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -131,33 +131,6 @@
131131
<tagNameFormat>@{project.version}</tagNameFormat>
132132
</configuration>
133133
</plugin>
134-
<plugin>
135-
<groupId>org.apache.felix</groupId>
136-
<artifactId>maven-bundle-plugin</artifactId>
137-
<extensions>true</extensions>
138-
<version>2.4.0</version>
139-
<executions>
140-
<execution>
141-
<id>bundle-manifest</id>
142-
<phase>process-classes</phase>
143-
<goals>
144-
<goal>manifest</goal>
145-
</goals>
146-
</execution>
147-
</executions>
148-
<configuration>
149-
<instructions>
150-
<Bundle-SymbolicName>com.datastax.driver.core</Bundle-SymbolicName>
151-
<Bundle-Version>${project.version}</Bundle-Version>
152-
<_include>-osgi.bnd</_include>
153-
</instructions>
154-
<supportedProjectTypes>
155-
<supportedProjectType>jar</supportedProjectType>
156-
<supportedProjectType>bundle</supportedProjectType>
157-
<supportedProjectType>pom</supportedProjectType>
158-
</supportedProjectTypes>
159-
</configuration>
160-
</plugin>
161134
</plugins>
162135
</build>
163136

0 commit comments

Comments
 (0)