Skip to content

Commit a34fcd9

Browse files
dpisklovdpisklov
committed
Convert from multimodule project
1 parent b9d701f commit a34fcd9

File tree

17 files changed

+125
-171
lines changed

17 files changed

+125
-171
lines changed

‎compiler/pom.xml

Lines changed: 0 additions & 162 deletions
This file was deleted.

‎pom.xml

Lines changed: 125 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,138 @@
1919

2020
<parent>
2121
<groupId>net.openhft</groupId>
22-
<artifactId>root-parent-pom</artifactId>
23-
<version>1.1.12</version>
22+
<artifactId>java-parent-pom</artifactId>
23+
<version>1.1.16</version>
2424
<relativePath />
2525
</parent>
2626

2727
<modelVersion>4.0.0</modelVersion>
28-
<artifactId>Java-Runtime-Compiler</artifactId>
28+
<artifactId>compiler</artifactId>
2929
<version>2.3.2-SNAPSHOT</version>
30-
<packaging>pom</packaging>
30+
<packaging>bundle</packaging>
3131

32-
<name>Java Compiler Parent</name>
33-
<description>Java Runtime Compiler library</description>
32+
<name>OpenHFT/Java-Runtime-Compiler</name>
33+
<description>Java Runtime Compiler library.</description>
3434

35-
<modules>
36-
<module>compiler</module>
37-
</modules>
35+
<dependencyManagement>
36+
<dependencies>
37+
38+
<dependency>
39+
<groupId>net.openhft</groupId>
40+
<artifactId>third-party-bom</artifactId>
41+
<type>pom</type>
42+
<version>3.6.9</version>
43+
<scope>import</scope>
44+
</dependency>
45+
46+
</dependencies>
47+
</dependencyManagement>
48+
49+
<dependencies>
50+
51+
<dependency>
52+
<groupId>org.slf4j</groupId>
53+
<artifactId>slf4j-api</artifactId>
54+
</dependency>
55+
56+
<dependency>
57+
<groupId>com.intellij</groupId>
58+
<artifactId>annotations</artifactId>
59+
</dependency>
60+
61+
<dependency>
62+
<groupId>org.easymock</groupId>
63+
<artifactId>easymock</artifactId>
64+
<scope>test</scope>
65+
</dependency>
66+
67+
<dependency>
68+
<groupId>junit</groupId>
69+
<artifactId>junit</artifactId>
70+
<scope>test</scope>
71+
</dependency>
72+
73+
<dependency>
74+
<groupId>org.slf4j</groupId>
75+
<artifactId>slf4j-simple</artifactId>
76+
<scope>test</scope>
77+
</dependency>
78+
79+
</dependencies>
80+
81+
<build>
82+
83+
<plugins>
84+
<plugin>
85+
<groupId>org.apache.maven.plugins</groupId>
86+
<artifactId>maven-compiler-plugin</artifactId>
87+
<version>3.6.2</version>
88+
<configuration>
89+
<source>1.8</source>
90+
<target>1.8</target>
91+
</configuration>
92+
</plugin>
93+
<!--
94+
generate maven dependencies versions file that can be used later
95+
to install the right bundle in test phase.
96+
97+
The file is:
98+
99+
target/classes/META-INF/maven/dependencies.properties
100+
-->
101+
<plugin>
102+
<groupId>org.apache.servicemix.tooling</groupId>
103+
<artifactId>depends-maven-plugin</artifactId>
104+
<executions>
105+
<execution>
106+
<id>generate-depends-file</id>
107+
<goals>
108+
<goal>generate-depends-file</goal>
109+
</goals>
110+
</execution>
111+
</executions>
112+
</plugin>
113+
<plugin>
114+
<groupId>org.apache.felix</groupId>
115+
<artifactId>maven-bundle-plugin</artifactId>
116+
<version>3.3.0</version>
117+
<extensions>true</extensions>
118+
<configuration>
119+
<instructions>
120+
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
121+
<Bundle-Name>OpenHFT :: ${project.artifactId}</Bundle-Name>
122+
<Bundle-Version>${project.version}</Bundle-Version>
123+
<Export-Package>
124+
net.openhft.compiler.*;-noimport:=true
125+
</Export-Package>
126+
</instructions>
127+
</configuration>
128+
<executions>
129+
<!--
130+
This execution makes sure that the manifest is available
131+
when the tests are executed
132+
-->
133+
<execution>
134+
<goals>
135+
<goal>manifest</goal>
136+
</goals>
137+
</execution>
138+
</executions>
139+
</plugin>
140+
</plugins>
141+
142+
</build>
143+
144+
<!-- todo remove once next parent pom is adopted -->
145+
<repositories>
146+
<repository>
147+
<id>sonatype-nexus-staging</id>
148+
<url>https://oss.sonatype.org/content/repositories/staging</url>
149+
<releases>
150+
<enabled>true</enabled>
151+
</releases>
152+
</repository>
153+
</repositories>
38154

39155
<scm>
40156
<url>scm:git:[email protected]:OpenHFT/Java-Runtime-Compiler.git</url>

‎compiler/src/main/java/net/openhft/compiler/CachedCompiler.java renamed to ‎src/main/java/net/openhft/compiler/CachedCompiler.java

File renamed without changes.

‎compiler/src/main/java/net/openhft/compiler/CompilerUtils.java renamed to ‎src/main/java/net/openhft/compiler/CompilerUtils.java

File renamed without changes.

‎compiler/src/main/java/net/openhft/compiler/JavaSourceFromString.java renamed to ‎src/main/java/net/openhft/compiler/JavaSourceFromString.java

File renamed without changes.

‎compiler/src/main/java/net/openhft/compiler/MyJavaFileManager.java renamed to ‎src/main/java/net/openhft/compiler/MyJavaFileManager.java

File renamed without changes.

‎compiler/src/test/java/eg/FooBarTee.java renamed to ‎src/test/java/eg/FooBarTee.java

File renamed without changes.

‎compiler/src/test/java/eg/components/Bar.java renamed to ‎src/test/java/eg/components/Bar.java

File renamed without changes.

‎compiler/src/test/java/eg/components/BarImpl.java renamed to ‎src/test/java/eg/components/BarImpl.java

File renamed without changes.

‎compiler/src/test/java/eg/components/Foo.java renamed to ‎src/test/java/eg/components/Foo.java

File renamed without changes.

0 commit comments

Comments
 (0)