mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-01 16:07:04 -08:00
Robin H. Johnson
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From 2dbcc7408ff1104b84a982a5cde77ef11bc0dd93 Mon Sep 17 00:00:00 2001
|
|
From: James Le Cuirot <chewi@gentoo.org>
|
|
Date: Wed, 4 Mar 2015 23:07:36 +0000
|
|
Subject: [PATCH] Use the real cglib, not the repackaged version
|
|
|
|
---
|
|
.../java/com/fasterxml/jackson/databind/interop/TestHibernate.java | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java b/src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java
|
|
index 48dc573..b7d89b6 100644
|
|
--- a/src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java
|
|
+++ b/src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java
|
|
@@ -3,9 +3,9 @@ package com.fasterxml.jackson.databind.interop;
|
|
import java.lang.reflect.Method;
|
|
import java.util.*;
|
|
|
|
-import org.hibernate.repackage.cglib.proxy.Enhancer;
|
|
-import org.hibernate.repackage.cglib.proxy.MethodInterceptor;
|
|
-import org.hibernate.repackage.cglib.proxy.MethodProxy;
|
|
+import net.sf.cglib.proxy.Enhancer;
|
|
+import net.sf.cglib.proxy.MethodInterceptor;
|
|
+import net.sf.cglib.proxy.MethodProxy;
|
|
|
|
import com.fasterxml.jackson.databind.*;
|
|
|
|
--
|
|
2.0.4
|
|
|