Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tidying poms #899

Merged
merged 2 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,28 @@

-->

<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/maven-v4_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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.8</version>
<relativePath />
</parent>

<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-bom</artifactId>
<version>3.0.5-SNAPSHOT</version>
<packaging>pom</packaging>

<name>HK2 Bom Pom</name>
<description>Bom Pom for importing HK2 managed dependencies</description>


<scm>
<tag>HEAD</tag>
</scm>

<properties>
<asm.version>9.6</asm.version>
<jakarta-inject.version>2.0.1</jakarta-inject.version>
Expand Down Expand Up @@ -195,10 +201,6 @@
</dependencies>
</dependencyManagement>

<scm>
<tag>HEAD</tag>
</scm>

<build>
<pluginManagement>
<plugins>
Expand Down
79 changes: 40 additions & 39 deletions class-model/pom.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
Expand All @@ -17,8 +18,9 @@

-->

<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-parent</artifactId>
Expand All @@ -27,41 +29,8 @@

<groupId>org.glassfish.hk2</groupId>
<artifactId>class-model</artifactId>
<name>Class Model for Hk2</name>

<build>
<plugins>
<plugin>
<groupId>org.glassfish.hk2</groupId>
<artifactId>osgiversion-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestFile>${manifest.location}</manifestFile>
<manifestEntries>
<Automatic-Module-Name>org.glassfish.hk2.classmodel</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
<name>Class Model for Hk2</name>

<dependencies>
<dependency>
Expand Down Expand Up @@ -99,17 +68,49 @@
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<!-- Needed to have a bundle activator to set up a different serialization policy-->
<dependency><!-- Needed to have a bundle activator to set up a different serialization policy-->
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<!-- Needed to have a bundle activator to set up a different serialization policy-->
<dependency><!-- Needed to have a bundle activator to set up a different serialization policy-->
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.glassfish.hk2</groupId>
<artifactId>osgiversion-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestFile>${manifest.location}</manifestFile>
<manifestEntries>
<Automatic-Module-Name>org.glassfish.hk2.classmodel</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>
9 changes: 6 additions & 3 deletions examples/caching/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,20 @@

-->

<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/maven-v4_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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.glassfish.hk2</groupId>
<artifactId>examples</artifactId>
<version>3.0.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>


<artifactId>caching-aop-example</artifactId>
<packaging>pom</packaging>

<name>AOP Caching Example</name>

<modules>
<module>system</module>
<module>runner</module>
Expand Down
50 changes: 26 additions & 24 deletions examples/caching/runner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,43 @@

-->

<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/maven-v4_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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.glassfish.hk2</groupId>
<artifactId>caching-aop-example</artifactId>
<version>3.0.5-SNAPSHOT</version>
</parent>

<artifactId>caching-aop-example-runner</artifactId>

<name>Caching AOP Example Runner</name>
<description>The junit runner for the caching AOP example</description>

<dependencies>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-junitrunner</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>caching-aop-example-system</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-locator</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -62,27 +87,4 @@
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-junitrunner</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>caching-aop-example-system</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-locator</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
30 changes: 16 additions & 14 deletions examples/caching/system/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,33 @@

-->

<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/maven-v4_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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.glassfish.hk2</groupId>
<artifactId>caching-aop-example</artifactId>
<version>3.0.5-SNAPSHOT</version>
</parent>

<artifactId>caching-aop-example-system</artifactId>

<name>Caching AOP Example System</name>
<description>The system code for the caching AOP example</description>

<dependencies>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-locator</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -62,17 +77,4 @@
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-locator</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
10 changes: 6 additions & 4 deletions examples/configuration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,20 @@

-->

<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/maven-v4_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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.glassfish.hk2</groupId>
<artifactId>examples</artifactId>
<version>3.0.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>


<artifactId>configuration-examples</artifactId>
<packaging>pom</packaging>

<name>Examples of configuration use cases</name>

<modules>
<module>webserver</module>
<module>xml</module>
Expand Down
46 changes: 24 additions & 22 deletions examples/configuration/webserver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,39 +17,20 @@

-->

<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/maven-v4_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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.glassfish.hk2</groupId>
<artifactId>configuration-examples</artifactId>
<version>3.0.5-SNAPSHOT</version>
</parent>

<artifactId>webserver-configuration-example</artifactId>

<name>A fake WebServer configured by a property file</name>
<description>A fake WebServer that is configured by a property file</description>

<build>
<plugins>
<plugin>
<groupId>org.glassfish.hk2</groupId>
<artifactId>osgiversion-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-inhabitant-generator</artifactId>
<executions>
<execution>
<id>generate-inhabitants</id>
<goals>
<goal>generate-inhabitants</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.glassfish.hk2</groupId>
Expand Down Expand Up @@ -86,4 +67,25 @@
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.glassfish.hk2</groupId>
<artifactId>osgiversion-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-inhabitant-generator</artifactId>
<executions>
<execution>
<id>generate-inhabitants</id>
<goals>
<goal>generate-inhabitants</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading