Skip to content

Commit

Permalink
refresh and simplify with new parent
Browse files Browse the repository at this point in the history
Signed-off-by: Olivier Lamy <[email protected]>
  • Loading branch information
olamy committed Dec 23, 2023
1 parent 208577a commit bb07ea6
Show file tree
Hide file tree
Showing 5 changed files with 80 additions and 125 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
20 changes: 20 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 365
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 30
# Issues with these labels will never be considered stale
exemptLabels:
- Pinned
- Security
- Specification
- TCK
# Label to use when marking an issue as stale
staleLabel: Stale
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has been a
full year without activity. It will be closed if no further activity occurs.
Thank you for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: >
This issue has been closed due to it having no activity.
14 changes: 14 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Verify

on:
push:
branches:
- 'main'
pull_request:

jobs:
build:
name: Verify
uses: jetty/.github/.github/workflows/maven-ci.yml@main
with:
jdk-matrix: '[ "8", "11" ]'
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
target
*.iml

158 changes: 33 additions & 125 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,95 +1,75 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-toolchain</artifactId>
<version>1.6</version>
<relativePath>../jetty-toolchain</relativePath>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-parent</artifactId>
<version>26</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-schemas</artifactId>
<version>5.3-SNAPSHOT</version>
<name>Jetty :: Schemas</name>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<name>Jetty :: Schemas</name>
<scm>
<connection>scm:git:https://github.com/eclipse/jetty.toolchain.git</connection>
<developerConnection>scm:git:[email protected]:eclipse/jetty.toolchain.git</developerConnection>
<url>https://github.com/eclipse/jetty.toolchain/tree/master/jetty-schemas</url>
<connection>scm:git:https://github.com/jetty/${jetty.git.repo}.git</connection>
<developerConnection>scm:git:[email protected]:jetty/${jetty.git.repo}.git</developerConnection>
<tag>HEAD</tag>
<url>https://github.com/jetty/${jetty.git.repo}</url>
</scm>
<properties>
<jdk.version.minimum>8</jdk.version.minimum>
<jetty.git.repo>jetty-schemas</jetty.git.repo>
</properties>
<build>
<resources>
<!-- schemas must be on both path to be able to use for 9.4/10 and 11 -->
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>src/main/resources/jakarta/servlet</directory>
<targetPath>javax/servlet</targetPath>
<directory>src/main/resources/jakarta/servlet</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<extensions>true</extensions>
<configuration>
<source>1.8</source>
<target>1.8</target>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.schemas;singleton:=true</Bundle-SymbolicName>
<Bundle-Name>Jetty Servlet Schemas</Bundle-Name>
<Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
<_nouses>true</_nouses>
<Export-Package>javax.servlet.resources;version="4.0",
javax.servlet.jsp.resources;version="4.0",
jakarta.servlet.resources;version="5.0",
jakarta.servlet.jsp.resources;version="5.0",</Export-Package>
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>test-jar</id>
<id>bundle-manifest</id>
<goals>
<goal>test-jar</goal>
<goal>manifest</goal>
</goals>
<phase>process-classes</phase>
</execution>
</executions>
<configuration>
<archive>
<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
<goal>process</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<resourceBundles>
<resourceBundle>org.eclipse.jetty.toolchain:jetty-artifact-remote-resources:1.2</resourceBundle>
Expand All @@ -98,78 +78,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<extensions>true</extensions>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.schemas;singleton:=true</Bundle-SymbolicName>
<Bundle-Name>Jetty Servlet Schemas</Bundle-Name>
<Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
<_nouses>true</_nouses>
<Export-Package>
javax.servlet.resources;version="4.0",
javax.servlet.jsp.resources;version="4.0",
jakarta.servlet.resources;version="5.0",
jakarta.servlet.jsp.resources;version="5.0",
</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<useReleaseProfile>true</useReleaseProfile>
<releaseProfiles>eclipse-release</releaseProfiles>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.0</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>

0 comments on commit bb07ea6

Please sign in to comment.