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.

Sign up for GitHub

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

Resolve Upper Bound issues, update Groovy #133

Merged
merged 3 commits into from
Oct 20, 2017
Merged

Resolve Upper Bound issues, update Groovy #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d59a74
Cleanup upper Bound dependencies
oleg-nenashev Oct 10, 2017
00405e2
Update groovy-all in stapler-groovy to the Jenkins core’s version
oleg-nenashev Oct 10, 2017
8d574a5
Update Extra enforcer rules as suggested by @jglick
oleg-nenashev Oct 13, 2017
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: 12 additions & 2 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,22 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
<version>1.8.0</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these aligned with jenkins-core?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jenkins core is at 1.8.3. Can bump it even more

</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.3.1</version>
<version>2.4</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.jvnet.localizer</groupId>
Expand Down
2 changes: 1 addition & 1 deletion groovy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>1.8.3</version>
<version>2.4.11</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
4 changes: 4 additions & 0 deletions jelly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.dom4j</groupId>
<artifactId>dom4j</artifactId>
Expand Down
12 changes: 9 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.kohsuke</groupId>
<artifactId>pom</artifactId>
<version>14</version>
<version>19</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally we should start migrating it to https://github.com/jenkinsci/pom.
IIUC there is no other things excepting Plugin site release and code signing there. WDYT @jglick ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure. Technically this is a non-Jenkins component.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's something we could also fix. Stapler is a critical part of Jenkins && it's not extremely popular elsewhere, so moving it && integrating common Jenkins QA/review flow would not hurt. It's something we were discussing multiple times, but maybe it belongs to the ML now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically that would mean not releasing it to Central any more. Fine with me, but needs some discussion.

</parent>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler-parent</artifactId>
Expand Down Expand Up @@ -122,7 +122,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.3.1</version>
<version>3.0.0-M1</version>
<executions>
<execution>
<goals>
Expand All @@ -140,6 +140,7 @@
<string>com.headius.invokebinder.*</string>
</ignoreClasses>
</enforceBytecodeVersion>
<requireUpperBoundDeps />
</rules>
</configuration>
</execution>
Expand All @@ -148,7 +149,7 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.0-beta-2</version>
<version>1.0-beta-4</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -271,6 +272,11 @@
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>